From ed3a0ba6a3e75f3e6c070a1ab0dd154300cd5a2f Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 22 Mar 2013 21:30:37 +0000
Subject: [PATCH] Stop using 'wiki' directory within wiki directories

---
 core/boot.js                                                    | 2 --
 .../clientserver/{wiki => tiddlers/system}/DefaultTiddlers.tid  | 0
 .../clientserver/{wiki => tiddlers/system}/SiteSubtitle.tid     | 0
 editions/clientserver/{wiki => tiddlers/system}/SiteTitle.tid   | 0
 .../clientserver/{wiki => tiddlers/system}/html-div-tiddler.tid | 0
 editions/tw5.com/{wiki => tiddlers/system}/DefaultTiddlers.tid  | 0
 editions/tw5.com/{wiki => tiddlers/system}/MainMenu.tid         | 0
 editions/tw5.com/{wiki => tiddlers/system}/SiteSubtitle.tid     | 0
 editions/tw5.com/{wiki => tiddlers/system}/SiteTitle.tid        | 0
 editions/tw5.com/{wiki => tiddlers/system}/analytics.tid        | 0
 .../tw5tiddlyweb/{wiki => tiddlers/system}/DefaultTiddlers.tid  | 0
 editions/tw5tiddlyweb/{wiki => tiddlers/system}/EditMode.tid    | 0
 .../tw5tiddlyweb/{wiki => tiddlers/system}/SiteSubtitle.tid     | 0
 editions/tw5tiddlyweb/{wiki => tiddlers/system}/SiteTitle.tid   | 0
 14 files changed, 2 deletions(-)
 rename editions/clientserver/{wiki => tiddlers/system}/DefaultTiddlers.tid (100%)
 rename editions/clientserver/{wiki => tiddlers/system}/SiteSubtitle.tid (100%)
 rename editions/clientserver/{wiki => tiddlers/system}/SiteTitle.tid (100%)
 rename editions/clientserver/{wiki => tiddlers/system}/html-div-tiddler.tid (100%)
 rename editions/tw5.com/{wiki => tiddlers/system}/DefaultTiddlers.tid (100%)
 rename editions/tw5.com/{wiki => tiddlers/system}/MainMenu.tid (100%)
 rename editions/tw5.com/{wiki => tiddlers/system}/SiteSubtitle.tid (100%)
 rename editions/tw5.com/{wiki => tiddlers/system}/SiteTitle.tid (100%)
 rename editions/tw5.com/{wiki => tiddlers/system}/analytics.tid (100%)
 rename editions/tw5tiddlyweb/{wiki => tiddlers/system}/DefaultTiddlers.tid (100%)
 rename editions/tw5tiddlyweb/{wiki => tiddlers/system}/EditMode.tid (100%)
 rename editions/tw5tiddlyweb/{wiki => tiddlers/system}/SiteSubtitle.tid (100%)
 rename editions/tw5tiddlyweb/{wiki => tiddlers/system}/SiteTitle.tid (100%)

