diff --git a/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid b/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid index a2dfb7845..c9cef5655 100644 --- a/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid @@ -9,7 +9,7 @@ TiddlyWiki5 can be used to build older 2.x.x versions of TiddlyWiki from their c ! Usage -TiddlyWikiClassic is built from the command line by running TiddlyWiki5 under node.js. A typical usage would be: +TiddlyWikiClassic is built from the command line by running TiddlyWiki5 under Node.js. A typical usage would be: ``` node ../../tiddlywiki.js \ diff --git a/editions/tw5.com/tiddlers/Download.tid b/editions/tw5.com/tiddlers/Download.tid index 122483c75..f9537f331 100644 --- a/editions/tw5.com/tiddlers/Download.tid +++ b/editions/tw5.com/tiddlers/Download.tid @@ -12,9 +12,9 @@ Right click and download these links to single file editions of TiddlyWiki5: * [[empty|http://five.tiddlywiki.com/empty]] * [[tw5.com|http://five.tiddlywiki.com/]] -! Download node.js Edition +! Download Node.js Edition -For working on the command line with the node.js edition of TiddlyWiki5, you can install TiddlyWiki via [[npm|http://npmjs.org]]: +For working on the command line with the Node.js edition of TiddlyWiki5, you can install TiddlyWiki via [[npm|http://npmjs.org]]: ``` npm -g install tiddlywiki diff --git a/editions/tw5.com/tiddlers/Features.tid b/editions/tw5.com/tiddlers/Features.tid index 56afa069d..28f9d53d4 100644 --- a/editions/tw5.com/tiddlers/Features.tid +++ b/editions/tw5.com/tiddlers/Features.tid @@ -20,7 +20,7 @@ type: text/vnd.tiddlywiki * [[CodeMirror support via a plugin|http://five.tiddlywiki.com/codemirrordemo.html]] * [[Markdown support via a plugin|http://five.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 +** 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 ** TiddlyWiki5 can directly build both itself and previous (2.x.x) versions of TiddlyWiki from their constituent separate files, without needing external tools ** Run the TiddlyWiki5 [[test suite|TestingMechanism]] from http://five.tiddlywiki.com/test.html diff --git a/editions/tw5.com/tiddlers/HelloThere.tid b/editions/tw5.com/tiddlers/HelloThere.tid index 5a1ba40f9..60c3b612f 100644 --- a/editions/tw5.com/tiddlers/HelloThere.tid +++ b/editions/tw5.com/tiddlers/HelloThere.tid @@ -6,7 +6,7 @@ tags: introduction title: HelloThere type: text/vnd.tiddlywiki -Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the non-linear personal web notebook first released in 2004. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful [[Node.js application|node.js]]. +Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the non-linear personal web notebook first released in 2004. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful [[Node.js application|Node.js]]. This is TiddlyWiki5 version //<>//. It is drawing to the end of the alpha phase, meaning it is almost ready for everyday use. It is a great time to get involved and support its [[future development|RoadMap]]: diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid index fb0e0aa72..ef20a41ce 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid @@ -5,4 +5,4 @@ modifier: JeremyRuston tags: concepts title: TiddlyWiki5 -TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[node.js]]. +TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[Node.js]]. diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid index 41c55f814..2f113ec03 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid @@ -5,7 +5,7 @@ modifier: JeremyRuston tags: dev title: TiddlyWikiFolders -As well as traditional single file wikis, TiddlyWiki5 [[under node.js|TiddlyWiki5 Node Edition]] supports wikis that are stored as a folder of individual tiddler files. +As well as traditional single file wikis, TiddlyWiki5 [[under Node.js|TiddlyWiki5 Node Edition]] supports wikis that are stored as a folder of individual tiddler files. ! Wiki folder files and folders diff --git a/editions/tw5.com/tiddlers/definitions/node.js.tid b/editions/tw5.com/tiddlers/definitions/node.js.tid index 6ef17d4d5..b3847b066 100644 --- a/editions/tw5.com/tiddlers/definitions/node.js.tid +++ b/editions/tw5.com/tiddlers/definitions/node.js.tid @@ -1,10 +1,10 @@ -title: node.js +title: Node.js tags: definitions -[[node.js]] is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike JavaScript applications running in a web browser, [[node.js]] code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. See http://nodejs.org/ for more details. +[[Node.js]] is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike JavaScript applications running in a web browser, [[Node.js]] code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. See http://nodejs.org for more details. -For TiddlyWiki, [[node.js]] means that we can have a single code base that can run in the browser or on the server, giving great flexibility in how it is used. +For TiddlyWiki, [[Node.js]] means that we can have a single code base that can run in the browser or on the server, giving great flexibility in how it is used. -For end users, [[node.js]] is no more complicated to install than a web browser, but unlocks powerful capabilities such as the ability to run TiddlyWiki as a web server that you can connect to from other devices. +For end users, [[Node.js]] is no more complicated to install than a web browser, but unlocks powerful capabilities such as the ability to run TiddlyWiki as a web server that you can connect to from other devices. See [[TiddlyWiki5 Node Edition]] for more details. diff --git a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid index 3e804bb02..0576e2f7f 100644 --- a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid +++ b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid @@ -33,7 +33,7 @@ For trying TiddlyWiki5 out under Node.js, several scripts are provided (.sh for This script builds several variants of TiddlyWiki5 for deployment on tiddlywiki.com. -By default, files are output to a folder called `jermolene.github.com`, sibling to the to the TiddlyWiki5 source directory. For example: +By default, files are output to a folder called `jermolene.github.com`, sibling to the TiddlyWiki5 source directory. For example: ``` /TiddlyWork/ - Directory for working with TiddlyWiki5 diff --git a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid index 8239a6317..064316986 100644 --- a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid @@ -7,9 +7,9 @@ title: BootMechanism !Introduction -At its heart, TiddlyWiki5 is a relatively small boot kernel that runs either under node.js or in the browser with all other functionality added via dynamically loaded [[modules|Modules]]. +At its heart, TiddlyWiki5 is a relatively small boot kernel that runs either under Node.js or in the browser with all other functionality added via dynamically loaded [[modules|Modules]]. -The kernel boots just enough of the TiddlyWiki environment to allow it to load and execute module tiddlers. The module system is compatible with CommonJS and [[node.js]]. +The kernel boots just enough of the TiddlyWiki environment to allow it to load and execute module tiddlers. The module system is compatible with CommonJS and [[Node.js]]. There are many [[different types of module|ModuleType]]: parsers, deserializers, widgets etc. It goes much further than you might expect. For example, individual tiddler fields are modules, too: there's a module that knows how to handle the `tags` field, and another that knows how to handle the special behaviour of the `modified` and `created` fields. Some plugin modules have further sub-plugins: the wikitext parser, for instance, accepts parsing rules as individual plugin modules. @@ -28,7 +28,7 @@ The boot kernel includes: * Code for the browser to load tiddlers from the HTML DOM * Code for the server to load tiddlers from the file system -Each module is an ordinary `node.js`-style module, using the `require()` function to access other modules and the `exports` global to return JavaScript values. The boot kernel smooths over the differences between `node.js` and the browser, allowing the same plugin modules to execute in both environments. +Each module is an ordinary `Node.js`-style module, using the `require()` function to access other modules and the `exports` global to return JavaScript values. The boot kernel smooths over the differences between `Node.js` and the browser, allowing the same plugin modules to execute in both environments. In the browser, `core/boot.js` is packed into a template HTML file that contains the following elements in order: @@ -37,6 +37,6 @@ In the browser, `core/boot.js` is packed into a template HTML file that contains * JavaScript modules, packed as HTML `