1 files changed, 37 insertions, 10 deletions
diff --git a/faq_inlined.mdwn b/faq_inlined.mdwn
index 432a0d14..237855e6 100644
--- a/faq_inlined.mdwn
+++ b/faq_inlined.mdwn
@@ -29,7 +29,12 @@ This page [[without all items inlined|faq]].
 # General-discussion FAQs
 
 [[!inline
-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=0
+feeds=no
+]]
+[[!inline
+pages="tagged(faq/general) and !tagged(faq/_important)"
 show=0
 feeds=no
 ]]
@@ -38,7 +43,11 @@ feeds=no
 # Hardware/Software support FAQs
 
 [[!inline
-pages="faq/support/* and !*/discussion"
+pages="tagged(faq/support) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/support) and !tagged(faq/_important)"
 show=0
 feeds=no]]
 
@@ -46,7 +55,11 @@ feeds=no]]
 # Running GNU/Hurd FAQs
 
 [[!inline
-pages="faq/running/* and !*/discussion"
+pages="tagged(faq/running) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/running) and !tagged(faq/_important)"
 show=0
 feeds=no]]
 
@@ -54,15 +67,23 @@ feeds=no]]
 # Debian GNU/Hurd FAQs
 
 [[!inline
-pages="faq/debian/* and !*/discussion"
+pages="tagged(faq/debian) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/debian) and !tagged(faq/_important)"
 show=0
 feeds=no]]
 
 
-# Issues FAQs
+# Open Issues FAQs
 
 [[!inline
-pages="faq/issues/* and !*/discussion"
+pages="tagged(faq/open_issues) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/open_issues) and !tagged(faq/_important)"
 show=0
 feeds=no]]
 
@@ -70,7 +91,11 @@ feeds=no]]
 # Development FAQs
 
 [[!inline
-pages="faq/dev/* and !*/discussion"
+pages="tagged(faq/development) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/development) and !tagged(faq/_important)"
 show=0
 feeds=no]]
 
@@ -78,8 +103,10 @@ feeds=no]]
 # Old FAQs
 
 [[!inline
-pages="faq/old/* and !*/discussion"
+pages="tagged(faq/old) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/old) and !tagged(faq/_important)"
 show=0
 feeds=no]]
-
-