From 4bc5505ee19ca0b66bdaf375d0af9f77e1daa790 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Tue, 20 Jan 2015 20:03:18 +0100 Subject: 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. --- tracker/Merge_wiki_website_and_website.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tracker') 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?) -- cgit v1.2.3