Merge the dev material back into the main tw5.com wiki

It was getting a pain to manage the content in separate places, and I
suspect confusing for end users.

I think the best time to move the dev content out is when we’ve
established the community wiki for TW5, which is a much more natural
home for it.

In the meantime, a feature that I’m interested in exploring is the
ability to hide tiddlers from the UI based on tag. Then the tw5.com
wiki could disable all tiddlers tagged ‘dev’ until explicitly
overridden by the user.

bld.cmd

@@ -16,19 +16,17 @@ if not exist %TW5_BUILD_OUTPUT%\nul (
 echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT%
 echo.
 
-rem Create the `static` and `dev` directories if necessary
+rem Create the `static` directories if necessary
 
 setlocal enableextensions
 mkdir %TW5_BUILD_OUTPUT%\static
-mkdir %TW5_BUILD_OUTPUT%\dev
-mkdir %TW5_BUILD_OUTPUT%\dev\static
 setlocal disableextensions
 
 rem Delete any existing content
 
 del /q /s %TW5_BUILD_OUTPUT%\static
 
-rem First, the tw5.com wiki
+rem The tw5.com wiki
 rem  index.html: the main file, including content
 rem  empty.html: the main file, excluding content
 rem  static.html: the static version of the default tiddlers
@@ -37,13 +35,15 @@ node .\tiddlywiki.js ^
 	.\editions\tw5.com ^
 	--verbose ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\index.html text/plain ^
+	--rendertiddler ReadMe .\readme.md text/html ^
+	--rendertiddler ContributingTemplate .\contributing.md text/html ^
 	--rendertiddler $:/editions/tw5.com/save-empty %TW5_BUILD_OUTPUT%\empty.html text/plain ^
 	--rendertiddler $:/core/templates/static.template.html %TW5_BUILD_OUTPUT%\static.html text/plain ^
 	--rendertiddler $:/core/templates/static.template.css %TW5_BUILD_OUTPUT%\static\static.css text/plain ^
 	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html %TW5_BUILD_OUTPUT%\static text/plain ^
 	|| exit 1
 
-rem Second, encrypted.html: a version of the main file encrypted with the password "password"
+rem encrypted.html: a version of the main file encrypted with the password "password"
 
 node .\tiddlywiki.js ^
 	.\editions\tw5.com ^
@@ -52,20 +52,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\encrypted.html text/plain ^
 	|| exit 1
 
-rem Third, dev.html: developer info wiki
-
-node .\tiddlywiki.js ^
-	.\editions\dev ^
-	--verbose ^
-	--rendertiddler ReadMe .\readme.md text/html ^
-	--rendertiddler ContributingTemplate .\contributing.md text/html ^
-	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\dev\index.html text/plain ^
-	--rendertiddler $:/core/templates/static.template.html %TW5_BUILD_OUTPUT%\dev\static.html text/plain ^
-	--rendertiddler $:/core/templates/static.template.css %TW5_BUILD_OUTPUT%\dev\static\static.css text/plain ^
-	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html %TW5_BUILD_OUTPUT%\dev\static text/plain ^
-	|| exit 1
-
-rem Fourth, tahoelafs.html: empty wiki with plugin for Tahoe-LAFS
+rem tahoelafs.html: empty wiki with plugin for Tahoe-LAFS
 
 node .\tiddlywiki.js ^
 	.\editions\tahoelafs ^
@@ -73,7 +60,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\tahoelafs.html text/plain ^
 	|| exit 1
 
-rem Fifth, d3demo.html: wiki to demo d3 plugin
+rem d3demo.html: wiki to demo d3 plugin
 
 node .\tiddlywiki.js ^
 	.\editions\d3demo ^
@@ -81,7 +68,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\d3demo.html text/plain ^
 	|| exit 1
 
-rem Sixth, codemirrordemo.html: wiki to demo codemirror plugin
+rem codemirrordemo.html: wiki to demo codemirror plugin
 
 node .\tiddlywiki.js ^
 	.\editions\codemirrordemo ^
@@ -89,7 +76,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\codemirrordemo.html text/plain ^
 	|| exit 1
 
-rem Seventh, codemirrordemo.html: wiki to demo codemirror plugin
+rem markdowndemo.html: wiki to demo markdown plugin
 
 node .\tiddlywiki.js ^
 	.\editions\markdowndemo ^
@@ -102,6 +89,6 @@ rem Make the CNAME file that GitHub Pages requires
 
 echo five.tiddlywiki.com > %TW5_BUILD_OUTPUT%\CNAME
 
-rem Eighth, run the test edition to run the Node.js tests and to generate test.html for tests in the browser
+rem Run the test edition to run the Node.js tests and to generate test.html for tests in the browser
 
 .\test.cmd

bld.sh

@@ -19,17 +19,15 @@ echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]"
 
 echo "five.tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME
 
-# Create the `static` and `dev` directories if necessary
+# Create the `static` directories if necessary
 
 mkdir -p $TW5_BUILD_OUTPUT/static
