summaryrefslogtreecommitdiffstats
path: root/tracker
diff options
context:
space:
mode:
Diffstat (limited to 'tracker')
-rw-r--r--tracker/Merge_wiki_website_and_website.mdwn4
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?)