merge madness

2014-10-19 16:12:05 -07:00
parent 6d3619c8b1
commit bae3029c63
64 changed files with 1261 additions and 1337 deletions
--- a/doc/faq_admins.bb
+++ b/doc/faq_admins.bb
@@ -45,4 +45,4 @@ valid SSL certificate rather than disabling port 443.

 [/ul]

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;