-mkdir -p $TW5_BUILD_OUTPUT/dev
-mkdir -p $TW5_BUILD_OUTPUT/dev/static
 
 # Delete any existing content
 
 rm $TW5_BUILD_OUTPUT/static/*
 
-# First, the tw5.com wiki
+# The tw5.com wiki
 #  index.html: the main file, including content
 #  empty.html: the main file, excluding content
 #  static.html: the static version of the default tiddlers
@@ -38,13 +36,15 @@ node ./tiddlywiki.js \
 	./editions/tw5.com \
 	--verbose \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/index.html text/plain \
+	--rendertiddler ReadMe ./readme.md text/html \
+	--rendertiddler ContributingTemplate ./contributing.md text/html \
 	--rendertiddler $:/editions/tw5.com/save-empty $TW5_BUILD_OUTPUT/empty.html text/plain \
 	--rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
 	--rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
 	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
 	|| exit 1
 
-# Second, encrypted.html: a version of the main file encrypted with the password "password"
+# encrypted.html: a version of the main file encrypted with the password "password"
 
 node ./tiddlywiki.js \
 	./editions/tw5.com \
@@ -53,20 +53,7 @@ node ./tiddlywiki.js \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/encrypted.html text/plain \
 	|| exit 1
 
-# Third, dev.html: developer info wiki
-
-node ./tiddlywiki.js \
-	./editions/dev \
-	--verbose \
-	--rendertiddler ReadMe ./readme.md text/html \
-	--rendertiddler ContributingTemplate ./contributing.md text/html \
-	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/dev/index.html text/plain \
-	--rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/dev/static.html text/plain \
-	--rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/dev/static/static.css text/plain \
-	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/dev/static text/plain \
-	|| exit 1
-
-# Fourth, tahoelafs.html: empty wiki with plugin for Tahoe-LAFS
+# tahoelafs.html: empty wiki with plugin for Tahoe-LAFS
 
 node ./tiddlywiki.js \
 	./editions/tahoelafs \
@@ -74,7 +61,7 @@ node ./tiddlywiki.js \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/tahoelafs.html text/plain \
 	|| exit 1
 
-# Fifth, d3demo.html: wiki to demo d3 plugin
+# d3demo.html: wiki to demo d3 plugin
 
 node ./tiddlywiki.js \
 	./editions/d3demo \
@@ -82,7 +69,7 @@ node ./tiddlywiki.js \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/d3demo.html text/plain \
 	|| exit 1
 
-# Sixth, codemirrordemo.html: wiki to demo codemirror plugin
+# codemirrordemo.html: wiki to demo codemirror plugin
 
 node ./tiddlywiki.js \
 	./editions/codemirrordemo \
@@ -90,7 +77,7 @@ node ./tiddlywiki.js \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/codemirrordemo.html text/plain \
 	|| exit 1
 
-# Seventh, codemirrordemo.html: wiki to demo codemirror plugin
+# markdowndemo.html: wiki to demo markdown plugin
 
 node ./tiddlywiki.js \
 	./editions/markdowndemo \
@@ -98,6 +85,6 @@ node ./tiddlywiki.js \
 	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/markdowndemo.html text/plain \
 	|| exit 1
 
-# Eighth, run the test edition to run the Node.js tests and to generate test.html for tests in the browser
+# Run the test edition to run the Node.js tests and to generate test.html for tests in the browser
 
 ./test.sh

editions/dev/tiddlers/HelloThere.tid

@@ -1,24 +0,0 @@
-created: 20130822170200000
-creator: JeremyRuston
-modified: 20131126220042886
-modifier: JeremyRuston
-tags: introduction
-title: HelloThere
-type: text/vnd.tiddlywiki
-
-This is the developer documentation hub for TiddlyWiki. For convenience, it also contains all of the end user documentation that appears at http://five.tiddlywiki.com/.
-
-! Overview
-
-* TiddlyWikiArchitecture
-* [[TiddlyWiki5 Development Environment]]
-* [[Building classic TiddlyWiki with TiddlyWiki5]]
-
-! Developer Cookbooks
-
-<$list filter="[tag[dev]tag[howto]sort[title]]"/>
-
-! Internal Objects and Mechanisms
-
-<$list filter="[tag[mechanism]sort[title]]"/>
-

editions/dev/tiddlers/system/DefaultTiddlers.tid

@@ -1,6 +0,0 @@
-title: $:/DefaultTiddlers
-
-HelloThere
-Resources
-ReleaseHistory
-RoadMap

editions/dev/tiddlers/system/SiteSubtitle.tid

@@ -1,4 +0,0 @@
-title: SiteSubtitle
-modifier: JeremyRuston
-
-developer information for ~TiddlyWiki5

editions/dev/tiddlers/system/SiteTitle.tid

@@ -1,4 +0,0 @@
-title: SiteTitle
-modifier: JeremyRuston
-
-five.tiddlywiki.com/dev

editions/dev/tiddlers/system/theme.tid

@@ -1,3 +0,0 @@
-title: $:/theme
-
-$:/themes/tiddlywiki/nighttime

editions/dev/tiddlywiki.info

@@ -1,14 +0,0 @@
-{
-	"plugins": [
-		"tiddlywiki/fullscreen",
-		"tiddlywiki/googleanalytics",
-		"tiddlywiki/github-fork-ribbon"
-	],
-	"themes": [
-		"tiddlywiki/nighttime",
-		"tiddlywiki/vanilla"
-	],
-	"includeWikis": [
-		"../tw5.com"
-	]
-}

editions/tw5.com/tiddlers/Release 5.0.0alpha16.tid

@@ -7,13 +7,9 @@ tags: releasenote
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.0-alpha.15...v5.0.0-alpha.16]]//
 
-!! New Features
+!! New Features and Improvements
 
 * Added a new plugin for displaying corner ribbons; currently used for a version banner on tw5.com
-
-!! Improvements
-
-* Separated developer content into new wiki at http://five.tiddlywiki.com/dev/
 * Split ''Snow White'' theme into a base ''Vanilla'' theme with all the basic formatting, leaving the decorative bits to ''Snow White''
 ** Existing WikiFolders will need updating to include ''Vanilla'' as an additional theme
 * The page building blocks are now driven by the system tag `$:/tags/PageTemplate`