Merge remote-tracking branch 'savannah/master'

As part of the merge, fix some typos, add copyright and licensing headers, and
a few more minor changes.

1 files changed, 58 insertions, 11 deletions

diff --git a/faq.mdwn b/faq.mdwn
index 9167ede6..678ce428 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2010, 2013 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
@@ -9,20 +9,67 @@ is included in the section entitled [[GNU Free Documentation
 License|/fdl]]."]]"""]]
 
 [[!meta title="FAQ"]]
+[[!tag stable_URL]]
 
-Also see the...
+[[!inline
+pages=none
+show=0
+feeds=no
+actions=yes
+rootpage="faq" postformtext="Add a new item titled:"]]
+
+# Also see the...
 
   * [[microkernel FAQ|microkernel/faq]],
+  * [[this FAQ in just one web page|faq_all]].
 
-  * [[GNU Hurd FAQ|hurd/faq]],
 
-  * [[running GNU Hurd FAQ|hurd/running/faq]],
+# General-discussion FAQs
+
+[[!map
+pages="faq/* and !*/discussion and !*/debian/* and !*/running/* and !*/support/* and !*/issues/* and !*/dev/* and !*/old/*"
+show=title]]
+
+
+# Hardware/Software support FAQs
+
+[[!map
+pages="faq/support/* and !*/discussion"
+show=title]]
+
+
+# Running GNU/Hurd FAQs
+
+[[!map
+pages="faq/running/* and !*/discussion"
+show=title]]
+
+
+# Debian GNU/Hurd FAQs
+
+[[!map
+pages="faq/debian/* and !*/discussion"
+show=title]]
+
+
+# Issues FAQs
+
+[[!map
+pages="faq/issues/* and !*/discussion"
+show=title]]
+
+
+# Development FAQs
+
+[[!map
+pages="faq/dev/* and !*/discussion"
+show=title]]
+
+
+# Old FAQs
+
+[[!map
+pages="faq/old/* and !*/discussion"
+show=title]]
 
-  * [[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:"]]