diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-01-19 14:13:44 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-01-19 14:13:44 +0100 |
| commit | e87b8d6c24915f4bc50f3c08b9a7201a74743541 (patch) | |
| tree | 36d5c3ab9b59c2be38bd5095be1472ac8f0eb763 /tracker | |
| parent | 99fe89e305b6853b4af5a1189c30bf874bb0f0f8 (diff) | |
Merge website, FAQ incorporated
Some restructuring has happened with the FAQ's. The org-mode based
*faq.org* was mostly available as a general FAQ page, *faq.mdwn*,
already. The specific *faq-medlemskap.mdwn* together with some parts
of the technical FAQ, *e-post.mdwn* is merged with the general
FAQ. Finally the wiki index page is updated accordingly.
Diffstat (limited to 'tracker')
| -rw-r--r-- | tracker/Merge_wiki_website_and_website.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index b208de3..fbd569e 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -21,7 +21,7 @@ Regarding merging, the following is the checklist: * In *from_wiki*, the following pages should be attended and possibly added to the wiki. * *budget.txt* (what to do?) - * *faq.txt* (what to do?) + * *faq.txt* -- Content already in *faq.org* * *fscons.txt* (what to do?) * *index.txt* (what to do?) * *ordlista.txt* (what to do?) @@ -36,7 +36,7 @@ Regarding merging, the following is the checklist: * *certs* -- Added as a page, *certs.mdwn*, which is accessed from the main navigation bar * *certs.asc* -- Added as a file, accessed from *certs.mdwn* * *default.css* -- Dropped - * *faq.org* (what to do?) + * *faq.org* -- Merged with *faq.mdwn* * *gnutiken.org* (what to do?) * *index.en.org* (what to do?) * *index.org* (what to do?) |