diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2008-11-09 09:33:43 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2008-11-09 09:33:43 +0100 |
| commit | d012ac5581ee4d7264c54aa71be466232d488d0c (patch) | |
| tree | f4a5c102c14930106485dffc5813bc00bfef586b | |
| parent | 09ce2aac5978c69be419f94a3888ef4805275027 (diff) | |
| parent | 516e7d2203c2f9b2b45b64232705e12c6f6f31b9 (diff) | |
Merge branch 'master' of arnebab@flubber:~wiki/wiki
| -rw-r--r-- | hurd/faq/old_faq.txt (renamed from faq.en.in) | 15 | ||||
| -rwxr-xr-x | render_locally | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/faq.en.in b/hurd/faq/old_faq.txt index 11e1c242..de76889e 100644 --- a/faq.en.in +++ b/hurd/faq/old_faq.txt @@ -1,3 +1,14 @@ +[[meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2008 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]]."]]"""]] + Frequently Asked Questions about the GNU Hurd This document attempts to answer the questions that most often plague @@ -547,7 +558,5 @@ Answers were given by (in chronological order): * {MB} Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de> * {AMS} Alfred M. Szmidt <ams@gnu.org> * {OK} Ognyan Kulev <ogi@fmi.uni-sofia.bg> -* {FH} Frédéric Henry <neryel@reveries.info> +* {FH} Frédéric Henry <neryel@reveries.info> * {MM} Manuel Menal <mmenal@hurdfr.org> - - vim:ts=8:sw=8:tw=72 diff --git a/render_locally b/render_locally index 153e7e8a..67c96fdb 100755 --- a/render_locally +++ b/render_locally @@ -24,6 +24,7 @@ ikiwiki \ --plugin html \ --plugin sidebar \ --plugin table \ + --plugin txt \ --libdir "$src"/.library \ --plugin copyright \ --plugin license \ |