Rework FAQ machinery to be based on tags instead of filenames.

1 files changed, 29 insertions, 10 deletions

diff --git a/faq.mdwn b/faq.mdwn
index 987d09d1..605b6422 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -29,49 +29,68 @@ This page [[with all items inlined|faq_inlined]].
 # General-discussion FAQs
 
 [[!map
-pages="faq/* and !*/discussion and !*/debian/* and !*/running/* and !*/support/* and !*/issues/* and !*/dev/* and !*/old/*"
+pages="tagged(faq/general) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/general) and !tagged(faq/_important)"
 show=title]]
 
 
 # Hardware/Software support FAQs
 
 [[!map
-pages="faq/support/* and !*/discussion"
+pages="tagged(faq/support) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/support) and !tagged(faq/_important)"
 show=title]]
 
 
 # Running GNU/Hurd FAQs
 
 [[!map
-pages="faq/running/* and !*/discussion"
+pages="tagged(faq/running) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/running) and !tagged(faq/_important)"
 show=title]]
 
 
 # Debian GNU/Hurd FAQs
 
 [[!map
-pages="faq/debian/* and !*/discussion"
+pages="tagged(faq/debian) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/debian) and !tagged(faq/_important)"
 show=title]]
 
 
-# Issues FAQs
+# Open Issues FAQs
 
 [[!map
-pages="faq/issues/* and !*/discussion"
+pages="tagged(faq/open_issues) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/open_issues) and !tagged(faq/_important)"
 show=title]]
 
 
 # Development FAQs
 
 [[!map
-pages="faq/dev/* and !*/discussion"
+pages="tagged(faq/development) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/development) and !tagged(faq/_important)"
 show=title]]
 
 
 # Old FAQs
 
 [[!map
-pages="faq/old/* and !*/discussion"
+pages="tagged(faq/old) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/old) and !tagged(faq/_important)"
 show=title]]
-
-