From 7dc7559b903e5d6de43757205c1087316c33b7da Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 15 Dec 2013 16:53:10 +0000 Subject: [PATCH] Adjust references to five.tiddlywiki.com --- bld.cmd | 2 +- bld.sh | 2 +- core/wiki/GettingStarted.tid | 4 ++-- editions/test/tiddlers/HelloThere.tid | 4 ++-- editions/tw5.com/tiddlers/Features.tid | 8 ++++---- editions/tw5.com/tiddlers/GettingStarted.tid | 2 +- editions/tw5.com/tiddlers/Upgrading.tid | 12 ++++++------ ...lyWiki for GitHub Pages project documentation.tid | 2 +- .../tw5.com/tiddlers/mechanisms/TestingMechanism.tid | 2 +- .../tw5.com/tiddlers/readme/ContributingTemplate.tid | 2 +- editions/tw5.com/tiddlers/readme/ReadMe.tid | 2 +- .../tw5.com/tiddlers/saving/Saving on TiddlySpot.tid | 2 +- .../tiddlers/saving/Saving on iPad_iPhone.tid | 2 +- editions/tw5.com/tiddlers/system/StaticBanner.tid | 2 +- editions/tw5.com/tiddlers/system/StaticLink.tid | 2 +- .../tiddlers/wikitext/Linking in WikiText.tid | 2 +- test.cmd | 2 +- test.sh | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bld.cmd b/bld.cmd index a1ad2b2dc..b36d255e2 100644 --- a/bld.cmd +++ b/bld.cmd @@ -1,6 +1,6 @@ @echo off -rem build TiddlyWiki5 for five.tiddlywiki.com +rem build TiddlyWiki5 for tiddlywiki.com rem Set up the build output directory diff --git a/bld.sh b/bld.sh index 3a0ed7b4d..ff373cbc9 100755 --- a/bld.sh +++ b/bld.sh @@ -1,6 +1,6 @@ #!/bin/bash -# build TiddlyWiki5 for five.tiddlywiki.com +# build TiddlyWiki5 for tiddlywiki.com # Set up the build output directory diff --git a/core/wiki/GettingStarted.tid b/core/wiki/GettingStarted.tid index e13c6e139..0538ebe8c 100644 --- a/core/wiki/GettingStarted.tid +++ b/core/wiki/GettingStarted.tid @@ -2,7 +2,7 @@ title: GettingStarted Welcome to TiddlyWiki, the non-linear personal web notebook. -To get started, first verify that you can save changes successfully - see http://five.tiddlywiki.com/ for detailed instructions. +To get started, first verify that you can save changes successfully - see http://tiddlywiki.com/ for detailed instructions. Then you can: @@ -10,4 +10,4 @@ Then you can: * Save changes using the 'download' button in the sidebar * Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to determine which tiddlers appear when you open this wiki * Edit the SiteTitle and SiteSubtitle -* Learn more about [[WikiText|http://five.tiddlywiki.com/static/WikiText.html]] +* Learn more about [[WikiText|http://tiddlywiki.com/static/WikiText.html]] diff --git a/editions/test/tiddlers/HelloThere.tid b/editions/test/tiddlers/HelloThere.tid index aa11bb09f..f0c1d51a2 100644 --- a/editions/test/tiddlers/HelloThere.tid +++ b/editions/test/tiddlers/HelloThere.tid @@ -1,5 +1,5 @@ title: HelloThere -This is TiddlyWiki5's browser-based test runner. See the bottom of this page for the test results. +This is TiddlyWiki's browser-based test runner for version <>. See the bottom of this page for the test results. -http://five.tiddlywiki.com/ +http://tiddlywiki.com/ diff --git a/editions/tw5.com/tiddlers/Features.tid b/editions/tw5.com/tiddlers/Features.tid index 99f71870b..98cf4f790 100644 --- a/editions/tw5.com/tiddlers/Features.tid +++ b/editions/tw5.com/tiddlers/Features.tid @@ -14,14 +14,14 @@ type: text/vnd.tiddlywiki * Clone existing tiddlers (for example, <$button message="tw-new-tiddler" param=<>>clone this tiddler) * TiddlyWiki is [[surprisingly scalable|Scalability]] to many thousands of tiddlers and megabytes of content * Try out the <$button message="tw-full-screen">full screen support -* Explore the [[D3.js visualisation plugin|http://five.tiddlywiki.com/d3demo.html]] -* [[CodeMirror support via a plugin|http://five.tiddlywiki.com/codemirrordemo.html]] -* [[Markdown support via a plugin|http://five.tiddlywiki.com/markdowndemo.html]] +* Explore the [[D3.js visualisation plugin|http://tiddlywiki.com/d3demo.html]] +* [[CodeMirror support via a plugin|http://tiddlywiki.com/codemirrordemo.html]] +* [[Markdown support via a plugin|http://tiddlywiki.com/markdowndemo.html]] * Many internal improvements: ** TiddlyWiki can now be run under [[Node.js]] as well as in the browser, allowing it to be used as a personal web server ** An elegant [[microkernel architecture|PluginMechanism]], that allows infinite customisation by replacing and augmenting the core modules ** TiddlyWiki version 5 can directly build both itself and previous (2.x.x) versions of TiddlyWiki from their constituent separate files, without needing external tools -** Run the TiddlyWiki [[test suite|TestingMechanism]] from http://five.tiddlywiki.com/test.html +** Run the TiddlyWiki [[test suite|TestingMechanism]] from http://tiddlywiki.com/test.html * Last but not least, TiddlyWiki is a rare example of a practical [[quine|Quine]] The deep internal changes mean that TiddlyWiki version 5 is not compatible with previous versions, using different plugins, themes and so on. Content prepared for previous versions of TiddlyWiki will need massaging to work properly. When asking or searching for help be sure to specify TiddlyWiki5 (or TW5). diff --git a/editions/tw5.com/tiddlers/GettingStarted.tid b/editions/tw5.com/tiddlers/GettingStarted.tid index 22dbe3eb5..fd69baf68 100644 --- a/editions/tw5.com/tiddlers/GettingStarted.tid +++ b/editions/tw5.com/tiddlers/GettingStarted.tid @@ -1,5 +1,5 @@ created: 20131129090249275 -modified: 20131212222628625 +modified: 20131215165204528 tags: introduction title: GettingStarted type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/Upgrading.tid b/editions/tw5.com/tiddlers/Upgrading.tid index 4fdcd6d3d..eb4e2db34 100644 --- a/editions/tw5.com/tiddlers/Upgrading.tid +++ b/editions/tw5.com/tiddlers/Upgrading.tid @@ -10,7 +10,7 @@ There are several methods for upgrading an existing TiddlyWiki document to a new Note that none of your personal data leaves your browser with this process. -# Visit http://five.tiddlywiki.com/empty.html +# Visit http://tiddlywiki.com/empty.html # Drag your old TiddlyWiki HTML file into the browser window #* Your tiddlers should be imported # Save changes to save the new version. @@ -22,13 +22,13 @@ This will download a file called ''empty.html'' to your computer. This file is t ># Open the control panel to the ''Plugins'' tab in your upgraded wiki ># Check the version numbers of the plugins you are using; any plugins with an older version than the version of [[$:/core]] will probably need updating ># Locate a wiki with the plugins you need to update and open the control panel ''Plugins'' tab ->#* http://five.tiddlywiki.com/d3demo.html for the D3 plugin ->#* http://five.tiddlywiki.com/codemirrordemo.html for the CodeMirror plugin ->#* http://five.tiddlywiki.com/markdowndemo.html for the MarkDown plugin ->#* http://five.tiddlywiki.com/ for most of the others +>#* http://tiddlywiki.com/d3demo.html for the D3 plugin +>#* http://tiddlywiki.com/codemirrordemo.html for the CodeMirror plugin +>#* http://tiddlywiki.com/markdowndemo.html for the MarkDown plugin +>#* http://tiddlywiki.com/ for most of the others ># Drag the plugin links one by one back to your own wiki. You should see the version numbers update in the control panel ># Save your wiki ! Offline upgrading -You can also download http://five.tiddlywiki.com/empty.html locally and perform the same drag-and-drop procedure to upgrade your files. +You can also download http://tiddlywiki.com/empty.html locally and perform the same drag-and-drop procedure to upgrade your files. diff --git a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid index 645807655..9c7eb50e2 100644 --- a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid +++ b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid @@ -20,7 +20,7 @@ It saves the tiddler ReadMe to the file `./readme.md` in the `text/html` format. By default, tiddler links will be rendered as `` links to a relative URI consisting of the title of the tiddler. This behaviour can be overridden by defining the macro `tw-wikilink-template`, as is done at the top of the tiddler ReadMe: ``` -\define tw-wikilink-template() http://five.tiddlywiki.com/static/$uri_encoded$.html +\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_encoded$.html ``` See the LinkWidget for more details. diff --git a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid index 769f8e7f1..6c6933d52 100644 --- a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid @@ -33,4 +33,4 @@ node ./tiddlywiki.js \ Then, open the `test.html` file in the browser to see the test results. There is a prebuilt version of `test.html` at: -http://five.tiddlywiki.com/test.html +http://tiddlywiki.com/test.html diff --git a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid index 0c9fb2b99..26bfa0b9b 100644 --- a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid +++ b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid @@ -2,7 +2,7 @@ created: 201308251449 modified: 201308251449 title: ContributingTemplate -\define tw-wikilink-template() http://five.tiddlywiki.com/static/$uri_encoded$.html +\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_encoded$.html ! Contributing to TiddlyWiki5 {{Contributing}} diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid index 1e1ee4e4f..0a3f867b1 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid @@ -3,7 +3,7 @@ modified: 20131129094808390 title: ReadMe type: text/vnd.tiddlywiki -\define tw-wikilink-template() http://five.tiddlywiki.com/static/$uri_encoded$.html +\define tw-wikilink-template() http://tiddlywiki.com/static/$uri_encoded$.html ! Welcome to TiddlyWiki5 {{HelloThere}} diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid index d06ee387d..791608f20 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid @@ -9,7 +9,7 @@ TiddlySpot is a free hosting service for TiddlyWiki documents from Simon and Dan TiddlyWiki5 isn't yet built in to TiddlySpot but you can use it by following these steps: # Sign up for a new wiki at http://tiddlyspot.com/, and remember the wiki name and password -# Open TiddlyWiki5 in your browser from http://five.tiddlywiki.com/empty.html +# Open TiddlyWiki5 in your browser from http://tiddlywiki.com/empty.html # Fill in the TiddlySpot wikiname and password in the control panel # Click the "Save Changes" button. You should get a confirmation notification at the top right saying ''Saved wiki''. Saving can take several seconds if you're on a slow connection or working with a large wiki. #* //This step won't work in Firefox thanks to its default security policy. Google Chrome works fine// diff --git a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid index ccb429e8a..2453edf58 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid @@ -11,7 +11,7 @@ Instructions for use: # Open TWEdit # Touch the title in the centre of the toolbar in order #* A text box should appear allowing you to enter a URL -# Enter the URL `http://five.tiddlywiki.com/empty.html` +# Enter the URL `http://tiddlywiki.com/empty.html` # When the empty TiddlyWiki5 has loaded, touch the ''save'' icon (it's the second icon from the right on the top toolbar) #* An alert box should appear allowing you to enter a local filename # Enter the filename you wish to use for the document (ending with `.html`) diff --git a/editions/tw5.com/tiddlers/system/StaticBanner.tid b/editions/tw5.com/tiddlers/system/StaticBanner.tid index 3885dd42a..e876ef52e 100644 --- a/editions/tw5.com/tiddlers/system/StaticBanner.tid +++ b/editions/tw5.com/tiddlers/system/StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -
This page is part of a static HTML representation of the ~TiddlyWiki at http://five.tiddlywiki.com/
+
This page is part of a static HTML representation of the ~TiddlyWiki at http://tiddlywiki.com/
diff --git a/editions/tw5.com/tiddlers/system/StaticLink.tid b/editions/tw5.com/tiddlers/system/StaticLink.tid index eed540ec2..282ab709b 100644 --- a/editions/tw5.com/tiddlers/system/StaticLink.tid +++ b/editions/tw5.com/tiddlers/system/StaticLink.tid @@ -3,7 +3,7 @@ tags: $:/tags/TiddlerInfo caption: Static Link \define makeLink() -http://five.tiddlywiki.com/static/<$view tiddler=<> field="title" format="doubleurlencoded"/>.html +http://tiddlywiki.com/static/<$view tiddler=<> field="title" format="doubleurlencoded"/>.html \end \define outerMakeLink() <$macrocall $name="makeLink" $output="text/plain"/> diff --git a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid index 746595928..bdc774e2a 100644 --- a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid @@ -9,7 +9,7 @@ A key capability of WikiText is the ability to make links to other tiddlers or t * To link to a tiddler by title: `[[Tiddler Title]]` * To link to a tiddler and specify the text of the link: `[[Displayed Link Title|Tiddler Title]]` * For tiddler titles that match the CamelCase rules, just typing the title will automatically create a link -* To link to an external website, type the full URL of the site: `http://five.tiddlywiki.com/` or `[[TW5|http://five.tiddlywiki.com/]]` +* To link to an external website, type the full URL of the site: `http://tiddlywiki.com/` or `[[TW5|http://tiddlywiki.com/]]` You can suppress a link from being recognised by preceding it with `~`. For example: diff --git a/test.cmd b/test.cmd index 28dbcc376..d35452d5b 100644 --- a/test.cmd +++ b/test.cmd @@ -1,6 +1,6 @@ @echo off -rem test TiddlyWiki5 for five.tiddlywiki.com +rem test TiddlyWiki5 for tiddlywiki.com rem Set up the build output directory diff --git a/test.sh b/test.sh index d4336a74b..474ea8152 100755 --- a/test.sh +++ b/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -# test TiddlyWiki5 for five.tiddlywiki.com +# test TiddlyWiki5 for tiddlywiki.com # Set up the build output directory