summaryrefslogtreecommitdiffstats
path: root/tracker
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-01-20 20:03:18 +0100
committerGustav Eek <gustav@fripost.org>2015-01-20 20:03:18 +0100
commit4bc5505ee19ca0b66bdaf375d0af9f77e1daa790 (patch)
tree0a830a09b0954a3d6814fcd5d6bf4d753517361d /tracker
parent1ef2963fa18e3063e0ae071feffee4f6661961d9 (diff)
Website merge, ideological texts added
Two ideologically important texts were found in the org-mode based website's *from_wiki* directory: *princip.txt* and *fscons.txt*, a suggestion to declaration of principals for Fripost and an article text for FSCONS 2010. An *ideology* category (directory) is created with an overview page, *ideology.mdwn* and to content pages *princip.mdwn* and *fscons-2010.mdwn*. The index, *index.mdwn* is updated accordingly.
Diffstat (limited to 'tracker')
-rw-r--r--tracker/Merge_wiki_website_and_website.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn
index b54a1d1..fe8572d 100644
--- a/tracker/Merge_wiki_website_and_website.mdwn
+++ b/tracker/Merge_wiki_website_and_website.mdwn
@@ -20,12 +20,12 @@ 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?)
+ * *budget.txt* -- Dropped
* *faq.txt* -- Content already in *faq.org*
- * *fscons.txt* (what to do?)
- * *index.txt* (what to do?)
+ * *fscons.txt* -- Added as *ideology/fscons-2010.mdwn*
+ * *index.txt* -- Dropped
* *ordlista.txt* (what to do?)
- * *princip.txt* (what to do?)
+ * *princip.txt* -- Added as *ideology/princip.mdwn*
* *protokoll.txt* (what to do?)
* *sidospÄr.txt* (what to do?)
* *stadgar.txt* (what to do?)