summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc.mdwn
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-08-05 16:47:57 +0200
committerTails developers <amnesia@boum.org>2012-08-05 16:47:57 +0200
commitbc83025f93b5d8d768ac0b961856ae2756853b55 (patch)
tree268e55df3f4fee290f683182695600560777b23c /wiki/src/doc.mdwn
parent5a9c39a61cc32b8d6f008407869e03a9a971b5c9 (diff)
Revert "Revert "Merge branch 'master' into doc/trail""
This reverts commit 5a9c39a61cc32b8d6f008407869e03a9a971b5c9.
Diffstat (limited to 'wiki/src/doc.mdwn')
-rw-r--r--wiki/src/doc.mdwn11
1 files changed, 3 insertions, 8 deletions
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index 9367f23..a016aea 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -6,14 +6,9 @@ to write it yourself and share it with us.
- [[Introduction to this documentation|introduction]]
-# General information
-
- - [[Why do you need anonymity?|about/anonymity]]
- - [[System requirements|about/requirements]]
- - [[Warnings!|about/warning]]
- - [[Features|about/features]]
- - [[Trusting Tails|about/trust]]
- - [[License|about/license]]
+# [[General information|about]]
+
+[[!inline pages="doc/about.index" raw="yes"]]
# [[Get Tails|download]]