summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--documentation.mdwn2
-rw-r--r--faq.mdwn28
-rw-r--r--hurd/faq.mdwn4
-rw-r--r--hurd/running/debian/faq.mdwn6
-rw-r--r--hurd/running/faq.mdwn4
-rw-r--r--microkernel/faq.mdwn5
-rw-r--r--sidebar.mdwn1
7 files changed, 43 insertions, 7 deletions
diff --git a/documentation.mdwn b/documentation.mdwn
index d96cb24b..b8558e9f 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -8,6 +8,8 @@ Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
is included in the section entitled
[[GNU Free Documentation License|/fdl]]."]]"""]]
+[[FAQ]]
+
Documentation for...
* [[GNU_Hurd|hurd/documentation]]
diff --git a/faq.mdwn b/faq.mdwn
new file mode 100644
index 00000000..9167ede6
--- /dev/null
+++ b/faq.mdwn
@@ -0,0 +1,28 @@
+[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!meta title="FAQ"]]
+
+Also see the...
+
+ * [[microkernel FAQ|microkernel/faq]],
+
+ * [[GNU Hurd FAQ|hurd/faq]],
+
+ * [[running GNU Hurd FAQ|hurd/running/faq]],
+
+ * [[Debian GNU/Hurd FAQ|hurd/running/debian/faq]].
+
+[[!inline
+pages="faq/* and !*/discussion"
+show=0
+feeds=no
+actions=yes
+rootpage="faq" postformtext="Add a new item titled:"]]
diff --git a/hurd/faq.mdwn b/hurd/faq.mdwn
index be30e1b4..413aaf3f 100644
--- a/hurd/faq.mdwn
+++ b/hurd/faq.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2008, 2010 Free Software Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,6 +10,8 @@ is included in the section entitled
[[!meta title="GNU Hurd FAQ"]]
+See also other [[/FAQ]].
+
[[!inline
pages="hurd/faq/* and !*/discussion"
show=0
diff --git a/hurd/running/debian/faq.mdwn b/hurd/running/debian/faq.mdwn
index b3bd230d..8aaadf9c 100644
--- a/hurd/running/debian/faq.mdwn
+++ b/hurd/running/debian/faq.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2009, 2010 Free Software Foundation,
+Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,8 +11,7 @@ is included in the section entitled
[[!meta title="Debian GNU/Hurd FAQ"]]
-See also the [[Hurd_FAQ|/hurd/FAQ]], [[after_install]], and the [[General FAQ
-About Running GNU/Hurd|/hurd/running/faq]].
+See also [[after_install]] instructions, and other [[/FAQ]].
[[!inline
pages="hurd/running/debian/faq/* and !*/discussion"
diff --git a/hurd/running/faq.mdwn b/hurd/running/faq.mdwn
index a59bce7e..2746a20a 100644
--- a/hurd/running/faq.mdwn
+++ b/hurd/running/faq.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,7 +10,7 @@ License|/fdl]]."]]"""]]
[[!meta title="General FAQ About Running GNU/Hurd"]]
-See also the [[Hurd FAQ|hurd/FAQ]], and the [[Debian GNU/Hurd FAQ|debian/faq]].
+See also other [[/FAQ]].
[[!inline
pages="hurd/running/faq/* and !*/discussion"
diff --git a/microkernel/faq.mdwn b/microkernel/faq.mdwn
index aa98403a..fe259f05 100644
--- a/microkernel/faq.mdwn
+++ b/microkernel/faq.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2008, 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2008, 2009, 2010 Free Software Foundation,
+Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,6 +11,8 @@ is included in the section entitled
[[!meta title="Microkernel FAQ"]]
+See also other [[/FAQ]].
+
[[!inline
pages="microkernel/faq/* and !*/discussion"
show=0
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 159104fc..d283436b 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -14,6 +14,7 @@ Welcome to... [[!img /logo/boxes-redrawn.png link=/logo]] ... the GNU Hurd!
* **[[Home|/index]]**
* **[[Community]]**
* **[[Documentation]]**
+ * *[[FAQ]]*
* **[[Getting Help]]**
* **[[Open Issues]]**