From 0f0ecd3d9e217e29d48aca33dc3ba2f5f8694eac Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Mon, 22 Dec 2014 17:05:08 +0000 Subject: [PATCH 1/5] Improvements to wording --- .../tiddlers/workingwithtw/Formatting text in TW.tid | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid b/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid index 229cd1691..9fa21fb68 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid @@ -14,19 +14,19 @@ At its simplest, WikiText lets you use familiar word-processing features like bo The ''quick'' brown ~~flea~~ fox //jumps// over the `lazy` dog ``` -Displays as: +… displays as: The ''quick'' brown ~~flea~~ fox //jumps// over the `lazy` dog ! Working with Tiddlers -WikiText allows you to link to tiddlers using double square brackets, or taking advantage of the automatic linking of CamelCase words: +In WikiText, you can link to tiddlers using double square brackets, or by taking advantage of the automatic linking of CamelCase words: ``` This is a link to HelloThere, and one to [[History of TiddlyWiki]] ``` -Displays as: +… displays as: This is a link to HelloThere, and one to [[History of TiddlyWiki]] @@ -34,7 +34,7 @@ This is a link to HelloThere, and one to [[History of TiddlyWiki]] Macros let you package repetitive fragments of WikiText so that you can easily reuse them. -For example, here is the definition of a macro that generates a YouTube video URL from its unique identifier: +For example, here is the definition of a macro that generates a ~YouTube video URL from its unique identifier: ``` \define youtube(video) From 2871c5fcb21b71559db209d262d4a1ff7063ba15 Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Mon, 22 Dec 2014 17:07:42 +0000 Subject: [PATCH 2/5] Improvements to wording --- editions/tw5.com/tiddlers/definitions/CamelCase.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/definitions/CamelCase.tid b/editions/tw5.com/tiddlers/definitions/CamelCase.tid index a0275c525..b0847ac6d 100644 --- a/editions/tw5.com/tiddlers/definitions/CamelCase.tid +++ b/editions/tw5.com/tiddlers/definitions/CamelCase.tid @@ -3,4 +3,4 @@ modified: 201308281853 tags: Definitions title: CamelCase -CamelCase is formed by taking a phrase, capitalising each initial letter and smashing them together to form a portmanteau word. Most wikis use CamelCase to signal phrases that should be automatically linked. +CamelCase is formed by taking a phrase, capitalising the initial letter of each word, and smashing the words together to form a portmanteau word. Most wikis use CamelCase to signal phrases that should automatically become links. From 6fe1024fe8b718becec2c75201f7825983b57130 Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Mon, 22 Dec 2014 17:09:48 +0000 Subject: [PATCH 3/5] Improvements to wording --- editions/tw5.com/tiddlers/workingwithtw/Audio.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/workingwithtw/Audio.tid b/editions/tw5.com/tiddlers/workingwithtw/Audio.tid index 2f788e741..0bb467dfc 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Audio.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Audio.tid @@ -10,7 +10,7 @@ Audio files can be incorporated into TiddlyWiki in a very similar way to [[image Small audio files can be embedded directly within TiddlyWiki. Embedding isn't suitable for large files (over a few hundred kilobytes) because it increases the size of the TiddlyWiki file. -For example, the tiddler [[TiddlyWiki.mp3]] contains an MP3 recording of the word "TiddlyWiki". Viewing the tiddler directly should show an audio player that allows playback. +For example, the tiddler [[TiddlyWiki.mp3]] contains an MP3 recording of the word "TiddlyWiki". If you visit that tiddler, you should see an audio player that will play back the recording. You can also transclude audio files. For example: @@ -18,7 +18,7 @@ You can also transclude audio files. For example: ! External Audio -External audio tiddlers use the ''_canonical_uri'' field to point to an external audio file/stream, and have a block ''text'' field. This reduces their size considerably, and still allows for playback. +External audio tiddlers use the ''_canonical_uri'' field to point to an external audio file/stream, and have their ''text'' field blocked. This reduces their size considerably, but still allows for playback. For example, the tiddler [[Caruso - Ave Maria]] points to an online audio recording hosted on http://archive.org: From c6fbaadfeb1601c6a6560df55685dd9f249ccf4b Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Mon, 22 Dec 2014 17:26:27 +0000 Subject: [PATCH 4/5] Improvements to wording --- .../workingwithtw/Using links to navigate.tid | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid index db46e1fca..b18133ad4 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid @@ -4,50 +4,50 @@ tags: [[Working with TiddlyWiki]] title: Using links to navigate between tiddlers type: text/vnd.tiddlywiki -You can use internal hyperlinks (links between tiddlers, normally displayed in blue text) to navigate between your tiddlers. Clicking on a link to any tiddler will take you to that tiddler. If the tiddler is closed, it will be opened. The wonderful thing about ~TiddlyWiki is that it has made links to tiddlers as accessible as possible. There are links everywhere! Here are the key places where you can find links to tiddlers in ~TiddlyWiki: +You can use links (normally displayed as blue text) to navigate from one tiddler to another. Clicking on a link to any tiddler will take you to that tiddler. If the tiddler is closed, it will be opened. The wonderful thing about ~TiddlyWiki is that it makes links to tiddlers as accessible as possible. There are links everywhere! Here are the key places where you can find links to tiddlers in ~TiddlyWiki: -* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in WikiText]] to see the various, easy ways to create links between tiddlers. +* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in WikiText]] to see the various easy ways to create links between tiddlers. -* Each ''tag pill'' found in your tiddler (such as the ''Working with ~TiddlyWiki'' tag pill under the title of this tiddler) contains a link to that tag tiddler, as well as lists of all the tiddlers tagged with that tag. This allows you to go to any of those tiddlers. +* Each ''tag pill'' in your tiddler (such as the ''Working with ~TiddlyWiki'' tag pill below the title of this tiddler) contains a link to that tag's tiddler, as well as lists of all the tiddlers that carry that tag. This lets you go to any of those tiddlers. -* The ''~TiddlerInfo section'' of each tiddler, accessed by clicking the {{$:/core/images/info-button}} button at the top of the tiddler, gives you access to four additional lists of tiddlers related to your tiddler: +* The ''info section'' of each tiddler - accessed by clicking the {{$:/core/images/info-button}} button in the {{$:/core/images/down-arrow}} dropdown list at the top of the tiddler - gives you access to four tabs containing additional lists of related tiddlers: -** The ''References'' tab lists all the tiddlers that contain links back to the current tiddler. +** The ''References'' tab lists all the tiddlers that link //to// the current tiddler. -** The ''Tagging'' tab lists all the tiddlers which are tagged with the current tiddler's title. +** The ''Tagging'' tab lists all the tiddlers that have been tagged with the current tiddler's title. -** The ''List'' tab lists all the tiddlers or potential tiddlers contained in the list field of the current tiddler. See [[ListField]] for more on list fields. +** The ''List'' tab lists all the tiddlers (or potential tiddlers) mentioned in the [[list field|ListField]] of the current tiddler. -** The ''Listed'' tab lists all the tiddlers which contain the current tiddler in their list fields. +** The ''Listed'' tab lists all the tiddlers that mention the current tiddler in //their// list fields. * The ''sidebar tabs'' contain numerous lists of links to tiddlers: -** The ''Open'' tab lists all currently open tiddlers. +** The ''Open'' tab lists all the tiddlers that are currently open, i.e. visible somewhere on the page. ** The ''Recent'' tab lists the 100 most recently modified tiddlers, beginning with the most recently modified. -** The ''More'' tab contains eight additional lists of tiddlers: +** The ''More'' tab offers eight additional lists of tiddlers: -*** ''All'' lists all tiddlers, ordered alphabetically. +*** ''All'' lists all tiddlers in alphabetical order. *** ''Tags'' lists all the tags. You can click on the pill for any tag to access a list of the tiddlers tagged with that tag. -*** ''Missing'' lists all the hyperlinks found in tiddler text for which no tiddler currently exists. This is helpful for finding tiddlers you at some point expected to create, but never got around to creating. +*** ''Missing'' lists any tiddlers that don't yet exist, but have been linked to from other tiddlers. This is helpful for finding tiddlers you planned to create, but never got around to. -*** ''Drafts'' lists all unfinished tiddlers still in edit mode. A tiddler draft is considered a separate tiddler by ~TiddlyWiki until it is closed, so if you edit a tiddler entitled ''Australia'', there will then be two tiddlers, ''Australia'' and ''Draft of 'Australia'''. When you save or cancel your changes to close the draft, it will apply those changes to the ''Australia'' tiddler. So treat the Drafts tab as a way of finding any unfinished drafts you started. +*** ''Drafts'' lists any tiddlers that are currently in draft mode. ~TiddlyWiki considers a tiddler's draft to be a separate tiddler for as long as you are editing it, so while you're editing a tiddler entitled ''Australia'', there will be two tiddlers, ''Australia'' and ''Draft of 'Australia'''. When you close the draft by saving your changes to it, those changes will be applied to the ''Australia'' tiddler. So treat the ''Drafts'' tab as a way of finding any unfinished drafts you started. -*** ''Orphans'' lists all the tiddlers which are not related to any other tiddler by links, tags or lists. This is a helpful aid to editing your file - it shows you the tiddlers that need to be integrated more carefully with the other tiddlers. +*** ''Orphans'' lists all the tiddlers that are not connected to any other tiddler by links, tags or lists. This is a helpful aid to editing your file - it shows you which tiddlers need to be integrated more carefully with the others. -*** ''Types'' lists tiddlers by special content types, such as images. +*** ''Types'' lists any tiddlers with special content, such as images or audio. -*** ''System'' lists all SystemTiddlers. +*** ''System'' lists all of the SystemTiddlers. -*** ''Shadows'' lists all ShadowTiddlers. +*** ''Shadows'' lists all of the ShadowTiddlers. -* ''Search results'' are lists of tiddlers that match the text you enter into the search window. +* ''Search results'' are a list of the tiddlers that contain the text you type in the search box. * Finally, you can create your own custom lists of tiddlers by various methods: ** You can transclude a [[filter|Filters]] (see [[Transclusion in WikiText]]). For example, adding `{{{ [tag[mountain]] }}}` to a tiddler will insert a list of all tiddlers tagged with ''mountain''. -** You can use the ListWidget. This is more complicated than transcluding a [[filter|Filters]], but in return allows you more flexibility in designing and displaying the list exactly as you want it to appear. +** You can use the ListWidget. This is more complicated than transcluding a [[filter|Filters]], but in return it allows you more flexibility in designing and displaying the list exactly as you want it to appear. From db37f6030f1e1cf3a28cbdf67da3fb392e334ebb Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Mon, 22 Dec 2014 17:58:05 +0000 Subject: [PATCH 5/5] link to InfoPanel --- .../tw5.com/tiddlers/workingwithtw/Using links to navigate.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid index b18133ad4..9a1a6abe7 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid @@ -10,7 +10,7 @@ You can use links (normally displayed as blue text) to navigate from one tiddler * Each ''tag pill'' in your tiddler (such as the ''Working with ~TiddlyWiki'' tag pill below the title of this tiddler) contains a link to that tag's tiddler, as well as lists of all the tiddlers that carry that tag. This lets you go to any of those tiddlers. -* The ''info section'' of each tiddler - accessed by clicking the {{$:/core/images/info-button}} button in the {{$:/core/images/down-arrow}} dropdown list at the top of the tiddler - gives you access to four tabs containing additional lists of related tiddlers: +* The ''InfoPanel'' of each tiddler - accessed by clicking the {{$:/core/images/info-button}} button in the {{$:/core/images/down-arrow}} dropdown list at the top of the tiddler - gives you access to four tabs containing additional lists of related tiddlers: ** The ''References'' tab lists all the tiddlers that link //to// the current tiddler.