diff --git a/core/boot.js b/core/boot.js
index 70a91c6e6..1757facc6 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -995,7 +995,6 @@ $tw.loadTiddlers = function() {
 	// On the server, we load tiddlers from specified folders
 	var folders = [
 		$tw.boot.bootPath,
-		path.resolve($tw.boot.wikiPath,$tw.config.wikiSystemSubDir),
 		path.resolve($tw.boot.wikiPath,$tw.config.wikiTiddlersSubDir)
 	];
 	for(var t=0; t<folders.length; t++) {
@@ -1063,7 +1062,6 @@ $tw.boot.startup = function() {
 			pluginsPath: "../plugins/",
 			wikiInfo: "./tiddlywiki.info",
 			wikiPluginsSubDir: "./plugins",
-			wikiSystemSubDir: "./wiki",
 			wikiTiddlersSubDir: "./tiddlers",
 			jsModuleHeaderRegExpString: "^\\/\\*\\\\\\n((?:^[^\\n]*\\n)+?)(^\\\\\\*\\/$\\n?)",
 			fileExtensionInfo: {}, // Map file extension to {type:}
diff --git a/editions/clientserver/wiki/DefaultTiddlers.tid b/editions/clientserver/tiddlers/system/DefaultTiddlers.tid
similarity index 100%
rename from editions/clientserver/wiki/DefaultTiddlers.tid
rename to editions/clientserver/tiddlers/system/DefaultTiddlers.tid
diff --git a/editions/clientserver/wiki/SiteSubtitle.tid b/editions/clientserver/tiddlers/system/SiteSubtitle.tid
similarity index 100%
rename from editions/clientserver/wiki/SiteSubtitle.tid
rename to editions/clientserver/tiddlers/system/SiteSubtitle.tid
diff --git a/editions/clientserver/wiki/SiteTitle.tid b/editions/clientserver/tiddlers/system/SiteTitle.tid
similarity index 100%
rename from editions/clientserver/wiki/SiteTitle.tid
rename to editions/clientserver/tiddlers/system/SiteTitle.tid
diff --git a/editions/clientserver/wiki/html-div-tiddler.tid b/editions/clientserver/tiddlers/system/html-div-tiddler.tid
similarity index 100%
rename from editions/clientserver/wiki/html-div-tiddler.tid
rename to editions/clientserver/tiddlers/system/html-div-tiddler.tid
diff --git a/editions/tw5.com/wiki/DefaultTiddlers.tid b/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid
similarity index 100%
rename from editions/tw5.com/wiki/DefaultTiddlers.tid
rename to editions/tw5.com/tiddlers/system/DefaultTiddlers.tid
diff --git a/editions/tw5.com/wiki/MainMenu.tid b/editions/tw5.com/tiddlers/system/MainMenu.tid
similarity index 100%
rename from editions/tw5.com/wiki/MainMenu.tid
rename to editions/tw5.com/tiddlers/system/MainMenu.tid
diff --git a/editions/tw5.com/wiki/SiteSubtitle.tid b/editions/tw5.com/tiddlers/system/SiteSubtitle.tid
similarity index 100%
rename from editions/tw5.com/wiki/SiteSubtitle.tid
rename to editions/tw5.com/tiddlers/system/SiteSubtitle.tid
diff --git a/editions/tw5.com/wiki/SiteTitle.tid b/editions/tw5.com/tiddlers/system/SiteTitle.tid
similarity index 100%
rename from editions/tw5.com/wiki/SiteTitle.tid
rename to editions/tw5.com/tiddlers/system/SiteTitle.tid
diff --git a/editions/tw5.com/wiki/analytics.tid b/editions/tw5.com/tiddlers/system/analytics.tid
similarity index 100%
rename from editions/tw5.com/wiki/analytics.tid
rename to editions/tw5.com/tiddlers/system/analytics.tid
diff --git a/editions/tw5tiddlyweb/wiki/DefaultTiddlers.tid b/editions/tw5tiddlyweb/tiddlers/system/DefaultTiddlers.tid
similarity index 100%
rename from editions/tw5tiddlyweb/wiki/DefaultTiddlers.tid
rename to editions/tw5tiddlyweb/tiddlers/system/DefaultTiddlers.tid
diff --git a/editions/tw5tiddlyweb/wiki/EditMode.tid b/editions/tw5tiddlyweb/tiddlers/system/EditMode.tid
similarity index 100%
rename from editions/tw5tiddlyweb/wiki/EditMode.tid
rename to editions/tw5tiddlyweb/tiddlers/system/EditMode.tid
diff --git a/editions/tw5tiddlyweb/wiki/SiteSubtitle.tid b/editions/tw5tiddlyweb/tiddlers/system/SiteSubtitle.tid
similarity index 100%
rename from editions/tw5tiddlyweb/wiki/SiteSubtitle.tid
rename to editions/tw5tiddlyweb/tiddlers/system/SiteSubtitle.tid
diff --git a/editions/tw5tiddlyweb/wiki/SiteTitle.tid b/editions/tw5tiddlyweb/tiddlers/system/SiteTitle.tid
similarity index 100%
rename from editions/tw5tiddlyweb/wiki/SiteTitle.tid
rename to editions/tw5tiddlyweb/tiddlers/system/SiteTitle.tid