diff --git a/contributing.md b/contributing.md index 24488cf36..0719aea4e 100644 --- a/contributing.md +++ b/contributing.md @@ -1,6 +1,7 @@

Contributing to -TiddlyWiki5

+TiddlyWiki5
+

TiddlyWiki5 welcomes contributions to its code and documentation @@ -26,7 +27,7 @@ ContributorLicenseAgreement from individual contributors before contribution As of July 2013, TiddlyWiki5 does not yet have the necessary infrastructure to permit CLAs to be signed and retained. -

+

This file was automatically generated by TiddlyWiki5 diff --git a/editions/clientserver/tiddlers/system/DefaultTiddlers.tid b/editions/clientserver/tiddlers/system/DefaultTiddlers.tid index 2b6a66f2e..5bb42db2a 100644 --- a/editions/clientserver/tiddlers/system/DefaultTiddlers.tid +++ b/editions/clientserver/tiddlers/system/DefaultTiddlers.tid @@ -8,4 +8,5 @@ title: $:/DefaultTiddlers HelloThere Features [[TiddlyWiki5 Editions]] +RoadMap Docs diff --git a/editions/tw2/readme.md b/editions/tw2/readme.md index 499c86642..a1f650787 100644 --- a/editions/tw2/readme.md +++ b/editions/tw2/readme.md @@ -1,7 +1,8 @@

Building classic TiddlyWiki with -TiddlyWiki5

+TiddlyWiki5
+

TiddlyWiki5 can be used to build older 2.x.x versions of @@ -32,5 +33,5 @@ TiddlyWiki5 under node.js. A typical usage would be:

 node ../../tiddlywiki.js \
 	--verbose \
 	--load <path_to_recipe_file> \
-	--savetiddler $:/core/templates/tiddlywiki2.template.html <path_to_write_index_file> text/plain \
-	|| exit 1
\ No newline at end of file + --rendertiddler $:/core/templates/tiddlywiki2.template.html <path_to_write_index_file> text/plain \ + || exit 1
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/Features.tid b/editions/tw5.com/tiddlers/Features.tid index dd7280547..245372d52 100644 --- a/editions/tw5.com/tiddlers/Features.tid +++ b/editions/tw5.com/tiddlers/Features.tid @@ -1,10 +1,11 @@ created: 201308221728 creator: JeremyRuston -modified: 201308231840 +modified: 201308231953 modifier: JeremyRuston tags: docs introduction title: Features +* The ability to save changes on almost any desktop HTML5 compatible-browser * [[Bitmap images|Motovun Jack.jpg]] and [[SVG images|Motovun Jack.svg]] are first-class citizens alongside text * Concise and expressive WikiText that generates semantic HTML * Integrated [[AES encryption|How to use TiddlyWiki5 as a standalone HTML file with encryption]] diff --git a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid index a39524846..fc704a930 100644 --- a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid +++ b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid @@ -1,7 +1,9 @@ -modified: 201308201324 -title: RoadMap +created: 201308232038 +creator: JeremyRuston +modified: 201308232040 modifier: JeremyRuston tags: docs planning +title: RoadMap TiddlyWiki5 is under rapid development at the moment, moving through a series of stages from alpha, via beta into a stable release. diff --git a/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid b/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid index e23b52aa3..b8869f15f 100644 --- a/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid +++ b/editions/tw5.com/tiddlers/system/DefaultTiddlers.tid @@ -3,5 +3,6 @@ title: $:/DefaultTiddlers HelloThere Features [[TiddlyWiki5 Editions]] +RoadMap Improvements Docs diff --git a/readme.md b/readme.md index 20ffaf0d7..416673f09 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,7 @@

Welcome to -TiddlyWiki5

+TiddlyWiki5
+

Welcome to TiddlyWiki5, a reboot of @@ -8,27 +9,23 @@ TiddlyWiki, the non-linear personal web notebook JavaScript that can be run from a single HTML file in the browser or as a powerful node.js application.

- -TiddlyWiki is designed to fit around your brain, providing a better way of managing the overflow than traditional documents and emails. The fundamental idea is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks – -tiddlers – and give them titles so that they can be structured with links, tags and macros. -TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.

-TiddlyWiki5 has many -improvements over the original. It is currently in alpha, meaning it is working but incomplete. It is a great time to get involved and support its -future development. You can:

+help the TiddlyWiki project and community

Getting started with -TiddlyWiki under node.js

+TiddlyWiki under node.js
+

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on tiddlers, @@ -123,7 +120,7 @@ opendiff program to display the differences between them.

The following commands are available:

-
+

@@ -137,7 +134,7 @@ TiddlyWiki files ( .tid, .json or other files 

 --load <filepath>

-
+

@@ -146,7 +143,7 @@ PasswordCommand

Set a password for subsequent crypto operations

 --password <password>
-
+

@@ -167,7 +164,7 @@ Print the titles of the system tiddlers in the wiki store 

 print config

Print the current core configuration 

 --print config

-
+

@@ -178,7 +175,7 @@ Render an individual tiddler as a specified -
+

@@ -192,7 +189,7 @@ text/html) and extension (defaults to --rendertiddlers <filter> <template> <pathname> [<type>] [<extension>]

For example:

 --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain

-
+

@@ -222,7 +219,7 @@ servetype - the content type with which the root tiddler should be serv username - the default username for signing edits

For example:

 --server 8080 $:/core/tiddlywiki5.template.html text/plain text/html MyUserName

-
+

@@ -231,7 +228,7 @@ VerboseCommand

Triggers verbose output, useful for debugging 

 --verbose
-
+

@@ -240,7 +237,7 @@ VersionCommand

Displays the version number of TiddlyWiki.

---version

+--version

This readme file was automatically generated by TiddlyWiki5