From ad9aa5852841d7b4c5484319d259aab92fe37d52 Mon Sep 17 00:00:00 2001
From: Astrid Elocson <aelocson@gmail.com>
Date: Sat, 21 Feb 2015 23:03:24 +0000
Subject: [PATCH 1/4] Overhaul the macro and variable documentation

---
 .../tiddlers/concepts/ColourPalettes.tid      |   4 +-
 .../tiddlers/concepts/CurrentTiddler.tid      |  17 ++-
 .../tw5.com/tiddlers/concepts/Filters.tid     |   8 +-
 .../tiddlers/concepts/JSONTiddlers.tid        |   4 +-
 editions/tw5.com/tiddlers/concepts/Macros.tid |  28 +++--
 editions/tw5.com/tiddlers/concepts/Pragma.tid |  16 +++
 .../tiddlers/concepts/TemplateTiddlers.tid    |   6 +-
 .../tw5.com/tiddlers/definitions/Base64.tid   |   7 ++
 .../definitions/CascadingStyleSheets.tid      |   7 ++
 .../definitions/CommaSeparatedValues.tid      |  13 ++
 .../tiddlers/definitions/ContentType.tid      |   8 +-
 .../tw5.com/tiddlers/definitions/DataURI.tid  |   9 ++
 .../definitions/JavaScriptObjectNotation.tid  |  11 ++
 .../tiddlers/demonstrations/GroupedLists.tid  |   6 +-
 .../tiddlers/demonstrations/SampleTabFour.tid |   5 +-
 .../tiddlers/demonstrations/SampleTabOne.tid  |   3 +-
 .../demonstrations/SampleTabThree.tid         |   3 +-
 .../tiddlers/demonstrations/SampleTabTwo.tid  |   3 +-
 .../TableOfContents/Contents.tid              |   6 +-
 .../demonstrations/TableOfContents/First.tid  |   4 +-
 .../TableOfContents/FirstOne.tid              |   4 +-
 .../TableOfContents/FirstThree.tid            |   4 +-
 .../TableOfContents/FirstTwo.tid              |   4 +-
 .../demonstrations/TableOfContents/Fourth.tid |   4 +-
 .../demonstrations/TableOfContents/Second.tid |   4 +-
 .../TableOfContents/SecondOne.tid             |   4 +-
 .../TableOfContents/SecondThree.tid           |   4 +-
 .../TableOfContents/SecondThreeOne.tid        |   4 +-
 .../TableOfContents/SecondThreeThree.tid      |   4 +-
 .../TableOfContents/SecondThreeTwo.tid        |   4 +-
 .../TableOfContents/SecondTwo.tid             |   4 +-
 .../demonstrations/TableOfContents/Third.tid  |   4 +-
 .../TableOfContents/ThirdOne.tid              |   4 +-
 .../TableOfContents/ThirdThree.tid            |   4 +-
 .../TableOfContents/ThirdTwo.tid              |   4 +-
 ...ableOfContentsMacro Expandable Example.tid |  14 +--
 ...entsMacro Selective Expandable Example.tid |  16 +--
 .../TableOfContentsMacro Simple Example.tid   |  14 +--
 ...ontentsMacro Sorted Expandable Example.tid |  16 +--
 .../TableOfContentsMacro Tabbed Example.tid   |  56 +++------
 ...fContentsMacro Tabbed External Example.tid |  24 ++++
 .../demonstrations/Tagged with TagMacro.tid   |   7 +-
 .../filters/Introduction to Filters.tid       |   4 +-
 editions/tw5.com/tiddlers/filters/all.tid     |   4 +-
 editions/tw5.com/tiddlers/filters/is.tid      |   4 +-
 editions/tw5.com/tiddlers/filters/list.tid    |   4 +-
 .../tw5.com/tiddlers/filters/splitbefore.tid  |   4 +-
 .../filters/syntax/FilterParameter.tid        |   4 +-
 .../How to Add A New Tab to the Sidebar.tid   |   4 +-
 .../tiddlers/howtos/Using Stylesheets.tid     |  12 +-
 .../tiddlers/macros/ChangeCountMacro.tid      |  21 ++--
 .../tw5.com/tiddlers/macros/ColourMacro.tid   |  17 +++
 .../tiddlers/macros/ContrastColourMacro.tid   |  21 ++++
 .../tw5.com/tiddlers/macros/CoreMacros.tid    |   8 ++
 .../tiddlers/macros/CsvTiddlersMacro.tid      |  17 +++
 .../tw5.com/tiddlers/macros/DataUriMacro.tid  |  21 ++++
 .../tiddlers/macros/DumpVariablesMacro.tid    |  20 ++-
 .../tiddlers/macros/JsonTiddlersMacro.tid     |  15 +++
 .../tw5.com/tiddlers/macros/LingoMacro.tid    |  16 +++
 .../tw5.com/tiddlers/macros/ListMacro.tid     |  40 +++---
 .../tiddlers/macros/MakeDataUriMacro.tid      |  41 ++-----
 editions/tw5.com/tiddlers/macros/NowMacro.tid |  29 ++---
 .../tw5.com/tiddlers/macros/QualifyMacro.tid  |  27 ++--
 .../tw5.com/tiddlers/macros/ResolvePath.tid   |  30 +++--
 .../tiddlers/macros/StylesheetMacros.tid      |  25 ++++
 .../tiddlers/macros/TableOfContentsMacro.tid  |  76 +++++++-----
 .../tw5.com/tiddlers/macros/TabsMacro.tid     |  45 +++----
 editions/tw5.com/tiddlers/macros/TagMacro.tid |  28 ++---
 .../tw5.com/tiddlers/macros/TimelineMacro.tid |  44 +++----
 .../tw5.com/tiddlers/macros/VersionMacro.tid  |  18 ++-
 .../tiddlers/macros/examples/Macro Calls.tid  |  30 +++++
 .../tiddlers/macros/examples/changecount.tid  |  18 +++
 .../tiddlers/macros/examples/colour.tid       |  11 ++
 .../tiddlers/macros/examples/datauri.tid      |  19 +++
 .../macros/examples/dumpvariables.tid         |  14 +++
 .../tiddlers/macros/examples/lingo.tid        |  13 ++
 .../tiddlers/macros/examples/list-links.tid   |  13 ++
 .../tiddlers/macros/examples/makedatauri.tid  |   7 ++
 .../tw5.com/tiddlers/macros/examples/now.tid  |   9 ++
 .../macros/examples/qualify-transcluded.tid   |  11 ++
 .../tiddlers/macros/examples/qualify.tid      |  20 +++
 .../tiddlers/macros/examples/resolvepath.tid  |  12 ++
 .../tw5.com/tiddlers/macros/examples/tabs.tid |  14 +++
 .../tw5.com/tiddlers/macros/examples/tag.tid  |   8 ++
 .../tiddlers/macros/examples/timeline.tid     |   8 ++
 .../tw5.com/tiddlers/macros/examples/toc.tid  |  20 +++
 .../tiddlers/macros/examples/version.tid      |   7 ++
 .../macros/import/say-hi-using-variables.tid  |  10 ++
 .../tw5.com/tiddlers/macros/import/say-hi.tid |   8 ++
 .../macros/import/tags-of-current-tiddler.tid |   5 +
 .../macros/syntax/MacroCallSyntax.tid         |  27 ++++
 .../macros/syntax/MacroDefinitionSyntax.tid   |  52 ++++++++
 .../macros/syntax/MacroParameterValue.tid     |  11 ++
 .../tiddlers/macros/syntax/MacroSyntax.tid    |   6 +
 .../tiddlers/mechanisms/StateMechanism.tid    |   6 +-
 .../tiddlers/releasenotes/Release 5.1.3.tid   |   7 +-
 .../tiddlers/releasenotes/Release 5.1.5.tid   |   8 +-
 .../tiddlers/releasenotes/Release 5.1.6.tid   |   8 +-
 .../releasenotes/beta/Release 5.0.11beta.tid  |   4 +-
 .../releasenotes/beta/Release 5.0.14beta.tid  |   4 +-
 .../releasenotes/beta/Release 5.0.15beta.tid  |   4 +-
 .../releasenotes/beta/Release 5.0.16beta.tid  |   6 +-
 .../releasenotes/beta/Release 5.0.17beta.tid  |  10 +-
 .../releasenotes/beta/Release 5.0.18beta.tid  |   6 +-
 .../styleguide/Documentation Macros.tid       |  15 ++-
 .../tw5.com/tiddlers/system/doc-macros.tid    |  61 ++++++++-
 .../tw5.com/tiddlers/system/doc-styles.tid    |  23 +++-
 .../tiddlers/system/operator-macros.tid       |  32 ++---
 .../tiddlers/variables/CoreVariables.tid      |   8 ++
 .../tw5.com/tiddlers/variables/Variables.tid  |  22 +++-
 .../WidgetVariable_ currentTiddler.tid        |  41 ++-----
 .../WidgetVariable_ storyTiddler.tid          |  23 ++--
 .../WidgetVariable_ transclusion.tid          |  54 ++++----
 .../variables/examples/currentTiddler.tid     |  19 +++
 .../variables/examples/storyTiddler.tid       |  12 ++
 .../variables/examples/transclusion.tid       |  17 +++
 .../widgets/ActionDeleteFieldWidget.tid       |   4 +-
 .../tiddlers/widgets/ActionNavigateWidget.tid |   4 +-
 .../tiddlers/widgets/ActionSetFieldWidget.tid |   4 +-
 .../tiddlers/widgets/CheckboxWidget.tid       |   4 +-
 .../tiddlers/widgets/EditBitmapWidget.tid     |   4 +-
 .../tiddlers/widgets/EditTextWidget.tid       |   4 +-
 .../tw5.com/tiddlers/widgets/EditWidget.tid   |   4 +-
 .../tiddlers/widgets/FieldManglerWidget.tid   |   4 +-
 .../tw5.com/tiddlers/widgets/FieldsWidget.tid |   4 +-
 .../tw5.com/tiddlers/widgets/LinkWidget.tid   |   5 +-
 .../tw5.com/tiddlers/widgets/RadioWidget.tid  |   4 +-
 .../tw5.com/tiddlers/widgets/SetWidget.tid    |   4 +-
 .../tiddlers/widgets/TiddlerWidget.tid        |   6 +-
 .../tw5.com/tiddlers/widgets/ViewWidget.tid   |   4 +-
 editions/tw5.com/tiddlers/widgets/Widgets.tid |  16 ++-
 ... between Transclusion and Substitution.tid |   5 +-
 .../wikitext/Macro Calls in WikiText.tid      |  22 ++++
 .../Macro Definitions in WikiText.tid         |  46 +++++++
 .../tiddlers/wikitext/Macros in WikiText.tid  | 116 +-----------------
 .../wikitext/Transclusion in WikiText.tid     |   4 +-
 .../wikitext/Transclusion with Templates.tid  |  10 +-
 .../wikitext/Variables in WikiText.tid        |  81 +++---------
 138 files changed, 1321 insertions(+), 755 deletions(-)
 create mode 100644 editions/tw5.com/tiddlers/concepts/Pragma.tid
 create mode 100644 editions/tw5.com/tiddlers/definitions/Base64.tid
 create mode 100644 editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid
 create mode 100644 editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid
 create mode 100644 editions/tw5.com/tiddlers/definitions/DataURI.tid
 create mode 100644 editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid
 create mode 100644 editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed External Example.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/ColourMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/ContrastColourMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/CoreMacros.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/CsvTiddlersMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/DataUriMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/LingoMacro.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/StylesheetMacros.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/Macro Calls.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/changecount.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/colour.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/datauri.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/lingo.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/list-links.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/makedatauri.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/now.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/qualify-transcluded.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/qualify.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/resolvepath.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/tabs.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/tag.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/timeline.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/toc.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/examples/version.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/import/say-hi-using-variables.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/import/say-hi.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/import/tags-of-current-tiddler.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/syntax/MacroParameterValue.tid
 create mode 100644 editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid
 create mode 100644 editions/tw5.com/tiddlers/variables/CoreVariables.tid
 create mode 100644 editions/tw5.com/tiddlers/variables/examples/currentTiddler.tid
 create mode 100644 editions/tw5.com/tiddlers/variables/examples/storyTiddler.tid
 create mode 100644 editions/tw5.com/tiddlers/variables/examples/transclusion.tid
 create mode 100644 editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid
 create mode 100644 editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid

diff --git a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
index e1b246386..fd3cdf181 100644
--- a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
+++ b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
@@ -1,5 +1,5 @@
 created: 20140216102454178
-modified: 20140216102722184
+modified: 20150221154036000
 tags: Concepts
 title: ColourPalettes
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ table-border: #ccc
 
 Several palettes form part of the core. The system tiddler [[$:/palette]] always contains the title of the currently selected palette tiddler.
 
-To retrieve the value of a named colour from the current palette, e.g. for use in a stylesheet tiddler, use the [[colour macro|$:/core/macros/CSS]]:
+To retrieve the value of a named colour from the current palette, e.g. for use in a stylesheet tiddler, use the <<.mlink colour>> macro:
 
 ```
 <<colour page-background>>
diff --git a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid
index 9bbf6979d..d1aab5423 100644
--- a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid
+++ b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid
@@ -1,13 +1,18 @@
 created: 20130825144900000
-modified: 20141012154500719
+modified: 20150221215022000
 tags: Concepts
-title: CurrentTiddler
+title: Current Tiddler
 type: text/vnd.tiddlywiki
 
-The current tiddler provides an ever-changing context or background against which several features of WikiText are interpreted.
+The <<.def "current tiddler">> provides the context in which several aspects of WikiText are interpreted.
 
-For example, `{{!!title}}` denotes the value of the ''title'' field of whatever the current tiddler happens to be. This technique can be used in a [[TemplateTiddler|TemplateTiddlers]] to keep the template generic.
+For example, `{{!!title}}` denotes the value of the <<.field title>> field of whatever the current tiddler happens to be. This technique can be used to create general-purpose [[template tiddlers|TemplateTiddlers]].
 
-The title of the current tiddler can always be found in the [[currentTiddler variable|WidgetVariable: currentTiddler]].
+The title of the current tiddler can always be found in the <<.vlink currentTiddler>> variable.
 
-The current tiddler is set in several ways, including by the ListWidget and the TiddlerWidget.
+The two most common ways in which the current tiddler is changed are:
+
+* the <<.wlink TiddlerWidget>> widget
+* the <<.wlink ListWidget>> widget (when its <<.attr variable>> attribute is not overridden)
+
+The current tiddler is therefore often <<.em not>> the same as the [[tiddler that is being viewed or edited|storyTiddler Variable]].
diff --git a/editions/tw5.com/tiddlers/concepts/Filters.tid b/editions/tw5.com/tiddlers/concepts/Filters.tid
index d20f8d03a..83449d5b6 100644
--- a/editions/tw5.com/tiddlers/concepts/Filters.tid
+++ b/editions/tw5.com/tiddlers/concepts/Filters.tid
@@ -1,5 +1,5 @@
 created: 20130827080000000
-modified: 20150124183938000
+modified: 20150221225414000
 tags: Reference Concepts
 title: Filters
 type: text/vnd.tiddlywiki
@@ -9,11 +9,9 @@ You can think of TiddlyWiki as a database in which the records are tiddlers. A d
 
 A <<.def filter>> is a concise notation for selecting a particular [[set of tiddlers|Title Selection]], known as its <<.def "output">>. Whenever ~TiddlyWiki encounters a filter, it calculates the output. Further work can then be done with just those tiddlers, such as [[counting|CountWidget]] or [[listing|ListWidget]] them.
 
-The following example passes a filter to the [[list-links macro|ListMacro]] to display a list of all tiddlers whose titles start with the letter H:
+The following example passes a filter to the <<.mlink list-links>> macro to display a list of all tiddlers whose titles start with the letter H:
 
-```
-<<list-links "[prefix[H]]">>
-```
+> `<<list-links "[prefix[H]]">>`
 
 A filter's output can change as tiddlers are added and deleted in the wiki. ~TiddlyWiki recalculates on the fly, automatically updating any filter-based counts or lists as well.
 
diff --git a/editions/tw5.com/tiddlers/concepts/JSONTiddlers.tid b/editions/tw5.com/tiddlers/concepts/JSONTiddlers.tid
index 776c77940..259b4a49f 100644
--- a/editions/tw5.com/tiddlers/concepts/JSONTiddlers.tid
+++ b/editions/tw5.com/tiddlers/concepts/JSONTiddlers.tid
@@ -1,9 +1,9 @@
 created: 20141228094500000
-modified: 20141228094500000
+modified: 20150221152956000
 tags: Concepts
 title: JSONTiddlers
 
-A JSON tiddler is a [[data tiddler|DataTiddlers]] containing a [[JSON]] structure in its `text` field.
+A JSON tiddler is a [[data tiddler|DataTiddlers]] containing a [[JSON|JavaScript Object Notation]] structure in its `text` field.
 
 Its [[ContentType]] is `application/json`.
 
diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
index 85bc3962c..39c22d21e 100644
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -1,17 +1,29 @@
 created: 20140211171341271
-modified: 20150107121000000
+modified: 20150221220245000
 tags: Concepts Reference
 title: Macros
 type: text/vnd.tiddlywiki
 
-Macros are snippets of text, inserted with the following shortcut syntax:
+A <<.def macro>> is a named snippet of text. WikiText can use the name as a shorthand way of [[transcluding|Transclusion]] the snippet. Such transclusions are known as <<.def "macro calls">>, and each call can supply a different set of parameters that get substituted for special placeholders within the snippet.
 
-```
-<<myMacro>>
-```
+For the syntax, see [[Macros in WikiText]].
 
-You can define and use [[Macros in WikiText]] or write [[JavaScript Macros|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] for more flexibility.
+Most macros are in fact just parameterised [[variables|Variables]].
 
-The following macros are provided by the TiddlyWiki core:
+They are created using the `\define` [[pragma|Pragma]]. (Behind the scenes, this is transformed into a <<.wlink SetWidget>>, i.e. macros and variables are two sides of the same coin.)
 
-<<list-links "[tag[Macros]]">>
\ No newline at end of file
+The snippet and its incoming parameter values are treated as simple strings of characters with no WikiText meaning, at least until the placeholders have been filled in and the macro call has returned. This means that a macro can assemble and return the complete syntax of a ~WikiText component, such as a [[link|Linking in WikiText]]. (See [[Transclusion and Substitution]] for further discussion of this.)
+
+The string returned by a macro call is parsed separately from any surrounding ~WikiText components. So a safe way to insert a special character sequence (such as `[[` or `<`) without triggering its normal ~WikiText meaning is to wrap it in a macro.
+
+Within a snippet itself, the only markup detected is `$name$` (a placeholder for a macro parameter) and `$(name)$` (a placeholder for a [[variable|Variables]]).
+
+The <<.mlink dumpvariables>> macro lists all variables (including macros) that are available at that position in the widget tree.
+
+An <<.wlink ImportVariablesWidget>> widget can be used to copy macro definitions to another branch of the [[widget tree|Widgets]]. ~TiddlyWiki uses this technique internally to implement global macros -- namely any macros defined in tiddlers with the <<.tag $:/tags/Macro>> tag.
+
+For maximum flexibility, macros can also be [[written as JavaScript modules|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]].
+
+A similar effect to a parameterised macro call can be produced by setting [[variables|Variables]] around a [[transclusion|Transclusion]].
+
+~TiddlyWiki's core has [[several macros|Core Macros]] built in.
diff --git a/editions/tw5.com/tiddlers/concepts/Pragma.tid b/editions/tw5.com/tiddlers/concepts/Pragma.tid
new file mode 100644
index 000000000..ee1c49e14
--- /dev/null
+++ b/editions/tw5.com/tiddlers/concepts/Pragma.tid
@@ -0,0 +1,16 @@
+created: 20150219175930000
+modified: 20150221215112000
+tags: Concepts
+title: Pragma
+type: text/vnd.tiddlywiki
+
+A <<.def pragma>> is a special component of WikiText that provides control over the way the remaining text is parsed.
+
+Pragmas occupy lines that start with `\`. They can only appear at the start of the text, but blank lines are allowed between them. If a pragma line appears in the main body of the text, it is treated as if it was ordinary text.
+
+The following pragmas are available:
+
+;`\define`
+: for defining a [[macro|Macros]]
+;`\rules`
+: for adjusting the set of rules used to parse the text
diff --git a/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid b/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid
index f786502af..3d1fbadae 100644
--- a/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid
+++ b/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid
@@ -1,5 +1,5 @@
 created: 20140107114355828
-modified: 20140317213147507
+modified: 20150220160920000
 tags: Concepts
 title: TemplateTiddlers
 type: text/vnd.tiddlywiki
@@ -10,8 +10,8 @@ Templates are a way to re-use chunks of WikiText.
 
 Transcluding through a template extends the basic functionality of [[Transclusion]] by combining two tiddlers:
 
-* A template tiddler that contains the WikiText to be displayed. It can contain transclusions that reference fields in the CurrentTiddler
-* A target tiddler that identifies the CurrentTiddler to be used when resolving references to fields
+* A template tiddler that contains the WikiText to be displayed. It can contain transclusions that reference fields in the [[current tiddler|Current Tiddler]]
+* A target tiddler that identifies which tiddler is to be treated as current when resolving references to fields
 
 The best example of templating is the main story river in TiddlyWiki. Each tiddler in the story river is rendered through a ViewTemplate that specifies how each field is to be rendered.
 
diff --git a/editions/tw5.com/tiddlers/definitions/Base64.tid b/editions/tw5.com/tiddlers/definitions/Base64.tid
new file mode 100644
index 000000000..9546bcd66
--- /dev/null
+++ b/editions/tw5.com/tiddlers/definitions/Base64.tid
@@ -0,0 +1,7 @@
+created: 20150221180826000
+modified: 20150221181700000
+tags: Definitions
+title: Base64
+type: text/vnd.tiddlywiki
+
+<<.dlink-ex Base64 "http://en.wikipedia.org/wiki/Base64">> is a way of representing binary data, such an image, as a string of text.
diff --git a/editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid b/editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid
new file mode 100644
index 000000000..47c770848
--- /dev/null
+++ b/editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid
@@ -0,0 +1,7 @@
+created: 20150221120651000
+modified: 20150221181705000
+tags: Definitions
+title: Cascading Style Sheets
+type: text/vnd.tiddlywiki
+
+<<.dlink-ex CSS "http://en.wikipedia.org/wiki/Cascading_Style_Sheets">> is a standard plain-text format used for defining the presentational style of the various elements on a web page.
diff --git a/editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid b/editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid
new file mode 100644
index 000000000..e89ec2c9b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid
@@ -0,0 +1,13 @@
+created: 20150221120117000
+modified: 20150221181310000
+tags: Definitions
+title: Comma-Separated Values
+type: text/vnd.tiddlywiki
+
+<<.dlink-ex CSV "http://en.wikipedia.org/wiki/Comma-separated_values">> is a standard plain-text format for storing a table of data.
+
+Each row of the table is called a <<.def record>> and occupies one line.
+
+The columns are called <<.def fields>>. Each field of a row is separated from the next by a comma, and is often delimited by quotation marks.
+
+The <<.mlink csvtiddlers>> macro returns tiddler content in this format.
diff --git a/editions/tw5.com/tiddlers/definitions/ContentType.tid b/editions/tw5.com/tiddlers/definitions/ContentType.tid
index 11302d9b2..30d0a135b 100644
--- a/editions/tw5.com/tiddlers/definitions/ContentType.tid
+++ b/editions/tw5.com/tiddlers/definitions/ContentType.tid
@@ -1,5 +1,5 @@
 created: 20130828185900000
-modified: 20140912145359306
+modified: 20150221120839000
 tags: Definitions
 title: ContentType
 type: text/vnd.tiddlywiki
@@ -22,10 +22,8 @@ In TiddlyWiki, the `type` field gives the content type to apply to the main `tex
 |~|PNG image |image/png|
 |~|Structured Vector Graphics image |image/svg+xml|
 |^''Text''|HTML markup |text/html|
-|~|Cascading Stylesheet text |text/css|
-|~|Comma-separated values |text/csv|
+|~|[[CSS|Cascading Style Sheets]] stylesheet |text/css|
+|~|[[Comma-separated values|Comma-Separated Values]] |text/csv|
 |~|Plain text |text/plain|
 |~|~TiddlyWiki 5 |text/vnd.tiddlywiki|
 |~|~TiddlyWiki Classic |text/x-tiddlywiki|
-
-
diff --git a/editions/tw5.com/tiddlers/definitions/DataURI.tid b/editions/tw5.com/tiddlers/definitions/DataURI.tid
new file mode 100644
index 000000000..35878f1cb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/definitions/DataURI.tid
@@ -0,0 +1,9 @@
+created: 20150221161803000
+modified: 20150221181711000
+tags: Definitions
+title: Data URI
+type: text/vnd.tiddlywiki
+
+A <<.dlink-ex "data URI" "http://en.wikipedia.org/wiki/Data_URI_scheme">> is a way of storing data (such as an image) in a way that is compatible with the addresses used by web pages and [[stylesheets|Cascading Style Sheets]] to access external resources.
+
+The <<.mlink datauri>> macro can be used to generate data URIs within ~TiddlyWiki.
diff --git a/editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid b/editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid
new file mode 100644
index 000000000..177c565a8
--- /dev/null
+++ b/editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid
@@ -0,0 +1,11 @@
+created: 20150221152904000
+modified: 20150221181720000
+tags: Definitions
+title: JavaScript Object Notation
+type: text/vnd.tiddlywiki
+
+<<.dlink-ex JSON "http://en.wikipedia.org/wiki/JSON">> is a standard plain-text format used for modelling hierarchical structures of objects that contain named fields.
+
+DataTiddlers can have JSON content.
+
+The <<.mlink jsontiddlers>> macro returns tiddler content in JSON format.
diff --git a/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid b/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid
index d656ecbe9..9eaa7ef29 100644
--- a/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid
@@ -1,7 +1,7 @@
 title: GroupedLists
 tags: ListWidget
 created: 20150106180000000
-modified: 20150106180000000
+modified: 20150221230117000
 
 The following sidebar tabs give examples of grouped lists created by nesting.
 
@@ -13,6 +13,6 @@ For the [[Types|$:/core/ui/MoreSideBar/Types]] tab, the outer list filter as sho
 
 !! Recent Tab
 
-The list in the [[Recent|$:/core/ui/SideBar/Recent]] tab is generated using the TimelineMacro. Here, the outer list filter selects each discrete day found in the `modified` field, while the inner list filter selects all the tiddlers dated the same day in the `modified` field.
+The list in the [[Recent|$:/core/ui/SideBar/Recent]] tab is generated using the <<.mlink timeline>> macro. Here, the outer list filter selects each discrete day found in the `modified` field, while the inner list filter selects all the tiddlers dated the same day in the `modified` field.
 
-<<tw-code-link "$:/core/macros/timeline">>
\ No newline at end of file
+<<tw-code-link "$:/core/macros/timeline">>
diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid
index 05418dc0e..fe57544f4 100644
--- a/editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid
@@ -1,5 +1,8 @@
+created: 20150221211420000
+modified: 20150221211613000
 title: SampleTabFour
 tags: sampletab
+caption: Four
+order: 4
 
 This is the fourth of our sample tabs.
-
diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid
index 73781924f..3ad68518d 100644
--- a/editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid
@@ -1,5 +1,6 @@
+created: 20150221211544000
 title: SampleTabOne
 tags: sampletab
+order: 1
 
 This is the first of our sample tabs.
-
diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid
index ecd92496a..a13ab5786 100644
--- a/editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid
@@ -1,5 +1,6 @@
+created: 20150221211557000
 title: SampleTabThree
 tags: sampletab
+order: 3
 
 This is the third of our sample tabs.
-
diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid
index 47deb5765..e35f3e978 100644
--- a/editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid
@@ -1,5 +1,6 @@
+created: 20150221211552000
 title: SampleTabTwo
 tags: sampletab
+order: 2
 
 This is the second of our sample tabs.
-
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid
index 62d806068..b16863654 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid
@@ -1,6 +1,6 @@
+created: 20150221194324000
+modified: 20150221194606000
 title: Contents
 list: First Second Third Fourth
 
-Sample data for TableOfContentsMacro.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid
index 72650711c..a37fe25d0 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid
@@ -1,5 +1,7 @@
+created: 20150221194349000
+modified: 20150221194610000
 title: First
 tags: Contents
 list: FirstOne FirstTwo FirstThree
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid
index 238aeda27..d13e08b14 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid
@@ -1,4 +1,6 @@
+created: 20150221194354000
+modified: 20150221194613000
 title: FirstOne
 tags: First
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid
index 4a5fcb683..0175bed09 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid
@@ -1,4 +1,6 @@
+created: 20150221194357000
+modified: 20150221194616000
 title: FirstThree
 tags: First
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid
index a30891722..11c36c150 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid
@@ -1,4 +1,6 @@
+created: 20150221194401000
+modified: 20150221194619000
 title: FirstTwo
 tags: First
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid
index a09fe0467..4dc8e9f01 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid
@@ -1,4 +1,6 @@
+created: 20150221194405000
+modified: 20150221194622000
 title: Fourth
 tags: Contents
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid
index c87c88a7a..0a2ceabf3 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid
@@ -1,4 +1,6 @@
+created: 20150221194408000
+modified: 20150221194624000
 title: Second
 tags: Contents
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid
index 2d9898b33..057d82249 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid
@@ -1,4 +1,6 @@
+created: 20150221194412000
+modified: 20150221194627000
 title: SecondOne
 tags: Second
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid
index 15298faf5..77d6d85ee 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid
@@ -1,6 +1,8 @@
+created: 20150221194416000
+modified: 20150221194630000
 title: SecondThree
 tags: Second
 list: SecondThreeOne SecondThreeTwo SecondThreeThree
 toc-link: no
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid
index 22d2e83c9..c8b9d47ef 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid
@@ -1,4 +1,6 @@
+created: 20150221194420000
+modified: 20150221194633000
 title: SecondThreeOne
 tags: SecondThree
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid
index 7b632ad4b..cb4a01cc0 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid
@@ -1,4 +1,6 @@
+created: 20150221194423000
+modified: 20150221194635000
 title: SecondThreeThree
 tags: SecondThree
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid
index 4578ff7d0..58df3a625 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid
@@ -1,4 +1,6 @@
+created: 20150221194429000
+modified: 20150221194638000
 title: SecondThreeTwo
 tags: SecondThree
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid
index 302838c89..cb7a429b4 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid
@@ -1,4 +1,6 @@
+created: 20150221194433000
+modified: 20150221194643000
 title: SecondTwo
 tags: Second
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid
index 8d5f734e8..9c3c1c67a 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid
@@ -1,5 +1,7 @@
+created: 20150221194436000
+modified: 20150221194646000
 title: Third
 tags: Contents
 list: ThirdOne ThirdTwo ThirdThree
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid
index e090c269f..5fc3cfb0d 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid
@@ -1,4 +1,6 @@
+created: 20150221194440000
+modified: 20150221194649000
 title: ThirdOne
 tags: Third
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid
index ec781f15f..f88e2f895 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid
@@ -1,4 +1,6 @@
+created: 20150221194446000
+modified: 20150221194652000
 title: ThirdThree
 tags: Third
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid
index cbbdb7aab..2ed06b008 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid
@@ -1,4 +1,6 @@
+created: 20150221194453000
+modified: 20150221194655000
 title: ThirdTwo
 tags: Third
 
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
+<<.toc-lorem>>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
index f0792a718..0a9e9ee4c 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid	
@@ -1,11 +1,11 @@
-title: TableOfContentsMacro Expandable Example
+created: 20150221201816000
+modified: 20150221203715000
+title: Example Table of Contents: Expandable
 caption: Expandable
 tags: table-of-contents-example
+order: 2
 
-!! Expandable Table of Contents
-
-<$macrocall $name='wikitext-example-without-html'
-src='<div class="tc-table-of-contents">
+<$macrocall $name=".example" n="1"
+eg="""<div class="tc-table-of-contents">
 <<toc-expandable "Contents">>
-</div>
-'/>
+</div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
index 53783bb73..61187ac95 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid	
@@ -1,11 +1,11 @@
-title: TableOfContentsMacro Selective Expandable Example
-caption: Selective Expandable
+created: 20150221201907000
+modified: 20150221203950000
+title: Example Table of Contents: Selectively Expandable
+caption: Selective
 tags: table-of-contents-example
+order: 4
 
-!! Selective Expandable Table of Contents
-
-<$macrocall $name='wikitext-example-without-html'
-src='<div class="tc-table-of-contents">
+<$macrocall $name=".example" n="1"
+eg="""<div class="tc-table-of-contents">
 <<toc-selective-expandable "Contents">>
-</div>
-'/>
+</div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
index 040fc6338..5e6ab1c53 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid	
@@ -1,11 +1,11 @@
-title: TableOfContentsMacro Simple Example
+created: 20150221201838000
+modified: 20150221203742000
+title: Example Table of Contents: Simple
 caption: Simple
 tags: table-of-contents-example
+order: 1
 
-!! Simple Table of Contents
-
-<$macrocall $name='wikitext-example-without-html'
-src='<div class="tc-table-of-contents">
+<$macrocall $name=".example" n="1"
+eg="""<div class="tc-table-of-contents">
 <<toc "Contents">>
-</div>
-'/>
+</div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
index 66e9383a8..a1bf6da72 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid	
@@ -1,11 +1,11 @@
-title: TableOfContentsMacro Sorted Expandable Example
-caption: Sorted Expandable
+created: 20150221201942000
+modified: 20150221203958000
+title: Example Table of Contents: Sorted Expandable
+caption: Sorted
 tags: table-of-contents-example
+order: 3
 
-!! Sorted Expandable Table of Contents
-
-<$macrocall $name='wikitext-example-without-html'
-src='<div class="tc-table-of-contents">
+<$macrocall $name=".example" n="1"
+eg="""<div class="tc-table-of-contents">
 <<toc-expandable "Contents" "sort[title]">>
-</div>
-'/>
+</div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid
index dd6a6b287..e390135ee 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid	
@@ -1,42 +1,24 @@
-title: TableOfContentsMacro Tabbed Example
-caption: Tabbed
+created: 20150221203607000
+modified: 20150221210000000
+title: Example Table of Contents: Tabbed Internal
+caption: Tabbed Internal
 tags: table-of-contents-example
+order: 5
 
-!! Tabbed Table of Contents
-
-The tabbed table of contents macro renders a selective expandable table of contents with an attached panel that displays the currently selected tiddler.
-
-!!! Parameters
-
-|!Position |!Name |!Description |!Default |
-|1st |tag |Tag to be used for constructing the table of contents | |
-|2nd |sort |Optional sorting subfilter (eg `sort[title]`) | |
-|3rd |selectedTiddler |Title of the tiddler containing the title of the currently displayed tiddler  |"$:/temp/toc/selectedTiddler" |
-|4th |unselectedText |Text to be displayed when no tiddler is selected | |
-|5th |missingText |Text to be displayed when the selected tiddler is missing | |
-|6th |template |Optional title of a tiddler to be used as a template for rendering the selected tiddler | |
-
-!!! Internal navigation
-
-This example shows how to construct a tabbed table of contents with internal navigation, so that clicking links in the displayed tiddler will replace the displayed tiddler.
+<$macrocall
+	$name="toc-tabbed-internal-nav"
+	tag="TableOfContents"
+	selectedTiddler="$:/temp/toc/selectedTiddler"
+	unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>"
+	missingText="<p>Missing tiddler.</p>"
+/>
 
 ```
-<<toc-tabbed-internal-nav tag:"TableOfContents" selectedTiddler:"$:/temp/toc/selectedTiddler" unselectedText:"Select a topic in the table of contents. Click the arrow to expand a topic.">>
+<$macrocall
+	$name="toc-tabbed-internal-nav"
+	tag="TableOfContents"
+	selectedTiddler="$:/temp/toc/selectedTiddler"
+	unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>"
+	missingText="<p>Missing tiddler.</p>"
+/>
 ```
-
-!!! External navigation
-
-This example shows how to construct a tabbed table of contents with external navigation, so that clicking links in the displayed tiddler will open those tiddlers in the story river in the usual way.
-
-```
-<<toc-tabbed-external-nav tag:"TableOfContents" selectedTiddler:"$:/temp/toc/selectedTiddler" unselectedText:"Select a topic in the table of contents. Click the arrow to expand a topic.">>
-```
-
-!! Example
-
-Type: <$select tiddler="TabbedExampleType">
-<option value="toc-tabbed-internal-nav">Open tiddler links internally (toc-tabbed-internal-nav)</option>
-<option value="toc-tabbed-external-nav">Open tiddler links externally (toc-tabbed-external-nav)</option>
-</$select>
-
-<$macrocall $name={{TabbedExampleType}} tag="TableOfContents" selectedTiddler="$:/temp/toc/selectedTiddler" unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>" missingText="<p>Missing tiddler.</p>"/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed External Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed External Example.tid
new file mode 100644
index 000000000..7e50c7b2d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed External Example.tid	
@@ -0,0 +1,24 @@
+created: 20150221205834000
+modified: 20150221210006000
+title: Example Table of Contents: Tabbed External
+caption: Tabbed External
+tags: table-of-contents-example
+order: 6
+
+<$macrocall
+	$name="toc-tabbed-external-nav"
+	tag="TableOfContents"
+	selectedTiddler="$:/temp/toc/selectedTiddler"
+	unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>"
+	missingText="<p>Missing tiddler.</p>"
+/>
+
+```
+<$macrocall
+	$name="toc-tabbed-external-nav"
+	tag="TableOfContents"
+	selectedTiddler="$:/temp/toc/selectedTiddler"
+	unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>"
+	missingText="<p>Missing tiddler.</p>"
+/>
+```
diff --git a/editions/tw5.com/tiddlers/demonstrations/Tagged with TagMacro.tid b/editions/tw5.com/tiddlers/demonstrations/Tagged with TagMacro.tid
index 3b7c645b4..602e54d62 100644
--- a/editions/tw5.com/tiddlers/demonstrations/Tagged with TagMacro.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/Tagged with TagMacro.tid	
@@ -1,4 +1,5 @@
-title: Tagged with TagMacro
-tags: TagMacro
+created: 20150221230034000
+title: Example for tag Macro
+tags: [[tag Macro (Examples)]]
 
-This tiddler is to demonstrate the TagMacro.
+This tiddler exists to demonstrate the <<.mlink tag>> macro.
diff --git a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
index c0bf8b2ba..f6c0e9fb8 100644
--- a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid	
+++ b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid	
@@ -1,5 +1,5 @@
 created: 20140410101941871
-modified: 20150124183957000
+modified: 20150221152006000
 tags: Learning Filters
 title: Introduction to filter notation
 type: text/vnd.tiddlywiki
@@ -109,7 +109,7 @@ The parameter of each step we've seen so far has been in square brackets, meanin
 
 as an alternative to `[tag[Vegetarian]]`. This allows the preference to change over time.
 
-<<.def "Angle brackets">> `<>` mean that the parameter is the name of a [[variable|Variables]] whose value is to be used instead. Here we use the built-in <<.clink currentTiddler "WidgetVariable: currentTiddler">> variable in a filter that selects any tiddlers whose text contains the title of the current one:
+<<.def "Angle brackets">> `<>` mean that the parameter is the name of a [[variable|Variables]] whose value is to be used instead. Here we use the built-in <<.vlink currentTiddler>> variable in a filter that selects any tiddlers whose text contains the title of the current one:
 
 ```
 [search<currentTiddler>]
diff --git a/editions/tw5.com/tiddlers/filters/all.tid b/editions/tw5.com/tiddlers/filters/all.tid
index 1e5ff8b88..f74f7f1f1 100644
--- a/editions/tw5.com/tiddlers/filters/all.tid
+++ b/editions/tw5.com/tiddlers/filters/all.tid
@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20150203183224000
+modified: 20150220160957000
 tags: [[Filter Operators]] [[Common Operators]] [[Selection Constructors]]
 title: all Operator
 type: text/vnd.tiddlywiki
@@ -16,7 +16,7 @@ The parameter specifies zero or more fundamental categories using the following
 """/>
 
 |!Category |!Members |!Sorted |
-|^`current` |just the [[current tiddler|CurrentTiddler]] |^-- |
+|^`current` |just the [[current tiddler|Current Tiddler]] |^-- |
 |^`missing` |all non-existent tiddlers to which there is at least one [[hard link|Hard and Soft Links]] |^no |
 |^`orphans` |all tiddlers to which there are <<.em no>> hard links |^by title |
 |^`shadows` |all the [[shadow tiddlers|ShadowTiddlers]] that exist, including any that have been overridden with non-shadow tiddlers |^no |
diff --git a/editions/tw5.com/tiddlers/filters/is.tid b/editions/tw5.com/tiddlers/filters/is.tid
index 75f3e0181..c274e3a86 100644
--- a/editions/tw5.com/tiddlers/filters/is.tid
+++ b/editions/tw5.com/tiddlers/filters/is.tid
@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20150210090410000
+modified: 20150220161001000
 tags: [[Filter Operators]] [[Common Operators]] [[Negatable Operators]]
 title: is Operator
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ op-neg-output: those input tiddlers that do <<.em not>> belong to category <<.pl
 The parameter <<.place C>> is one of the following fundamental categories:
 
 |!Category |!Matches any tiddler that... |
-|^`current` |is the [[current tiddler|CurrentTiddler]] |
+|^`current` |is the [[current tiddler|Current Tiddler]] |
 |^`image` |has an image ContentType |
 |^`missing` |does not exist (other than possibly as a shadow tiddler), regardless of whether there are any links it |
 |^`orphan` |has no [[hard links|Hard and Soft Links]] to it |
diff --git a/editions/tw5.com/tiddlers/filters/list.tid b/editions/tw5.com/tiddlers/filters/list.tid
index 20f09c996..f914b9f3f 100644
--- a/editions/tw5.com/tiddlers/filters/list.tid
+++ b/editions/tw5.com/tiddlers/filters/list.tid
@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20150203192721000
+modified: 20150220161020000
 tags: [[Filter Operators]] [[Field Operators]] [[Selection Constructors]] [[Negatable Operators]]
 title: list Operator
 type: text/vnd.tiddlywiki
@@ -15,6 +15,6 @@ op-neg-output: those input titles that are <<.em not>> mentioned at <<.place R>>
 <<.place R>> can reference either a field or a property. See [[TextReference]] for the syntax.
 
 * If neither is specified, the <<.field list>> field is used by default. So `[list[T]]` outputs the titles listed in the <<.field list>> of tiddler T.
-* If <<.place R>> consists of <<.em only>> a field or a property, the tiddler part of the reference defaults to the CurrentTiddler. So `[list[!!tags]]` outputs the titles listed in the <<.field tags>> field of the current tiddler.
+* If <<.place R>> consists of <<.em only>> a field or a property, the tiddler part of the reference defaults to the [[current tiddler|Current Tiddler]]. So `[list[!!tags]]` outputs the titles listed in the <<.field tags>> field of the current tiddler.
 
 <<.operator-examples "list">>
diff --git a/editions/tw5.com/tiddlers/filters/splitbefore.tid b/editions/tw5.com/tiddlers/filters/splitbefore.tid
index 5759372ab..7f256e13f 100644
--- a/editions/tw5.com/tiddlers/filters/splitbefore.tid
+++ b/editions/tw5.com/tiddlers/filters/splitbefore.tid
@@ -1,5 +1,5 @@
 created: 20150126142522000
-modified: 20150203192107000
+modified: 20150221193759000
 tags: [[Filter Operators]] [[String Operators]]
 title: splitbefore Operator
 type: text/vnd.tiddlywiki
@@ -17,6 +17,6 @@ Each input title is processed in turn.
 
 Contributions are [[dominantly appended|Dominant Append]] to the output.
 
-The <<.clink "`toc`" TableOfContentsMacro>> macros use this operator with `/` as the parameter.
+The [[table-of-contents macros|Table-of-Contents Macros]] use this operator with `/` as the parameter.
 
 <<.operator-examples "splitbefore">>
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid b/editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid
index a3f734bfe..49807fc45 100644
--- a/editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid
+++ b/editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid
@@ -1,5 +1,5 @@
 created: 20151714300000000
-modified: 20150124191518000
+modified: 20150220152540000
 tags: [[Filter Syntax]]
 title: Filter Parameter
 type: text/vnd.tiddlywiki
@@ -24,4 +24,4 @@ The parameter to a [[filter operator|Filter Operators]] can be:
 :: The parameter is the text indicated by the [[text reference|TextReference]] whose name appears between the curly brackets, i.e. a [[field|TiddlerFields]] of a specified tiddler, or the value of a property of a specified [[data tiddler|DataTiddlers]].
 : <<.def variable>>
 :: `<like this>`
-:: The parameter is the current value of the [[variable|Variables]] whose name appears between the angle brackets.
+:: The parameter is the current value of the [[variable|Variables]] whose name appears between the angle brackets. Macro parameters are <<.em not>> supported.
diff --git a/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid b/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid
index 2538657a8..b55b289a4 100644
--- a/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid	
@@ -1,5 +1,5 @@
 created: 20141117000000000
-modified: 20141117000000000
+modified: 20150221193924000
 tags: Learning [[Customise TiddlyWiki]]
 title: How to add a new tab to the sidebar
 type: text/vnd.tiddlywiki
@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 To create a new tab in the sidebar menu:
 
 # Create a tiddler and tag it with the [[SystemTag|SystemTags]] tag [[$:/tags/SideBar]]
-#* To create a table of contents you can populate the new tab tiddler using the [[TableOfContentsMacro]]. For example, see the [[TableOfContents]] used here
+#* To create a table of contents you can populate the new tab tiddler using the [[table-of-contents macros|Table-of-Contents Macros]]. For example, see the [[TableOfContents]] used here
 # By default, the tiddler title is used as the tab title but you can override it using the `caption` field
 # To define the tab ordering, use the `list-after` or `list-before` fields as discussed in [[Tagging]]
 #* For example: set `list-after` to [[$:/core/ui/SideBar/Open]] to place a sidebar tab immediately after the "Open" tab
diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid
index 91b0319e1..a42f7ae68 100644
--- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
@@ -1,5 +1,5 @@
 created: 20140305091244145
-modified: 20140912141203664
+modified: 20150221175658000
 tags: [[Customise TiddlyWiki]]
 title: Using Stylesheets
 type: text/vnd.tiddlywiki
@@ -47,12 +47,4 @@ A stylesheet tiddler is processed such that it is first wikified and then the te
 
 !! Stylesheet Macros
 
-Several globally available macros are provided that are helpful in constructing stylesheets. See [[$:/core/macros/CSS]] for the definitions of these macros.
-
-* `<<colour name>>` and `<<color name>>` retrieve named colours from the current [[colour palette|ColourPalettes]]
-* `<<box-shadow shadow>>` specify a box-shadow
-* `<<filter filter>>` specify a CSS filter
-* `<<transition transition>>` specify a CSS transition
-* `<<transform-origin origin>>` specify the CSS transform origin
-* `<<background-linear-gradient gradient>>` specify a linear gradient
-* `<<datauri title>>` retrieves the base64 content of a tiddler for use via the CSS `url()` operator
+The ~TiddlyWiki core provides several [[global macros that are helpful in constructing stylesheets|Stylesheet Macros]].
diff --git a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
index ff14a4076..bb40951e8 100644
--- a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
@@ -1,21 +1,16 @@
 created: 20131228162825226
-modified: 20131228163922307
-tags: Macros
-title: ChangeCountMacro
+modified: 20150221151223000
+tags: Macros [[Core Macros]]
+title: changecount Macro
 type: text/vnd.tiddlywiki
 caption: changecount
 
-The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the CurrentTiddler variable.
+The <<.def changecount>> [[macro|Macros]] returns the number of times the [[current tiddler|Current Tiddler]] has been created, stored or deleted during the current ~TiddlyWiki session.
 
-For example:
+If a tiddler is deleted and subsequently recreated, its <<.var changecount>> will go up by two.
 
-```
-<<changecount>>
-```
+!! Parameters
 
-Displays as:
-
-<<changecount>>
-
-Note how the changecount increases every time this tiddler is modified.
+(none)
 
+<<.macro-examples "changecount">>
diff --git a/editions/tw5.com/tiddlers/macros/ColourMacro.tid b/editions/tw5.com/tiddlers/macros/ColourMacro.tid
new file mode 100644
index 000000000..d63bcb3ec
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/ColourMacro.tid
@@ -0,0 +1,17 @@
+created: 20150221154058000
+modified: 20150221154522000
+tags: Macros [[Core Macros]]
+title: colour Macro
+type: text/vnd.tiddlywiki
+caption: colour
+
+The <<.def colour>> (or <<.def color>>) [[macro|Macros]] returns the [[CSS|Cascading Style Sheets]] value of one the colours in the current [[palette|ColourPalettes]].
+
+If no such entry exists in the current palette, the [[vanilla palette|$:/palettes/Vanilla]] is used instead.
+
+!! Parameters
+
+;name
+: The name of the palette entry, e.g. `page-background`
+
+<<.macro-examples "colour">>
diff --git a/editions/tw5.com/tiddlers/macros/ContrastColourMacro.tid b/editions/tw5.com/tiddlers/macros/ContrastColourMacro.tid
new file mode 100644
index 000000000..1f38ae5ff
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/ContrastColourMacro.tid
@@ -0,0 +1,21 @@
+created: 20150221113728000
+modified: 20150221151338000
+tags: Macros [[Core Macros]]
+title: contrastcolour Macro
+type: text/vnd.tiddlywiki
+caption: contrastcolour
+
+The <<.def contrastcolour>> [[macro|Macros]] returns whichever of two given [[CSS|Cascading Style Sheets]] colours is deemed to contrast best with another.
+
+An example can be seen in the [[template tiddler for tag pills|$:/core/ui/TagTemplate]].
+
+!! Parameters
+
+;target
+: The colour to contrast against (typically a background colour)
+;fallbackTarget
+: An alternative colour to contrast against. This is used when <<.param target>> is undefined or not a valid colour
+;colourA
+: The first of the two colours to choose between
+;colourB
+: The second of the two colours to choose between
diff --git a/editions/tw5.com/tiddlers/macros/CoreMacros.tid b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
new file mode 100644
index 000000000..56d43bd2f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
@@ -0,0 +1,8 @@
+created: 20150220180315000
+modified: 20150221222052000
+title: Core Macros
+type: text/vnd.tiddlywiki
+
+The following [[macros|Macros]] are built into ~TiddlyWiki's core:
+
+<<list-links "[tag[Core Macros]]">>
diff --git a/editions/tw5.com/tiddlers/macros/CsvTiddlersMacro.tid b/editions/tw5.com/tiddlers/macros/CsvTiddlersMacro.tid
new file mode 100644
index 000000000..0e1c70e2b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/CsvTiddlersMacro.tid
@@ -0,0 +1,17 @@
+created: 20150221115509000
+modified: 20150221151344000
+tags: Macros [[Core Macros]]
+title: csvtiddlers Macro
+type: text/vnd.tiddlywiki
+caption: csvtiddlers
+
+The <<.def csvtiddlers>> [[macro|Macros]] returns the fields of a [[selection of tiddlers|Title Selection]] in [[CSV|Comma-Separated Values]] form, with one record (row) per tiddler.
+
+An example can be seen in the [[template tiddler for CSV exports|$:/core/templates/exporters/CsvFile]].
+
+!! Parameters
+
+;filter
+: A [[filter|Filters]] selecting which tiddlers to include
+;format
+: Reserved for future extension. Should be set to `quoted-comma-sep`
diff --git a/editions/tw5.com/tiddlers/macros/DataUriMacro.tid b/editions/tw5.com/tiddlers/macros/DataUriMacro.tid
new file mode 100644
index 000000000..2ff088f25
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/DataUriMacro.tid
@@ -0,0 +1,21 @@
+created: 20150221162212000
+modified: 20150221222838000
+tags: Macros [[Core Macros]]
+title: datauri Macro
+type: text/vnd.tiddlywiki
+caption: datauri
+
+The <<.def datauri>> [[macro|Macros]] returns a [[data URI|Data URI]] for the content of a tiddler.
+
+It is often used in [[stylesheet|Cascading Style Sheets]] tiddlers to reference things like inline images and fonts:
+
+> `background: url(<<datauri "Motovun Jack.jpg">>);`
+
+The data URI is automatically [[base64|Base64]]-encoded in the case of a non-text tiddler.
+
+!! Parameters
+
+;title
+: The title of a tiddler, such as an image
+
+<<.macro-examples "datauri">>
diff --git a/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid b/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
index 36ab8d625..563efffda 100644
--- a/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
@@ -1,20 +1,18 @@
 created: 20140908104107181
-modified: 20150107121000000
-tags: Macros
-title: DumpVariablesMacro
+modified: 20150221151454000
+tags: Macros [[Core Macros]]
+title: dumpvariables Macro
 type: text/vnd.tiddlywiki
 caption: dumpvariables
 
-The ''dumpvariables'' [[macro|Macros]] displays a table with values of all [[variables|Variables]] that are defined in the current scope. It is useful for debugging and exploring TiddlyWiki internals.
+The <<.def dumpvariables>> [[macro|Macros]] returns a table showing the values of all [[variables|Variables]] and [[macros|Macros]] that exist at that position in the [[widget tree|Widgets]].
 
-''Note:'' Parameters and variable subsitutions for macros are displayed as empty strings. A macro defined as `\define myMacro(text) ''$text$''` thus displays as `''''`.
+It is useful for debugging and exploring ~TiddlyWiki's internals.
 
-!! Example
+Placeholders are replaced with values in the normal way, but using the default values for all macro parameters.
 
-```
-<<dumpvariables>>
-```
+!! Parameters
 
-Renders as:
+(none)
 
-<<dumpvariables>>
\ No newline at end of file
+<<.macro-examples "dumpvariables">>
diff --git a/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid b/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
new file mode 100644
index 000000000..627ccfbac
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
@@ -0,0 +1,15 @@
+created: 20150221152226000
+modified: 20150221154213000
+tags: Macros [[Core Macros]]
+title: jsontiddlers Macro
+type: text/vnd.tiddlywiki
+caption: jsontiddlers
+
+The <<.def jsontiddlers>> [[macro|Macros]] returns the fields of a [[selection of tiddlers|Title Selection]] in [[JSON|JavaScript Object Notation]] form.
+
+An example can be seen in the [[template tiddler for JSON exports|$:/core/templates/exporters/JsonFile]].
+
+!! Parameters
+
+;filter
+: A [[filter|Filters]] selecting which tiddlers to include
diff --git a/editions/tw5.com/tiddlers/macros/LingoMacro.tid b/editions/tw5.com/tiddlers/macros/LingoMacro.tid
new file mode 100644
index 000000000..f91f94c6f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/LingoMacro.tid
@@ -0,0 +1,16 @@
+created: 20150221154907000
+modified: 20150221155706000
+title: lingo Macro
+tags: Macros [[Core Macros]]
+caption: lingo
+
+The <<.def lingo>> [[macro|Macros]] relates to the translation of ~TiddlyWiki's user interface into other languages. It returns a piece of text in the user's currently selected language.
+
+Translatable text is supplied by language plugins containing tiddlers with specific titles that start with `$:/language/`.
+
+!! Parameters
+
+;title
+: The title of the shadow tiddler that contains the text. The prefix `$:/language/` is added automatically
+
+<<.macro-examples "lingo">>
diff --git a/editions/tw5.com/tiddlers/macros/ListMacro.tid b/editions/tw5.com/tiddlers/macros/ListMacro.tid
index a65869074..20383c1a5 100644
--- a/editions/tw5.com/tiddlers/macros/ListMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/ListMacro.tid
@@ -1,28 +1,22 @@
-title: ListMacro
-tags: Macros
-modified: 20140917083515996
-caption: list
+created: 20140917083515996
+modified: 20150221223214000
+title: list-links Macro
+tags: Macros [[Core Macros]]
+caption: list-links
 
-The list macro is a family of macros that produce a list of tiddlers.
+The <<.def list-links>> [[macro|Macros]] returns a formatted list of links to a [[selection of tiddlers|Title Selection]].
 
-There are several variants of the macro:
+If a tiddler has a <<.field caption>> field, this is shown instead of the tiddler's title.
 
-* `<<list-links>>` produces a list of links to tiddlers that match a filter expression. If the tiddler has a //caption// field, it is displayed in lieu of the //title// field.
+!! Parameters
 
-! Parameters
+;filter
+: A [[filter|Filters]] selecting which tiddlers to include
+;type
+: An HTML element to use for the overall list element, defaulting to `ul`
+;subtype
+: An HTML element to use for each item in the list, defaulting to `li`
+;class
+: A [[CSS|Cascading Style Sheets]] class for the overall list element
 
-|!Position |!Name |!Description |!Default |
-|1st |filter |Filter expression | |
-|2nd |type |HTML tag to be used for the list wrapper |"ul" |
-|3rd |subtype |HTML tag to be used for list entries  |"li" |
-|4th |class |An optional CSS class to be applied to the list wrapper element (eg `<ul class="three-columns">`) | |
-
-! Examples
-
-<$macrocall $name='wikitext-example-without-html'
-src='<<list-links filter:"[tag[HelloThere]]">>
-'/>
-
-<$macrocall $name='wikitext-example-without-html'
-src='<<list-links filter:"[tag[HelloThere]]" type:"ol">>
-'/>
+<<.macro-examples "list-links">>
diff --git a/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid b/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
index 7bb768338..ba26e4c4d 100644
--- a/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
@@ -1,38 +1,19 @@
 created: 20131228163141555
-modified: 20131228163843163
-tags: Macros
-title: MakeDataUriMacro
+modified: 20150221223416000
+tags: Macros [[Core Macros]]
+title: makedatauri Macro
 type: text/vnd.tiddlywiki
 caption: makedatauri
 
-The makedatauri macro constructs a data URI from a block of text and an associated ContentType. It is commonly used within stylesheets to generate an inline image or font.
+The <<.def makedatauri>> [[macro|Macros]] takes a piece of text and an associated ContentType, and returns a corresponding [[data URI|Data URI]].
 
-! Parameters
+<<.var makedatauri>> is used to implement the <<.mlink datauri>> macro.
 
-|!Position |!Name |!Description |!Default |
-|1st |text |Text to be converted to a data URI | |
-|2nd |type |ContentType of text | |
+!! Parameters
 
-! Examples
+;text
+: The text to be converted to a data URI
+;type
+: The ContentType of the text
 
-A trivial example to show how the macro works:
-
-```
-<<makedatauri "HelloThere" "text/plain">>
-```
-
-<<makedatauri "HelloThere" "text/plain">>
-
-A user-defined macro such as this would typically be used within a stylesheet:
-
-```
-\define datauri(title)
-<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
-\end
-```
-
-Then one can write CSS rules like this:
-
-```
-background: url(<<datauri "$:/themes/tiddlywiki/starlight/ltbg.jpg">>);
-```
+<<.macro-examples "makedatauri">>
diff --git a/editions/tw5.com/tiddlers/macros/NowMacro.tid b/editions/tw5.com/tiddlers/macros/NowMacro.tid
index 6945ddf7a..6f34f680e 100644
--- a/editions/tw5.com/tiddlers/macros/NowMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/NowMacro.tid
@@ -1,28 +1,17 @@
 caption: now
 created: 20141008141616791
-modified: 20141013180540337
-tags: Macros
-title: NowMacro
+modified: 20150221170300000
+tags: Macros [[Core Macros]]
+title: now Macro
 type: text/vnd.tiddlywiki
 
-The 'now' macro returns the current date and time, formatted with an optional format string.
+The <<.def now>> [[macro|Macros]] returns the current date and time in a specified [[format|DateFormat]].
 
-! Parameters
+The value doesn't update automatically, like a ticking clock. It updates whenever the macro call is rendered, such as when the containing tiddler's display needs to be refreshed for some other reason.
 
-|!Position |!Name |!Description |!Default |
-|1st |format |DateFormat string specifying the format for the date/time |`0hh:0mm, DDth MMM YYYY` |
+!! Parameters
 
-! Examples
-
-For example:
-
-```
-* <<now>>
-* <<now "DDth MMM YYYY">>
-```
-
-Returns:
-
-* <<now>>
-* <<now "DDth MMM YYYY">>
+;format
+: A string specifying the desired [[format|DateFormat]], defaulting to `0hh:0mm, DDth MMM YYYY`
 
+<<.macro-examples "now">>
diff --git a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
index d533a013d..da41840d0 100644
--- a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
@@ -1,26 +1,19 @@
 created: 20131228164411884
-modified: 20131228164955084
-tags: Macros
-title: QualifyMacro
+modified: 20150221223816000
+tags: Macros [[Core Macros]]
+title: qualify Macro
 type: text/vnd.tiddlywiki
 caption: qualify
 
-The qualify macro is part of the StateMechanism. Given a base tiddler title it generates a unique string that includes a hashed encoding of a position within the widget render tree, identified by the stack of transcluded tiddlers that leads to that position.
+The <<.def qualify>> [[macro|Macros]] is an important part of the StateMechanism.
 
-! Parameters
+It returns a unique string that encodes its position within the [[widget tree|Widgets]], as identified by the stack of transcluded tiddlers that lead to that position.
 
-|!Position |!Name |!Description |!Default |
-|1st |title |Base tiddler title | |
+It is implemented using the <<.vlink transclusion>> variable.
 
-! Examples
+!! Parameters
 
-The results returned by the qualify macro will depend upon where it is used. For example:
-
-```
-<<qualify "base">>
-```
-
-Returns:
-
-<<qualify "base">>
+;title
+: The prefix for the returned string, normally a tiddler title
 
+<<.macro-examples "qualify">>
diff --git a/editions/tw5.com/tiddlers/macros/ResolvePath.tid b/editions/tw5.com/tiddlers/macros/ResolvePath.tid
index 1dd677f27..1d9cee2ea 100644
--- a/editions/tw5.com/tiddlers/macros/ResolvePath.tid
+++ b/editions/tw5.com/tiddlers/macros/ResolvePath.tid
@@ -1,23 +1,27 @@
 created: 20150203152000000
-modified: 20150203152000000
-title: ResolvePath
+modified: 20150221223858000
+tags: Macros [[Core Macros]]
+title: resolvepath Macro
 type: text/vnd.tiddlywiki
 caption: resolvepath
 
-The ''resolvepath'' macro constructs a url for a relative source path with respect to an absolute root path, trailing filenames being cut-off.
+The <<.def resolvepath>> [[macro|Macros]] takes a relative path and an absolute path. It interprets the former relative to the latter, and returns the absolute equivalent of the former.
 
-! Parameters
+Folders in the paths are delimited by `/`.
 
-|!Position |!Name |!Description |!Default |
-|1st |source |the relative path to be appended| |
-|2nd |root |the absolute path to be appended to | |
+The special folder name `.` denotes the current folder, and `..` denotes the parent folder.
 
-! Examples
+If the absolute path indicates a folder, it needs to end with `/`. Anything after the final `/` is treated as an arbitrary filename within the intended path, and is discarded.
 
-A trivial example to show how the macro works:
+If no absolute path is supplied, the relative path is returned unchanged, except that anything after the final `/` is discarded.
 
-```
-<<resolvepath "./backup" "http://example.com/store.php">>
-```
+The return value is a path, but does <<.em not>> end with `/`.
 
-<<resolvepath "./backup" "http://example.com/store.php">>
\ No newline at end of file
+!! Parameters
+
+;source
+: the relative path
+;root
+: the absolute path
+
+<<.macro-examples "resolvepath">>
diff --git a/editions/tw5.com/tiddlers/macros/StylesheetMacros.tid b/editions/tw5.com/tiddlers/macros/StylesheetMacros.tid
new file mode 100644
index 000000000..7edf3fddf
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/StylesheetMacros.tid
@@ -0,0 +1,25 @@
+created: 20150221181835000
+modified: 20150221223956000
+tags: Macros [[Core Macros]]
+title: Stylesheet Macros
+type: text/vnd.tiddlywiki
+
+The following core [[macros|Macros]] make it easy to specify alternative browser-specific properties when constructing a [[stylesheet|Cascading Style Sheets]] tiddler:
+
+;`<<box-shadow shadow>>`
+: for the `x-box-shadow` properties
+;`<<filter filter>>`
+: for the `x-filter` properties
+;`<<transition transition>>`
+: for the `x-transition` properties
+;`<<transform-origin origin>>`
+: for the `x-transition-origin` properties
+;`<<background-linear-gradient gradient>>`
+: for the `x-linear-gradient` values of the `background-image` property
+
+The following macros are documented separately:
+
+* <<.mlink colour>>
+* <<.mlink datauri>>
+
+All these macros are defined in the [[$:/core/macros/CSS]] tiddler.
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
index eff7d4425..f73df5574 100644
--- a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
@@ -1,51 +1,63 @@
-caption: toc
 created: 20140919155729620
-modified: 20141117000000000
-tags: Macros
-title: TableOfContentsMacro
+modified: 20150221224034000
+tags: Macros [[Core Macros]]
+title: Table-of-Contents Macros
 type: text/vnd.tiddlywiki
 
-The table of contents macro produces a hierarchical tree of tiddlers based on their tags.
+~TiddlyWiki provides several macros for generating a tree of tiddler links by analysing [[tags|Tagging]]:
 
-The top level entries of the table of contents are defined by a root tag. The subentries under each of those entries are tagged with the title of the entry. Entries can be ordered using the `list` field of the tag tiddler as described in [[Tagging]].
+;<<.var toc>>
+: A simple tree
+;<<.var toc-expandable>>
+: A tree in which all the branches can be expanded and collapsed
+;<<.var toc-selective-expandable>>
+: A tree in which the non-empty branches can be expanded and collapsed
+;<<.var toc-tabbed-internal-nav>> and <<.var toc-tabbed-external-nav>>
+: A two-panel browser:
+:* on the left, a selectively expandable tree that behaves like a set of vertical tabs
+:* on the right, the content of whichever tiddler the user selects in the tree
 
-The text for each entry is taken from the ''caption'' field if it is present, otherwise the ''title'' is used.
+The difference between the last two has to do with what happens when the user clicks a link in the right-hand panel:
 
-Entries are rendered as a link to the corresponding tiddler unless the tiddler has the value ''no'' in the field ''toc-link''. In the examples below, the entry SecondThree is set up in this way to not appear as a link.
+;<<.var toc-tabbed-internal-nav>>
+: The target tiddler appears in the right-hand panel, replacing the tiddler that contained the link
+;<<.var toc-tabbed-external-nav>>
+: The target tiddler appears in the normal way (which depends on the user's configured storyview)
 
-There are several variants of the macro:
+!! Structure
 
-* `<<toc>>` produces a simple hierarchical tree of links
-* `<<toc-expandable>>` produces an expandable tree of links
-* `<<toc-selective-expandable>>` produces an expandable tree of links where the expand/contract buttons are only shown for entries that possess child nodes
+The top level of the tree consists of the tiddlers that carry a particular tag, known as the <<.def "root tag">>. Tiddlers tagged with any of those make up the next level down, and so on.
 
-The macros all generate HTML ordered lists. The `<ol>` elements are given the class `tc-toc`, with the expandable variant also having the class `tc-toc-expandable` and the selective expandable variant also having the class `tc-toc-selective-expandable`.
+At each level, the tiddlers can be [[ordered|Order of Tagged Tiddlers]] by means of the <<.field list>> field of the parent tag tiddler. They can also be ordered by the macro's <<.param sort>> parameter.
 
-! Parameters
+The tree displays the <<.field caption>> field of a tiddler if it has one, or the tiddler's title otherwise.
 
-|!Position |!Name |!Description |!Default |
-|1st |tag |The root tag that identifies the top level of the hierarchy | |
-|2nd |sort |Optional sorting subfilter (eg `sort[title]`) | |
+Each tiddler in the tree is normally displayed as a link. To suppress this, give the tiddler a <<.field toc-link>> field with the the value <<.value no>>. In the [[examples|Table-of-Contents Macros (Examples)]], the SecondThree tiddler is set up like this. Clicking such a tiddler in the tree causes its branch to expand or collapse.
 
-The ''tag'' and ''sort'' parameters are combined to make a filter expression of the form:
+The table of contents is generated as an HTML ordered list. The `<ol>` elements always have the class `tc-toc`. Expandable trees have the additional class `tc-toc-expandable`. Selectively expandable trees (including those in the two-panel browser) have `tc-toc-selective-expandable`.
 
-```
-[tag[$tag$]$sort$]
-```
+To make a table of contents appear in the sidebar, see [[How to add a new tab to the sidebar]].
 
-! Examples
+!! Parameters
 
-In these examples, the top level entries of the table of contents examples are defined by the root tag ''Contents''. The subentries under each of those entries are tagged with the title of the parent entry, here ''First'', ''Second'', ''Third'', and ''Fourth''. One level deeper only ''~SecondThree'' has subentries.
+;tag
+: The root tag that identifies the top level of the tree
+;sort
+: An optional extra [[filter step|Filter Step]], e.g. `sort[title]`
 
-Here is the tag structure shown with clickable tag pills:
+These two parameters are combined into a single [[filter expression|Filter Expression]] like this:
 
-{{Contents||$:/core/ui/TagTemplate}}
-*{{First||$:/core/ui/TagTemplate}}
-*{{Second||$:/core/ui/TagTemplate}}
-**{{SecondThree||$:/core/ui/TagTemplate}}
-*{{Third||$:/core/ui/TagTemplate}}
-*{{Fourtth||$:/core/ui/TagTemplate}}
+> `[tag[$tag$]$sort$]`
 
-For instructions on adding a table of contents to the sidebar, see: [[How to add a new tab to the sidebar]].
+<<.var toc-tabbed-internal-nav>> and <<.var toc-tabbed-external-nav>> take additional parameters:
 
-<<tabs "[tag[table-of-contents-example]]" "TableOfContentsMacro Simple Example">>
+;selectedTiddler
+: The title of the [[state tiddler|StateMechanism]] for noting the currently selected tiddler, defaulting to `$:/temp/toc/selectedTiddler`. It is recommended that this be a [[system tiddler|SystemTiddlers]]
+;unselectedText
+: The text to display when no tiddler is selected in the tree
+;missingText
+: The text to display if the selected tiddler doesn't exist
+;template
+: Optionally, the title of a tiddler to use as a [[template|TemplateTiddlers]] for transcluding the selected tiddler into the right-hand panel
+
+[[Examples|Table-of-Contents Macros (Examples)]]
diff --git a/editions/tw5.com/tiddlers/macros/TabsMacro.tid b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
index 7c43bb1a4..c012135a2 100644
--- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
@@ -1,36 +1,31 @@
 caption: tabs
 created: 20131228162203521
-modified: 20141211141507313
-tags: Macros
-title: TabsMacro
+modified: 20150221211706000
+tags: Macros [[Core Macros]]
+title: tabs Macro
 type: text/vnd.tiddlywiki
 
-The tabs macro displays a list of tiddlers as a tab control. The user can switch between tabs by clicking on them. The tabs are labelled with the title of the corresponding tiddler, unless there is a `caption` field present in which case it is used instead.
+The <<.def tabs>> [[macro|Macros]] presents a [[selection of tiddlers|Title Selection]] as a set of tabs that the user can switch between.
 
-By default the tab control arranges the tabs horizontally with the content underneath. You can also choose to have the tabs arranged vertically by passing the class `tc-vertical`.
+The tabs display the <<.field caption>> field of a tiddler if it has one, or the tiddler's title otherwise.
 
-! Parameters
+By default the tabs are arranged horizontally above the content. To get vertical tabs, set the <<.param class>> parameter to <<.value tc-vertical>>.
 
-|!Position |!Name |!Description |!Default |
-|1st |tabsList |Filter giving the tiddlers to be displayed | |
-|2nd |default |Name of the tiddler containing the default tab | |
-|3rd |state |String to distinguish multiple tabs within the same tiddler (use of the system tiddler prefix is recommended) |''$:/state/tab'' |
-|4th |class |Additional CSS classes for the three wrapper DIVs that make up the tabs (multiple classes can be separated with spaces) | |
-|5th |template |Optional template through which to render the tab content | |
+!! Parameters
 
-Within the template the title of the current tab is available in the widget variable ''currentTab''. The ''currentTiddler'' variable is not affected by the tabs macro.
+;tabsList
+: A [[filter|Filters]] selecting which tiddlers to include
+;default
+: The title of the tiddler whose tab is to be selected by default
+;state
+: The prefix for the title of a [[state tiddler|StateMechanism]] for noting the currently selected tab, defaulting to `$:/state/tab`. It is recommended that this be a [[system tiddler|SystemTiddlers]]
+;class
+: Additional [[CSS|Cascading Style Sheets]] classes for the generated `div` elements. Multiple classes can be separated with spaces
+;template
+: Optionally, the title of a tiddler to use as a [[template|TemplateTiddlers]] for transcluding the content of the selected tab
 
-! Examples
+Within the template, the title of the selected tab is available in the <<.var currentTab>> variable.
 
-Here are some examples of the tabs macro:
+The <<.vlink currentTiddler>> variable is not affected by the <<.var tabs>> macro.
 
-```
-<<tabs "SampleTabOne SampleTabTwo SampleTabThree SampleTabFour" "SampleTabThree" "$:/state/tab1">>
-
-<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tc-vertical">>
-```
-
-<<tabs "SampleTabOne SampleTabTwo SampleTabThree SampleTabFour" "SampleTabThree" "$:/state/tab1">>
-
-<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tc-vertical">>
-//Exercise//: how would you make sure that the second tab list is correctly sorted? Hint : read [[Tagging]] until the end.
\ No newline at end of file
+<<.macro-examples "tabs">>
diff --git a/editions/tw5.com/tiddlers/macros/TagMacro.tid b/editions/tw5.com/tiddlers/macros/TagMacro.tid
index b80d91e79..f3363fdbb 100644
--- a/editions/tw5.com/tiddlers/macros/TagMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TagMacro.tid
@@ -1,27 +1,15 @@
 caption: tag
 created: 20141206130540337
-modified: 20141206130540337
-tags: Macros
-title: TagMacro
+modified: 20150221224326000
+tags: Macros [[Core Macros]]
+title: tag Macro
 type: text/vnd.tiddlywiki
 
-The 'tag' macro displays a tag pill for a specified tag.
+The <<.def tag>> [[macro|Macros]] generates a tag pill for a specified tag.
 
-! Parameters
+!! Parameters
 
-|!Position |!Name |!Description |!Default |
-|1st |tag |Title of tag |The current tiddler |
+;tag
+: The title of the tag, defaulting to the [[current tiddler|Current Tiddler]]
 
-! Examples
-
-For example:
-
-```
-* <<tag>>
-* <<tag "HelloThere">>
-```
-
-Returns:
-
-* <<tag>>
-* <<tag "HelloThere">>
+<<.macro-examples "tag">>
diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
index 2c7be7ea9..355604fca 100644
--- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
@@ -1,34 +1,24 @@
-title: TimelineMacro
-tags: Macros
-modified: 20141103172520228
+created: 20150220180357000
+modified: 20150221224401000
+title: timeline Macro
+tags: Macros [[Core Macros]]
 caption: timeline
 
-The timeline macro produces a list of tiddlers in reverse chronological order of modification date that is grouped by the date of the day of modification.
+The <<.def timeline>> [[macro|Macros]] returns a list of tiddlers in reverse chronological order of modification (or some other [[date field|Date Fields]]), grouped by day.
 
-! Parameters
+!! Parameters
 
-|!Position |!Name |!Description |!Default |
-|1st |limit |The maximum number of tiddlers to list (see below) |100 |
-|2nd |format |A DateFormat string for formatting the date |DDth MMM YYYY |
-|3rd |subfilter |A subfilter to include in the timeline filter (see below)  | |
-|4th |dateField |Optional name of date field to use |modified |
+;limit
+: The maximum number of tiddlers to include, defaulting to 100. But if <<.em any>> tiddlers are included for a particular day, <<.em all>> of the other tiddlers for that day will also be included -- even if this exceeds the limit
+;format
+: A string specifying the desired [[format|DateFormat]], defaulting to `DDth MMM YYYY`
+;subfilter
+: An optional extra [[filter step|Filter Step]], e.g. `tag[MyTag]`
+;dateField
+: The name of the date field to use, defaulting to `modified`
 
-The subfilter and limit parameters are spliced into the filter string like this:
+The tiddlers are selected by means of a [[filter expression|Filter Expression]], into which the <<.param subfilter>> and <<.param limit>> parameters are spliced as follows:
 
-```
-[!is[system]$subfilter$has[modified]!sort[modified]limit[$limit$]eachday[modified]]
-```
+> `[!is[system]$subfilter$has[modified]!sort[modified]limit[$limit$]eachday[modified]]`
 
-To restrict the timeline to a particular tag, the subfilter can be set to something like `tag[mytag]`:
-
-```
-<<timeline limit:10 subfilter:"tag[mytag]">>
-```
-
-Note that the timeline macro does not truncate the entries for a particular day, instead always displaying all the tiddlers under each displayed day heading. This means that the limit parameter works in an unexpected way because it is possible for more than the specified number of tiddlers to be displayed.
-
-! Examples
-
-<$macrocall $name="wikitext-example-without-html"
-src="<<timeline limit:30 format:'DD/MM/YYYY'>>
-"/>
+<<.macro-examples "timeline">>
diff --git a/editions/tw5.com/tiddlers/macros/VersionMacro.tid b/editions/tw5.com/tiddlers/macros/VersionMacro.tid
index a4c69fe13..a5e55e79b 100644
--- a/editions/tw5.com/tiddlers/macros/VersionMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/VersionMacro.tid
@@ -1,18 +1,14 @@
 created: 20131228162448664
-modified: 20131228162605081
-tags: Macros
-title: VersionMacro
+modified: 20150221214134000
+tags: Macros [[Core Macros]]
+title: version Macro
 type: text/vnd.tiddlywiki
 caption: version
 
-The version macro returns the current TiddlyWiki version number.
+The <<.def version>> [[macro|Macros]] returns the current version number of ~TiddlyWiki.
 
-! Example
+!! Parameters
 
-The version macro takes no parameters:
+(none)
 
-```
-Version number: <<version>>
-```
-
-Version number: <<version>>
+<<.macro-examples "version">>
diff --git a/editions/tw5.com/tiddlers/macros/examples/Macro Calls.tid b/editions/tw5.com/tiddlers/macros/examples/Macro Calls.tid
new file mode 100644
index 000000000..365bf89ea
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/Macro Calls.tid	
@@ -0,0 +1,30 @@
+created: 20150220182252000
+modified: 20150221221723000
+tags: [[WikiText Examples]]
+title: Macro Calls in WikiText (Examples)
+type: text/vnd.tiddlywiki
+
+\define sayhi-example-1() <<sayhi>>
+\define sayhi-example-2() <<sayhi Bugs>>
+\define sayhi-example-3() <<sayhi "Donald Duck" Disneyland>>
+\define sayhi-example-4() <<sayhi "Mickey Mouse" "Mouse House">>
+\define sayhi-example-5() <<sayhi name:'Minnie Mouse' address:[[Mouse House]]>>
+\define sayhi-example-6() <<sayhi address:"Quacky Towers" name:"Donald Duck">>
+
+\define sayhi-example-7()
+<<sayhi "Mickey Mouse" """"Mouse House",
+Rodent's Lane,
+Squeaksville,
+Ratland""">>
+\end
+
+<$importvariables filter="$:/editions/tw5.com/macro-examples/say-hi">
+<$codeblock code={{$:/editions/tw5.com/macro-examples/say-hi}}/>
+<$macrocall $name=".example" n="1" eg=<<sayhi-example-1>>/>
+<$macrocall $name=".example" n="2" eg=<<sayhi-example-2>>/>
+<$macrocall $name=".example" n="3" eg=<<sayhi-example-3>>/>
+<$macrocall $name=".example" n="4" eg=<<sayhi-example-4>>/>
+<$macrocall $name=".example" n="5" eg=<<sayhi-example-5>>/>
+<$macrocall $name=".example" n="6" eg=<<sayhi-example-6>>/>
+<$macrocall $name=".example" n="7" egvar="sayhi-example-7"/>
+</$importvariables>
diff --git a/editions/tw5.com/tiddlers/macros/examples/changecount.tid b/editions/tw5.com/tiddlers/macros/examples/changecount.tid
new file mode 100644
index 000000000..3120e2e95
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/changecount.tid
@@ -0,0 +1,18 @@
+created: 20150221151206000
+modified: 20150221151227000
+tags: [[changecount Macro]] [[Macro Examples]]
+title: changecount Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<changecount>>"""/>
+
+The value will increase if you edit this tiddler and store it again, even without making any changes to its content.
+
+To access the <<.var changecount>> of a different tiddler, use a <<.wlink TiddlerWidget>> widget:
+
+<$macrocall $name=".example" n="2"
+eg="""<$tiddler tiddler="Draft of 'New Tiddler'">
+<<changecount>>
+</$tiddler>"""/>
+
+The value shown will increase whenever you create, store or delete [[New Tiddler]].
diff --git a/editions/tw5.com/tiddlers/macros/examples/colour.tid b/editions/tw5.com/tiddlers/macros/examples/colour.tid
new file mode 100644
index 000000000..8f12d354d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/colour.tid
@@ -0,0 +1,11 @@
+created: 20150221154356000
+modified: 20150221154803000
+tags: [[colour Macro]] [[Macro Examples]]
+title: colour Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<colour code-border>>"""/>
+<$macrocall $name=".example" n="2" eg="""<<colour foreground>>"""/>
+<$macrocall $name=".example" n="3" eg="""<<colour page-background>>"""/>
+<$macrocall $name=".example" n="4" eg="""<<colour sidebar-tab-background>>"""/>
+<$macrocall $name=".example" n="5" eg="""<<colour tag-foreground>>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/datauri.tid b/editions/tw5.com/tiddlers/macros/examples/datauri.tid
new file mode 100644
index 000000000..606aba049
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/datauri.tid
@@ -0,0 +1,19 @@
+created: 20150221160534000
+modified: 20150221223524000
+tags: [[datauri Macro]] [[Macro Examples]]
+title: datauri Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="2"
+eg="""<style>
+.jack {
+	background: url(<$macrocall $name="datauri" title="Motovun Jack.jpg" $output="text/plain"/>);
+	height: 300px;
+}
+</style>
+
+<div class="jack"/>"""/>
+
+The example has to invoke <<.var datauri>> through the <<.wid macrocall>> widget. It needs to prevent the macro's output from being parsed as WikiText, as that would transform the data URI into a <<.wlink LinkWidget>> widget and break the example. If the example was in a CSS tiddler, you could simply write:
+
+> `background: url(<<datauri "Motovun Jack.jpg">>);`
diff --git a/editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid b/editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid
new file mode 100644
index 000000000..2412368c2
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid
@@ -0,0 +1,14 @@
+created: 20150221151358000
+modified: 20150221151415000
+tags: [[dumpvariables Macro]] [[Macro Examples]]
+title: dumpvariables Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1"
+eg="""<$set name="EXAMPLE" value="123.$(EXAMPLE2)$.789">
+<$set name="EXAMPLE2" value="456">
+
+<<dumpvariables>>
+
+</$set>
+</$set>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/lingo.tid b/editions/tw5.com/tiddlers/macros/examples/lingo.tid
new file mode 100644
index 000000000..8f0fb9d57
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/lingo.tid
@@ -0,0 +1,13 @@
+created: 20150221151358000
+modified: 20150221160113000
+tags: [[lingo Macro]] [[Macro Examples]]
+title: lingo Macro (Examples)
+type: text/vnd.tiddlywiki
+
+This example shows the text used as the basis for the title of a newly created tiddler:
+
+<$macrocall $name=".example" n="1" eg="""<<lingo DefaultNewTiddlerTitle>>"""/>
+
+This example shows the name of the eighth month of the year, for use in [[formatting dates|DateFormat]]:
+
+<$macrocall $name=".example" n="2" eg="""<<lingo Date/Long/Month/8>>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/list-links.tid b/editions/tw5.com/tiddlers/macros/examples/list-links.tid
new file mode 100644
index 000000000..046330603
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/list-links.tid
@@ -0,0 +1,13 @@
+created: 20150221160534000
+modified: 20150221160748000
+tags: [[list-links Macro]] [[Macro Examples]]
+title: list-links Macro (Examples)
+type: text/vnd.tiddlywiki
+
+This example lists all the tiddlers whose titles start with J:
+
+<$macrocall $name=".example" n="1" eg="""<<list-links filter:"[prefix[J]]">>"""/>
+
+This example lists the documentation tiddlers for the core macros, each of which has a <<.field caption>> field:
+
+<$macrocall $name=".example" n="2" eg="""<<list-links filter:"[tag[Core Macros]]">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/makedatauri.tid b/editions/tw5.com/tiddlers/macros/examples/makedatauri.tid
new file mode 100644
index 000000000..8ebac02b6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/makedatauri.tid
@@ -0,0 +1,7 @@
+created: 20150221160534000
+modified: 20150221223613000
+tags: [[makedatauri Macro]] [[Macro Examples]]
+title: makedatauri Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<makedatauri "some example text" "text/plain">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/now.tid b/editions/tw5.com/tiddlers/macros/examples/now.tid
new file mode 100644
index 000000000..10a45b666
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/now.tid
@@ -0,0 +1,9 @@
+created: 20150221151358000
+modified: 20150221170425000
+tags: [[now Macro]] [[Macro Examples]]
+title: now Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<now>>"""/>
+<$macrocall $name=".example" n="2" eg="""<<now YYYY-0MM-0DD>>"""/>
+<$macrocall $name=".example" n="3" eg="""<<now "hh:0mm:0sspm">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/qualify-transcluded.tid b/editions/tw5.com/tiddlers/macros/examples/qualify-transcluded.tid
new file mode 100644
index 000000000..228b05927
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/qualify-transcluded.tid
@@ -0,0 +1,11 @@
+created: 20150221171233000
+modified: 20150221172546000
+tags: [[qualify Macro]] [[Macro Examples]]
+title: $:/editions/tw5.com/macro-examples/qualify-transcluded
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1"
+eg="""<ul>
+<li><code><<qualify "BaseTiddler">></code></li>
+<li><code><<transclusion>></code></li>
+</ul>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/qualify.tid b/editions/tw5.com/tiddlers/macros/examples/qualify.tid
new file mode 100644
index 000000000..fc48ecf24
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/qualify.tid
@@ -0,0 +1,20 @@
+created: 20150221172527000
+tags: [[qualify Macro]] [[Macro Examples]]
+title: qualify Macro (Examples)
+type: text/vnd.tiddlywiki
+
+The results returned by the <<.mlink qualify>> macro depend on its location in the transclusion stack.
+
+The two examples below are identical, but produce different results because the second one has been transcluded from [[another tiddler|$:/editions/tw5.com/macro-examples/qualify-transcluded]].
+
+Each example shows the result of calling <<.var qualify>> and then the value of the <<.vlink transclusion>> variable.
+
+<$macrocall $name=".example" n="1"
+eg="""<ul>
+<li><code><<qualify "BaseTiddler">></code></li>
+<li><code><<transclusion>></code></li>
+</ul>"""/>
+
+<blockquote>
+{{$:/editions/tw5.com/macro-examples/qualify-transcluded}}
+</blockquote>
diff --git a/editions/tw5.com/tiddlers/macros/examples/resolvepath.tid b/editions/tw5.com/tiddlers/macros/examples/resolvepath.tid
new file mode 100644
index 000000000..e2f123a42
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/resolvepath.tid
@@ -0,0 +1,12 @@
+created: 20150221182731000
+modified: 20150221183441000
+tags: [[resolvepath Macro]] [[Macro Examples]]
+title: resolvepath Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<resolvepath "./backup" "http://example.com/store.php">>"""/>
+<$macrocall $name=".example" n="2" eg="""<<resolvepath "backup" "http://example.com/store.php">>"""/>
+<$macrocall $name=".example" n="3" eg="""<<resolvepath "../backup" "http://example.com/store.php">>"""/>
+<$macrocall $name=".example" n="4" eg="""<<resolvepath "../jpg/Motovun_Jack.jpg" "http://example.com/resources/images/png/">>"""/>
+<$macrocall $name=".example" n="5" eg="""<<resolvepath "../jpg/../png/Motovun_Jack.png">>"""/>
+<$macrocall $name=".example" n="6" eg="""<<resolvepath "jpg/Motovun_Jack.jpg">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/tabs.tid b/editions/tw5.com/tiddlers/macros/examples/tabs.tid
new file mode 100644
index 000000000..b752bfacb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/tabs.tid
@@ -0,0 +1,14 @@
+created: 20150221211317000
+modified: 20150221211719000
+tags: [[tabs Macro]] [[Macro Examples]]
+title: tabs Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1"
+eg="""<<tabs "SampleTabOne SampleTabTwo SampleTabThree SampleTabFour" "SampleTabOne" "$:/state/tab1">>"""/>
+
+<$macrocall $name=".example" n="2"
+eg="""<<tabs "[tag[sampletab]]" "SampleTabTwo" "$:/state/tab2" "tc-vertical">>"""/>
+
+<$macrocall $name=".example" n="3"
+eg="""<<tabs "[tag[sampletab]nsort[order]]" "SampleTabThree" "$:/state/tab3" "tc-vertical">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/tag.tid b/editions/tw5.com/tiddlers/macros/examples/tag.tid
new file mode 100644
index 000000000..915c175e5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/tag.tid
@@ -0,0 +1,8 @@
+created: 20150221211317000
+modified: 20150221224519000
+tags: [[tag Macro]] [[Macro Examples]]
+title: tag Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<tag>>"""/>
+<$macrocall $name=".example" n="2" eg="""<<tag Concepts>>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/timeline.tid b/editions/tw5.com/tiddlers/macros/examples/timeline.tid
new file mode 100644
index 000000000..7ae003d2c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/timeline.tid
@@ -0,0 +1,8 @@
+created: 20150221213650000
+modified: 20150221224634000
+tags: [[timeline Macro]] [[Macro Examples]]
+title: timeline Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""<<timeline format:"DD/MM/YYYY">>"""/>
+<$macrocall $name=".example" n="2" eg="""<<timeline limit:30 subfilter:"tag[Definitions]" format:"DD/MM/YYYY">>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/toc.tid b/editions/tw5.com/tiddlers/macros/examples/toc.tid
new file mode 100644
index 000000000..baffd197b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/toc.tid
@@ -0,0 +1,20 @@
+created: 20150221193056000
+modified: 20150221205038000
+tags: [[Table-of-Contents Macros]] [[Macro Examples]]
+title: Table-of-Contents Macros (Examples)
+type: text/vnd.tiddlywiki
+
+These examples derive tables of contents from the root tag <<.tag Contents>>.
+
+You can explore the same structure with these clickable tag pills:
+
+* {{Contents||$:/core/ui/TagTemplate}}
+** {{First||$:/core/ui/TagTemplate}}
+** {{Second||$:/core/ui/TagTemplate}}
+*** {{SecondThree||$:/core/ui/TagTemplate}}
+** {{Third||$:/core/ui/TagTemplate}}
+** {{Fourth||$:/core/ui/TagTemplate}}
+
+The tabbed example uses the real TableOfContents of this documentation instead.
+
+<<tabs "[tag[table-of-contents-example]nsort[order]]" "Example Table of Contents: Simple">>
diff --git a/editions/tw5.com/tiddlers/macros/examples/version.tid b/editions/tw5.com/tiddlers/macros/examples/version.tid
new file mode 100644
index 000000000..eaca015d1
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/version.tid
@@ -0,0 +1,7 @@
+created: 20150221214110000
+modified: 20150221214129000
+tags: [[version Macro]] [[Macro Examples]]
+title: version Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg="""Version number: <<version>>"""/>
diff --git a/editions/tw5.com/tiddlers/macros/import/say-hi-using-variables.tid b/editions/tw5.com/tiddlers/macros/import/say-hi-using-variables.tid
new file mode 100644
index 000000000..4aa265fa3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/import/say-hi-using-variables.tid
@@ -0,0 +1,10 @@
+created: 20150221145447000
+modified: 20150221145626000
+title: $:/editions/tw5.com/macro-examples/say-hi-using-variables
+type: text/vnd.tiddlywiki
+
+\define say-hi-using-variables()
+Hi, I'm $(name)$ and I live in $(address)$.
+\end
+
+\define name() Bugs
diff --git a/editions/tw5.com/tiddlers/macros/import/say-hi.tid b/editions/tw5.com/tiddlers/macros/import/say-hi.tid
new file mode 100644
index 000000000..2d2d31afc
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/import/say-hi.tid
@@ -0,0 +1,8 @@
+created: 20150221145803000
+modified: 20150221221536000
+title: $:/editions/tw5.com/macro-examples/say-hi
+type: text/vnd.tiddlywiki
+
+\define sayhi(name:"Bugs Bunny" address:"Rabbit Hole Hill")
+Hi, I'm $name$ and I live in $address$.
+\end
diff --git a/editions/tw5.com/tiddlers/macros/import/tags-of-current-tiddler.tid b/editions/tw5.com/tiddlers/macros/import/tags-of-current-tiddler.tid
new file mode 100644
index 000000000..b1bfc753c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/import/tags-of-current-tiddler.tid
@@ -0,0 +1,5 @@
+created: 20150221145803000
+title: $:/editions/tw5.com/macro-examples/tags-of-current-tiddler
+type: text/vnd.tiddlywiki
+
+\define tags-of-current-tiddler() {{!!tags}}
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid
new file mode 100644
index 000000000..846200cc9
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid
@@ -0,0 +1,27 @@
+created: 20150221105732000
+modified: 20150221222352000
+tags: [[Macro Syntax]]
+title: Macro Call Syntax
+type: text/vnd.tiddlywiki
+
+<<.preamble """What follows is a formal presentation of the syntax of the WikiText syntax for macro calls, using [[railroad diagrams|Railroad Diagrams]]. A [[simpler overview|Macro Calls in WikiText]] is also available.""">>
+
+<$railroad text="""
+"<<" name [: space [:{param-value}] ]">>"
+"""/>
+
+<<.place space>> denotes a sequence of [[whitespace characters|Filter Whitespace]].
+
+The [[macro|Macros]]'s <<.place name>> is a sequence of non-whitespace characters other than `(` or `>`.
+
+Each individual <<.place param-value>> has the following syntax:
+
+<$railroad text="""
+[: param-name [:space] ":" [:space] ] value [: space]
+"""/>
+
+The <<.place param-name>> is a sequence of letters (`A`--`Z`, `a`--`z`), digits (`0`--`9`), hyphens (`-`) and underscores (`_`).
+
+The <<.place value>> is specified as follows:
+
+<$railroad text={{$:/editions/tw5.com/railroad/macro-parameter-value}}/>
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid
new file mode 100644
index 000000000..81877b3a5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid
@@ -0,0 +1,52 @@
+created: 20150220200255000
+modified: 20150221222349000
+tags: [[Macro Syntax]]
+title: Macro Definition Syntax
+type: text/vnd.tiddlywiki
+
+<<.preamble """What follows is a formal presentation of the syntax of the `\define` pragma, using [[railroad diagrams|Railroad Diagrams]]. A [[simpler overview|Macro Definitions in WikiText]] is also available.""">>
+
+<$railroad text="""
+"\define" space name params [:space] rest
+"""/>
+
+<<.place space>> denotes a sequence of [[whitespace characters|Filter Whitespace]].
+
+The [[macro|Macros]]'s <<.place name>> is a sequence of non-whitespace characters other than `(` or `>`.
+
+The parameter declaration list (<<.place params>>) has the following syntax:
+
+<$railroad text="""
+"(" [:sep] [:{ param sep }] ")"
+"""/>
+
+The parameter separator (<<.place sep>>) is any sequence of characters that does not match a <<.place param-name>>. Among other things, this includes commas, spaces and linefeeds.
+
+A <<.place param-name>> is a sequence of letters (`A`--`Z`, `a`--`z`), digits (`0`--`9`), hyphens (`-`) and underscores (`_`).
+
+Each individual <<.place param>> has the following syntax:
+
+<$railroad text="""
+param-name [: [:space] ":" [:space] default ]
+")"
+"""/>
+
+The optional <<.place default>> value of a parameter is specified as follows:
+
+<$railroad text={{$:/editions/tw5.com/railroad/macro-parameter-value}}/>
+
+The <<.place rest>> of the definition has the following syntax:
+
+<$railroad text="""
+( snippet | lf snippet lf "\end" [:space] ) lf
+"""/>
+
+<<.place lf>> denotes a linefeed.
+
+The <<.place snippet>> is any sequence of characters that doesn't terminate the macro definition. That is to say, a single-line snippet cannot contain a linefeed, and a multi-line snippet cannot contain `\end` on a line of its own.
+
+The snippet can contain placeholders with the following syntax:
+
+<$railroad text="""
+( "$" name "$" | "$" "(" name ")" "$" )
+"""/>
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroParameterValue.tid b/editions/tw5.com/tiddlers/macros/syntax/MacroParameterValue.tid
new file mode 100644
index 000000000..81ad3b116
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/syntax/MacroParameterValue.tid
@@ -0,0 +1,11 @@
+created: 20150220191009000
+modified: 20150221111554000
+title: $:/editions/tw5.com/railroad/macro-parameter-value
+type: text/vnd.tiddlywiki.railroad
+
+( '"""' [:{/'anything but """'/}] '"""'
+| '"'   [:{/'anything but "'/}]   '"'
+| "'"   [:{/"anything but '"/}]   "'"
+| "[["  [:{/"anything but ]"/}]   "]]"
+| {/"""anything but ' " or whitespace"""/}
+)
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid
new file mode 100644
index 000000000..4b4ca65f0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid
@@ -0,0 +1,6 @@
+created: 20150221222254000
+modified: 20150221222354000
+tags: Macros
+title: Macro Syntax
+
+<<list-links filter="[tag[Macro Syntax]]">>
diff --git a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
index 342ca52d4..4d4c933be 100644
--- a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid
@@ -1,5 +1,5 @@
 created: 20131228164411884
-modified: 20131228164955084
+modified: 20150221225557000
 tags: Mechanisms
 title: StateMechanism
 type: text/vnd.tiddlywiki
@@ -38,6 +38,4 @@ However, we can't track the state in a tiddler called, say, [[$:/InfoPanelState]
 
 The solution is to dynamically generate a unique title for each state tiddler that we need. We need to ensure that the same state tiddler title is generated each time a user interface element is rendered. To do that, we append together tokens representating each of the stack of transclusions that led to the current rendering location. Then that string of symbols is hashed to a simple numeric value.
 
-The process of generating a state tiddler title is encapsulated in the QualifyMacro.
-
-
+The process of generating a state tiddler title is encapsulated in the <<.mlink qualify>> macro.
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid
index 1b1e16edf..8958a21ab 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid	
@@ -1,6 +1,6 @@
 caption: 5.1.3
 created: 20141020171015200
-modified: 20150118182805000
+modified: 20150221230151000
 tags: ReleaseNotes
 title: Release 5.1.3
 type: text/vnd.tiddlywiki
@@ -27,7 +27,7 @@ released: 20141020171015200
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0dcf54c3b59ed04645928f0ec4ced647e5a0da7f]] support for ActionWidgets
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/65504d5d41e45326ab1b1b6c0c21eea4c9772797]] new <<.olink addprefix>> and <<.olink addsuffix>> operators
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0c8e5380778303cdd3308bed4a15290214841f8b]] support for custom password prompts
-* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c26bd4c5a872f56c47e9f5cfc3fada468c53ddde]] the ListMacro to display ''caption'' field if present
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c26bd4c5a872f56c47e9f5cfc3fada468c53ddde]] the <<.mlink list-links>> macro to display ''caption'' field if present
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/12e26009eef5e29140ba1a880ff033428d673630]] ImageWidget to allow percentage width and height to be specified
 
 !! Bug Fixes
@@ -38,7 +38,7 @@ released: 20141020171015200
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/3ca8d7b6cca46ffa424bcf9bdc134da464fc84f4]] problem with jumping toolbar icons under Firefox
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/f85b07e70b71d0622a9459e4b04e2027540abda8]] problem with untagged label being incorrectly coloured
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b3dcd7d625ec83701ef3a77f3fb8101af57c154f]] problem with title background colours with the "Sticky Titles" theme
-* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5211f9c40c874a167174e8c0d439db34189d3329]] problem with subfilter parameter of TimelineMacro
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5211f9c40c874a167174e8c0d439db34189d3329]] problem with subfilter parameter of <<.mlink timeline>> macro
 * [[Exclude|https://groups.google.com/d/topic/tiddlywiki/YPACpXhH9PY/discussion]] search string tiddler from search results
 
 !! Node.js Changes
@@ -65,4 +65,3 @@ released: 20141020171015200
 * [[@simonbaird|https://github.com/simonbaird]]
 * [[@TheDiveO|https://github.com/TheDiveO]]
 * [[@xcazin|https://github.com/xcazin]]
-
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid
index bafcdf053..462fad812 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid	
@@ -1,6 +1,6 @@
 caption: 5.1.5
 created: 20141025120850184
-modified: 20150118182717000
+modified: 20150221225041000
 tags: ReleaseNotes
 title: Release 5.1.5
 type: text/vnd.tiddlywiki
@@ -39,13 +39,13 @@ released: 20141126153016142
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/13726ef73157d9e9d65ae4027d9c32aaa7cdcc90]] new canned filter for recently modified system tiddlers in [[$:/AdvancedSearch]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c20c935faabbb63f679bc4720b52162c56b6af64]] new system image for videos: [[$:/core/images/video]]
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c13cf94413c94ee56bebc60fab2d9231d1824d88]] search results to allow custom visualisations - see [[Customising search results]]
-* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/a3a50dbf6d96e7441e5e8ec183e40134bc4eb618]] TimelineMacro to be able to use different date fields
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/a3a50dbf6d96e7441e5e8ec183e40134bc4eb618]] <<.mlink timeline>> macro to be able to use different date fields
 * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/8260d000be1cf1caf35a557f6cd54a0fb8ccf4f0]] the <<.olink search>> operator to allow a field to be specified
 * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/73491f14dd63612d527632210d2c3873eb81188f]] the highlight plugin to display tabs as spaces
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/91a7c397911726e391ca368f96b50fbe1687d56a]] modal handling to permit variables to be passed to the modal (see [[WidgetMessage: tm-modal]])
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/853f5fd06402b16e271e8f119ef380de485aeff2]] simple logging to help track down drop/paste issues (see http://tiddlywiki.com/dev/#ImportLogging)
 * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/b520efdeb83f6ac7536a69cf5af2bab3f94cf77f]] [[WidgetMessage: tm-download-file]] and [[WidgetMessage: tm-save-wiki]] to allow variables to be specified for the rendering
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f5055c0205d24102a36b9cf3a9dd9306e148a1f0]] [[TableOfContentsMacro Tabbed Example]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f5055c0205d24102a36b9cf3a9dd9306e148a1f0]] [[Example Table of Contents: Tabbed Internal]]
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/79e428757b5562bd4a925b9b0428ea4ba70ad05a]] RevealWidget so that it can be used without specifying a state tiddler
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/90caf5bf42523cfb6cd603b979aadb719ddcede4]] "hooks" mechanism so that plugins can modify the default tiddler list
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b882a0dff12dc2660426de53e64d8c018f3a9d84]] support for nested popups
@@ -53,7 +53,7 @@ released: 20141126153016142
 !! Bug Fixes
 
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/90096cbd367a7a685fb5dc5b2cbaa69a00d8199f]] problem with CodeMirror editor and missing tiddlers
-* [[Exclude|https://github.com/Jermolene/TiddlyWiki5/commit/5093cdc86047209f23b9ead5ee0f216d0414e4f2]] drafts from TableOfContentsMacro
+* [[Exclude|https://github.com/Jermolene/TiddlyWiki5/commit/5093cdc86047209f23b9ead5ee0f216d0414e4f2]] drafts from [[Table-of-Contents Macros]]
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5599f9f9338a5f96080143b2192214a78b961509]] problem with encoding of HTML tiddlers
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/835e3a945244dd8a07f4c7fd570eb890e9fdcc2c]] problem with sticky titles being covered by vertical tabs
 * [[Removed|https://github.com/Jermolene/TiddlyWiki5/commit/d1bbe7253c135ceed138fd02c82b0f861d5dda6b]] flicker when automatically resizing textareas
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid
index 06e65feaf..ba4e04d5b 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid	
@@ -1,6 +1,6 @@
 caption: 5.1.6
 created: 20141127120850184
-modified: 20150118182735000
+modified: 20150221194210000
 tags: ReleaseNotes
 title: Release 5.1.6
 type: text/vnd.tiddlywiki
@@ -16,9 +16,9 @@ released: 20141219155007260
 !! Hackability Improvements
 
 * [[Allow|https://github.com/Jermolene/TiddlyWiki5/commit/b29973312d7c16292cabb493e5914668f7c3f127]] buttons to be styled to look like internal links
-* [[Disabled|https://github.com/Jermolene/TiddlyWiki5/commit/5b38c21a417d2e5e2b85aed8010c88af32420e24]] linking when transcluding ''caption'' field in TableOfContentsMacro
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b220c19fb7b789eb6d00c9d1a71414676d87130e]] support for templates to tabbed TableOfContentsMacro
-* [[Allow|https://github.com/Jermolene/TiddlyWiki5/commit/31b5eb1578640fabe8712f0cd4edd49708bc4493]] shadow tiddlers to appear in TableOfContentsMacro
+* [[Disabled|https://github.com/Jermolene/TiddlyWiki5/commit/5b38c21a417d2e5e2b85aed8010c88af32420e24]] linking when transcluding ''caption'' field in [[Table-of-Contents Macros]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b220c19fb7b789eb6d00c9d1a71414676d87130e]] support for templates to tabbed [[Table-of-Contents Macros]]
+* [[Allow|https://github.com/Jermolene/TiddlyWiki5/commit/31b5eb1578640fabe8712f0cd4edd49708bc4493]] shadow tiddlers to appear in [[Table-of-Contents Macros]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/5154a25ab95f0cc08eb079a624be4fd3353e6dbd]] tooltip to BrowseWidget
 * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/42dba113ccdb18d7e76ac7a773c7dca532207007]] handling of missing tiddlers by the <<.olink has>> and <<.olink field>> operators
 
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.11beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.11beta.tid
index ca6d93585..90857d4e1 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.11beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.11beta.tid	
@@ -1,5 +1,5 @@
 created: 20140516150234142
-modified: 20150118182530000
+modified: 20150221225737000
 tags: BetaReleaseNotes
 title: Release 5.0.11-beta
 type: text/vnd.tiddlywiki
@@ -36,7 +36,7 @@ See [[Notes for upgrading to 5.0.11-beta]] for more details of these changes:
 
 !! Hackability Improvements
 
-* Improved vertical layouts of TabsMacro
+* Improved vertical layouts of <<.mlink tabs>> macro
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/93566cdc332226b77eaba8a70fa166f3b8fcfe1e]] "standard" tab to [[advanced search|$:/AdvancedSearch]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e83759e86d2a9e05e4b85dae50925fe988f8e239]] new filter operators <<.olink before>> and <<.olink after>>
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/570cad1c7f90e685961130918f09a7f9b2951f8c]] new <<.olink get>> operator
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid
index 54c8eff57..fc98fe6fe 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid	
@@ -1,6 +1,6 @@
 caption: 5.0.14-beta
 created: 20140718150234142
-modified: 20150124211128000
+modified: 20150221225749000
 tags: BetaReleaseNotes
 title: Release 5.0.14-beta
 type: text/vnd.tiddlywiki
@@ -64,7 +64,7 @@ For 5.0.14-beta, the setting has been changed. Visit [[control panel|$:/ControlP
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b4d47858e587c96f3a68cc28cffff181ec45f55f]] support for the InfoMechanism
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/f08f57c5d24eb0146ac2cb77472a5fc5f135f1e9]] CheckboxWidget to allow it to toggle fields as well as tags
 * [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/21c137a66c37f010b36697bb6bed5321138fbb9f]] [[control panel|$:/ControlPanel]] theme tweaks to be stored in individual tiddlers
-* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/e18d8a88661a1c2caa1b722841747c75ca6af437]] the TabsMacro to allow tabs to be templated
+* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/e18d8a88661a1c2caa1b722841747c75ca6af437]] the <<.mlink tabs>> macro to allow tabs to be templated
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/91acad0f7ce8637945a953dfcb122cd31292626d]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/8612bc4006e717e4fa3c562fa72a85650206b66f]]) SystemTags support for inserting content above and below the story river
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f793816dfa687ae7791143b33487fd5f95f3265c]] support for transcluding plugin subtiddlers with the TranscludeWidget
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c73853288c5b4b0716da94fea2f2edec09345643]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/08f775eac8cb053d08c1c561e65a5eeb87c4c6b6]]) support for importing from `*.htm` and `*.hta` files as well as the existing support for `*.html` files
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.15beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.15beta.tid
index b970986ec..7a8ea62d7 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.15beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.15beta.tid	
@@ -1,6 +1,6 @@
 caption: 5.0.15-beta
 created: 20140812150234142
-modified: 20140820153116300
+modified: 20150221194057000
 tags: BetaReleaseNotes
 title: Release 5.0.15-beta
 type: text/vnd.tiddlywiki
@@ -20,7 +20,7 @@ released: 201408202255
 
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c912fed55d94c9bef2d541cd55f458b12172941c]] a banner to the edit template encouraging improvements to the documentation
 * [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/f75af2c983e10e8a82639890b993fb5cf042d610]] `saver-handler.js` out of `syncer.js`
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/8cf726275c19ed5b4a0ed1cf8354d64d1bc29da5]] TableOfContentsMacro support
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/8cf726275c19ed5b4a0ed1cf8354d64d1bc29da5]] [[Table-of-Contents Macros]]
 * Simplified startup module organisation (see [[Startup Modules.svg]])
 * [[Changed|https://github.com/Jermolene/TiddlyWiki5/commit/25777b147fa4ed2f915150aec503ad1e094e6043]] the overlay text for the DropzoneWidget to make it translateable
 * [[Introduced|https://github.com/Jermolene/TiddlyWiki5/commit/920e11e7921f777170aa2f9e1836c000fec2e26d]] a new [[refresh button|WidgetMessage: tw-browser-refresh]] and reverted [[home button|WidgetMessage: tw-home]] behaviour
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid
index 7218fcaff..d9b55bb34 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid	
@@ -1,6 +1,6 @@
 caption: 5.0.16-beta
 created: 20140830131615798
-modified: 20150118182819000
+modified: 20150221194111000
 tags: BetaReleaseNotes
 title: Release 5.0.16-beta
 type: text/vnd.tiddlywiki
@@ -36,14 +36,14 @@ Many thanks to @buggyj for his work on this plugin.
 
 * [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/48312272adb17610db96d50758e6af947cab7b1d]] the <<.olink all>> operator to be able to select all the source tiddlers
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/43aeb47fc34f1ba424030c4f78ee907fe7b1d5d8]] problem with single line macro definitions incorrectly including whitespace in the value. (For example, `\define mymacro() yes` would set the macro value to " yes", with a leading space)
-* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/d2a5a12f2d6b6ccc36dd22a70ac2def08d1d3722]] TableOfContentsMacro to use the caption field if present
+* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/d2a5a12f2d6b6ccc36dd22a70ac2def08d1d3722]] [[Table-of-Contents Macros]] use the caption field if present
 * [[Configurability|https://github.com/Jermolene/TiddlyWiki5/commit/b437f1b450f5f2a3104a9086f7c674299b53b9bc]] for the default tab shown in the tiddler info panel (see [[Configuring the default TiddlerInfo tab]])
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/dcf4e93a3283e3e93cc14e50366f9b0252870835]] <<.olink suffix>> and <<.olink removesuffix>> operators
 
 !! Bug Fixes
 
 * [[Reverted|https://github.com/Jermolene/TiddlyWiki5/commit/ad40223d6b9bed435d9381611cb9de1841b53df6]] incorrect refreshing of the tiddler widget
-* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/44228ed9f733217557851150f5ae45d9ebb23420]] indentation of selective expandable TableOfContentsMacro
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/44228ed9f733217557851150f5ae45d9ebb23420]] indentation of selective expandable [[Table-of-Contents Macros]]
 
 !! Contributors
 
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid
index dba71042a..a374dcaab 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid	
@@ -1,6 +1,6 @@
 caption: 5.0.17-beta
 created: 20140910131615798
-modified: 20150118182638000
+modified: 20150221225235000
 tags: BetaReleaseNotes
 title: Release 5.0.17-beta
 type: text/vnd.tiddlywiki
@@ -48,9 +48,9 @@ The goal is to make the TiddlyWiki repository easier to comprehend for newcomers
 * Moved developer documentation to http://tiddlywiki.com/dev
 * [[Improvements|https://github.com/Jermolene/TiddlyWiki5/commit/872e6fc2532012f0f9acfb29aa24a9cd5f340b9d]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/c8a131ffd4716f2b99ab508567422ff463f2849d]]) to `serve.sh`/`serve.cmd` scripts
 * [[Disable|https://github.com/Jermolene/TiddlyWiki5/commit/ac54fe33263cbe48bc294f9c14257ccc146be38e]] plugins when in SafeMode
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c1de85838f3d0d3e6a207152ecc9d61ff08a4b05]] new TimelineMacro
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f16d1832aae9a7ce71dea78b16c11afaf673acf2]] new DumpVariablesMacro
-* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/ba3f8002355607c8b00b7d184f01fa68bbcda152]] TableOfContentsMacro so that individual links can be disabled
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c1de85838f3d0d3e6a207152ecc9d61ff08a4b05]] new <<.mlink timeline>> macro
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f16d1832aae9a7ce71dea78b16c11afaf673acf2]] new <<.mlink dumpvariables>> macro
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/ba3f8002355607c8b00b7d184f01fa68bbcda152]] [[Table-of-Contents Macros]] so that individual links can be disabled
 * [[Removed|https://github.com/Jermolene/TiddlyWiki5/commit/542788bfeba98ec3bac0bb721293c16354bc1b34]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/487c4a40abda2b457b4015033bf1be76bd81dcc9]]) unnecessary `<p>` tag from edit tags and types dropdowns
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ccd916ca7cb45468ac30eb48bfdf86bea704d810]] ''multiple'' attribute to the BrowseWidget
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/ab944bbf02e9fae606632a11df1053a46573fa49]] view template to hide bodies of tiddlers with field ''hide-body'' set to ''yes''
@@ -60,7 +60,7 @@ The goal is to make the TiddlyWiki repository easier to comprehend for newcomers
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/c713eddbef50603e313a86f78c185753bab3d607]] problem with draft tiddlers not counting as dirty
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/f87ce7e98a083f1bdcff5b1887b56aa95b731efe]] problem with keyboard shortcuts introduced in 5.0.16-beta
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/756e05504b33c387da7d3f81446a18f9a8fefe49]] problem with stylesheets being parsed in inline mode
-* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/9adc30f69fba169813638021780263ff0df4e2bc]] bug with selective expandable TableOfContentsMacro
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/9adc30f69fba169813638021780263ff0df4e2bc]] bug with selective expandable [[Table-of-Contents Macros]]
 
 !! Contributors
 
diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.18beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.18beta.tid
index ebf2ceb14..0100257ce 100644
--- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.18beta.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.18beta.tid	
@@ -1,6 +1,6 @@
 caption: 5.0.18-beta
 created: 20140917211055150
-modified: 20140917211055150
+modified: 20150221230143000
 tags: BetaReleaseNotes
 title: Release 5.0.18-beta
 type: text/vnd.tiddlywiki
@@ -16,9 +16,9 @@ The layout of files on tiddlywiki.com has been adjusted to make it more logical.
 
 !! Hackability Improvements
 
-* Added first iteration of a ListMacro (further improvements are planned)
+* Added first iteration of a <<.mlink list-links>> macro (further improvements are planned)
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/6d9bd4df8a1133c2ba246333edad14e6028d3ea4]] support for importing `.markdown` and `.md` files
-* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c4123ba3740f74f172468c4aa050451ebc5780d8]] TimelineMacro to support a subfilter
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c4123ba3740f74f172468c4aa050451ebc5780d8]] <<.mlink timeline>> macro to support a subfilter
 
 !! Bug Fixes
 
diff --git a/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid b/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid
index 31c8ffe1f..8ae525608 100644
--- a/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid	
+++ b/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid	
@@ -1,9 +1,9 @@
 created: 20150110182600000
-modified: 20150123221155000
+modified: 20150221181632000
 title: Documentation Macros
 tags: [[Improving TiddlyWiki Documentation]]
 
-The following macros are used throughout ~TiddlyWiki's documentation.
+The following macros are used throughout ~TiddlyWiki's documentation. Their names start with a dot to keep them out of the way of names that a user might try experimenting with.
 
 !General
 
@@ -26,18 +26,27 @@ The following macros are used throughout ~TiddlyWiki's documentation.
 |.field |a field name |<<.field example>> |
 |.value |a field value |<<.value "example value">> |
 |.op |a filter operator |<<.op backlinks>> |
-|.var |a variable or macro nam e|<<.var currentTiddler>> |
+|.var |a variable or macro name |<<.var currentTiddler>> |
 |.wid |a widget name |<<.wid list>> |
 |.attr |an attribute name |<<.attr filter>> |
+|.param |a macro parameter name |<<.param text>> |
 
 !Links
 
 |!Macro |!Used for |!Example |
 |.link |a link containing WikiText |<<.link "^^an^^ ~~example~~" Example>> |
 |.clink |a code link |<<.clink `<$list>` ListWidget>> |
+|.dlink |a link on a defining instance of a term |<<.dlink widget Widgets>> |
+|.dlink-ex |an external link on a defining instance of a term |<<.dlink-ex Example "http://example.com/">> |
 |.flink |a link to a field |<<.flink ListField>> |
+|.mlink |a link to a macro |<<.mlink qualify>> |
+|.mlink2 |a link to a macro, with specified target |<<.mlink2 foo "Examples of Macros">> |
 |.olink |a link to an operator |<<.olink prefix>> |
+|.olink2 |a link to an operator, with specified target |<<.olink2 foo prefix>> |
+|.vlink |a link to a variable |<<.vlink currentTiddler>> |
+|.vlink2 |a link to a variable, with specified target |<<.vlink2 foo "Examples of Variables">> |
 |.wlink |a link to a widget |<<.wlink ButtonWidget>> |
+|.wlink2 |a link to a widget, with specified text |<<.wlink2 foo ButtonWidget>> |
 
 !User interface
 
diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid
index 810c0e870..6aecd33aa 100644
--- a/editions/tw5.com/tiddlers/system/doc-macros.tid
+++ b/editions/tw5.com/tiddlers/system/doc-macros.tid
@@ -1,8 +1,10 @@
 created: 20150117152607000
-modified: 20150124180333000
+modified: 20150221200048000
 title: $:/editions/tw5.com/doc-macros
 tags: $:/tags/Macro
 
+\define .concat(1,2,3,4,5) $1$$2$$3$$4$$5$
+
 \define .def(_) <dfn class="doc-def">$_$</dfn>
 \define .em(_) <em class="doc-em">$_$</em>
 \define .strong(_) <strong class="doc-strong">$_$</strong>
@@ -25,18 +27,28 @@ tags: $:/tags/Macro
 \define .var(_) <code class="doc-var">$_$</code>
 \define .wid(_) <code class="doc-widget">$$_$</code>
 \define .attr(_) <code class="doc-attr">$_$</code>
+\define .param(_) <code class="doc-param">$_$</code>
 
+\define .mtitle(_) $_$ Macro
 \define .otitle(_) $_$ Operator
+\define .vtitle(_) $_$ Variable
 
 \define .link(_,to) <$link to="$to$">$_$</$link>
 \define .clink(_,to) <span class="doc-clink"><<.link """$_$""" "$to$">></span>
-\define .flink(to) <$macrocall $name=".link" _="<<.field {{$to$!!caption}}>>" to="$to$"/>
+\define .dlink(_,to) <$macrocall $name=".link" _=<<.def "$_$">> to="$to$">/>
+\define .dlink-ex(_,to) <a href="$to$" class="tc-tiddlylink-external" target="_blank"><<.def "$_$">></a>
+\define .flink(to) <$macrocall $name=".link" _=<<.field {{$to$!!caption}}>> to="$to$"/>
+\define .mlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.mtitle "$_$">>/>
+\define .mlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
 \define .olink(_) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$_$">>/>
 \define .olink2(_,to) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$to$">>/>
-\define .wlink(to) <$macrocall $name=".link" _="<<.wid {{$to$!!caption}}>>" to="$to$"/>
+\define .vlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.vtitle "$_$">>/>
+\define .vlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
+\define .wlink(to) <$macrocall $name=".link" _=<<.wid {{$to$!!caption}}>> to="$to$"/>
+\define .wlink2(_,to) <$macrocall $name=".link" _="$_$" to="$to$"/>
 
 \define .key(_) <span class="doc-key">$_$</span>
-\define .combokey(_) <$macrocall $name=".if" cond="$_$" then="<<.key '$_$'>>"/>
+\define .combokey(_) <$macrocall $name=".if" cond="$_$" then=<<.key '$_$'>>/>
 \define .keycombo(1,2,3,4) <<.combokey "$1$">><<.if "$2$" +>><<.combokey "$2$">><<.if "$3$" +>><<.combokey "$3$">><<.if "$4$" +>><<.combokey "$4$">>
 
 \define .tab(_) <span class="doc-tab">{{$_$!!caption}}</span>
@@ -51,3 +63,44 @@ tags: $:/tags/Macro
 \define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span>
 
 \define .state-prefix() $:/state/editions/tw5.com/
+
+\define .lorem()
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+\end
+
+\define .toc-lorem()
+This is an example tiddler. See [[Table-of-Contents Macros (Examples)]].
+
+<<.lorem>>
+\end
+
+\define .example(n,eg,egvar:NO-SUCH-VAR)
+<div class="doc-example">
+<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
+	<$codeblock code="""$eg$"""/>
+</$reveal>
+<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
+	<!-- allow an example to contain """ -->
+	<$codeblock code=<<$egvar$>>/>
+</$reveal>
+<$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix[$n$]]" variable=".state">
+<$reveal state=<<.state>> type="nomatch" text="show">
+	<dl>
+	<dd><$button set=<<.state>> setTo="show">Try it</$button></dd>
+	</dl>
+</$reveal>
+<$reveal state=<<.state>> type="match" text="show">
+	<dl>
+	<dd><$button set=<<.state>> setTo="">Hide</$button></dd>
+	</dl>
+	<blockquote class="doc-example-result">
+	<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
+		$eg$
+	</$reveal>
+	<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
+		<<$egvar$>>
+	</$reveal>
+	</blockquote>
+</$reveal>
+</$list>
+\end
diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid
index ad9481b35..682e574c5 100644
--- a/editions/tw5.com/tiddlers/system/doc-styles.tid
+++ b/editions/tw5.com/tiddlers/system/doc-styles.tid
@@ -1,5 +1,5 @@
 created: 20150117152612000
-modified: 20150203183335000
+modified: 20150221141207000
 title: $:/editions/tw5.com/doc-styles
 tags: $:/tags/Stylesheet
 
@@ -41,7 +41,8 @@ tags: $:/tags/Stylesheet
 .doc-operator,
 .doc-var,
 .doc-widget,
-.doc-attr {
+.doc-attr,
+.doc-param {
 	background-color: <<color background>>;
 	border: none;
 	color: <<color very-muted-foreground>>;
@@ -108,6 +109,24 @@ td svg {
 	padding-bottom: 0;
 	margin-top: 0.2em;
 }
+.doc-example pre:first-child {
+	margin-top: 0;
+}
+.doc-example-result {
+	border-left: 5px solid <<colour blockquote-bar>>;
+	border-right: 5px solid <<colour blockquote-bar>>;
+	margin-left: 0;
+	margin-right: 0;
+	padding: 0 10px;
+}
+.doc-example-result ul {
+	margin-left: 0;
+	padding-left: 10px;
+}
+.doc-example-result ol {
+	margin-left: 0;
+	padding-left: 20px;
+}
 
 .doc-table th, .doc-table tr {
 	vertical-align: top;
diff --git a/editions/tw5.com/tiddlers/system/operator-macros.tid b/editions/tw5.com/tiddlers/system/operator-macros.tid
index 01ccb596f..66084267e 100644
--- a/editions/tw5.com/tiddlers/system/operator-macros.tid
+++ b/editions/tw5.com/tiddlers/system/operator-macros.tid
@@ -1,28 +1,32 @@
 created: 20150117152607000
-modified: 20150203190441000
+modified: 20150221151136000
 title: $:/editions/tw5.com/operator-macros
 tags: $:/tags/Macro
 
 \define .operator-examples(op,text:"Examples") <$link to="$op$ Operator (Examples)">$text$</$link>
+\define .variable-examples(v,text:"Examples") <$link to="$v$ Variable (Examples)">$text$</$link>
+\define .macro-examples(m,text:"Examples") <$link to="$m$ Macro (Examples)">$text$</$link>
 
 \define .operator-example(n,eg,ie)
 <div class="doc-example">
 `$eg$`
 <$macrocall $name=".if" cond="""$ie$""" then="""<dd>&rarr; $ie$</dd>"""/>
 <$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix[$n$]]" variable=".state">
-  <$reveal state=<<.state>> type="nomatch" text="show">
-  <dl>
-    <dd><$button set=<<.state>> setTo="show">Try it</$button></dd>
-  </dl>
-  </$reveal>
-  <$reveal state=<<.state>> type="match" text="show">
-    <dl>
-      <dd><$button set=<<.state>> setTo="">Hide</$button></dd>
-    </dl>
-    <ul><$list filter="$eg$" emptyMessage="(empty)">
-      <li><$link><$view field="title"/></$link></li>
-    </$list></ul>
-  </$reveal>
+<$reveal state=<<.state>> type="nomatch" text="show">
+	<dl>
+	<dd><$button set=<<.state>> setTo="show">Try it</$button></dd>
+	</dl>
+</$reveal>
+<$reveal state=<<.state>> type="match" text="show">
+	<dl>
+	<dd><$button set=<<.state>> setTo="">Hide</$button></dd>
+	</dl>
+	<blockquote class="doc-example-result">
+	<ul><$list filter="$eg$" emptyMessage="(empty)">
+	<li><$link><$view field="title"/></$link></li>
+	</$list></ul>
+	</blockquote>
+</$reveal>
 </$list>
 \end
 
diff --git a/editions/tw5.com/tiddlers/variables/CoreVariables.tid b/editions/tw5.com/tiddlers/variables/CoreVariables.tid
new file mode 100644
index 000000000..ce052e97b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/variables/CoreVariables.tid
@@ -0,0 +1,8 @@
+created: 20150220161908000
+modified: 20150221222104000
+title: Core Variables
+type: text/vnd.tiddlywiki
+
+The following [[variables|Variables]] are built into ~TiddlyWiki's core:
+
+<<list-links "[tag[Core Variables]]">>
diff --git a/editions/tw5.com/tiddlers/variables/Variables.tid b/editions/tw5.com/tiddlers/variables/Variables.tid
index 7c08a273b..cd1e62a5f 100644
--- a/editions/tw5.com/tiddlers/variables/Variables.tid
+++ b/editions/tw5.com/tiddlers/variables/Variables.tid
@@ -1,13 +1,23 @@
 created: 20141002133113496
-modified: 20150107121000000
-tags: Reference
+modified: 20150221215644000
+tags: Concepts Reference
 title: Variables
 type: text/vnd.tiddlywiki
 
-[[Variables]] are an essential component of dynamic WikiText, as are [[Widgets]] and [[Macros]]. In fact, a variable is a shorthand of a macro.
+A <<.def variable>> is a snippet of text that can be accessed by name within a particular branch of the [[widget tree|Widgets]]. The snippet is known as the variable's <<.def value>>.
 
-You can define custom [[Variables in WikiText]] or use one of the standard variables...
+A new variable is defined using a <<.wlink SetWidget>> widget, and is then available to any of the children of that widget, including transcluded content. A <<.wid set>> widget can reuse an existing name, thus binding a different snippet to that name for the duration of the widget's children.
 
-<<list-links "[tag[Variables]]">>
+The <<.wlink ListWidget>> widget also sets a particular variable (<<.var currentTiddler>> by default) to each listed title in turn.
 
-The [[<<dumpvariables>>|DumpVariablesMacro]] macro lists all variables defined in the current scope, allowing you to see and edit their values.
\ No newline at end of file
+For an overview of how to use variables, see [[Variables in WikiText]].
+
+Despite the term <<.word variable>>, each snippet is a constant string. The apparent variability is actually the result of the presence of multiple variables with the same name in different parts of the widget tree.
+
+[[Macros]] are a special form of variable whose value can contain placeholders that get filled in with parameters whenever the macro is used.
+
+By themselves, the snippets are <<.em not>> parsed as WikiText. However, a variable reference will transclude a snippet into a context where ~WikiText parsing <<.em may>> be occurring. Within a snippet, the only markup detected is `$name$` for a macro parameter transclusion and `$(name)$` for a variable transclusion.
+
+The <<.mlink dumpvariables>> macro lists all variables (including macros) that are available at that position in the widget tree.
+
+~TiddlyWiki's core has [[several variables|Core Variables]] built in.
diff --git a/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid b/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid
index dd1a61492..66e484986 100644
--- a/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid	
+++ b/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid	
@@ -1,41 +1,14 @@
 caption: currentTiddler
 created: 20141001232824187
-modified: 20150107121000000
-tags: Variables
-title: WidgetVariable: currentTiddler
+modified: 20150221152029000
+tags: Variables [[Core Variables]]
+title: currentTiddler Variable
 type: text/vnd.tiddlywiki
 
-The ''currentTiddler'' [[variable|Variables]] contains the title of the current tiddler. 
+The <<.def currentTiddler>> [[variable|Variables]] contains the title of the [[current tiddler|Current Tiddler]].
 
-!! Usage
+Several aspects of WikiText use this tiddler as their context. As a result, within a <<.wlink ListWidget>> widget or a [[template tiddler|TemplateTiddlers]], there is often no need to explicitly specify a tiddler title.
 
-Various [[Widgets]] and [[Macros]] are by default applied with respect to the tiddler referenced via ''currentTiddler''. Within the [[ListWidget]] or TemplateTiddlers you are thus often not required to specify the tiddler title.
+Compare <<.vlink storyTiddler>>.
 
-The following two examples are thus equivalent...
-
-* `<$view field=title/>`
-* `<$view field=title tiddler=<<currentTiddler>>/>`
-
-;TranscludeWidget
-: when [[transcluding|Transclusion]] a tiddler, ''currentTiddler'' is set to the tiddler being transcluded,
-: e.g. when using the [[WikiText shorthand|Transclusion in WikiText]]: `{{||TemplateTiddlerTitle}}`
-; ListWidget
-: overrides the ''currentTiddler'' variable with the currently iterated list-item,
-: unless a custom `variable` attribute is specified
-; TiddlerWidget
-: sets the ''currentTiddler'' variable for its inner scope
-
-!! Example
-
-```
-<$view tiddler=<<currentTiddler>> field=title/>
-```
-
-<<<
-<$view tiddler=<<currentTiddler>> field=title/>
-<<<
-
-!! Other Standard Variables
-
-* [[WidgetVariable: storyTiddler]]
-* [[WidgetVariable: transclusion]]
\ No newline at end of file
+<<.variable-examples "currentTiddler">>
diff --git a/editions/tw5.com/tiddlers/variables/WidgetVariable_ storyTiddler.tid b/editions/tw5.com/tiddlers/variables/WidgetVariable_ storyTiddler.tid
index 807ce8cf6..5c1697007 100644
--- a/editions/tw5.com/tiddlers/variables/WidgetVariable_ storyTiddler.tid	
+++ b/editions/tw5.com/tiddlers/variables/WidgetVariable_ storyTiddler.tid	
@@ -1,23 +1,14 @@
 caption: storyTiddler
 created: 20141001232753952
-modified: 20150107121000000
-tags: Variables
-title: WidgetVariable: storyTiddler
+modified: 20150221222522000
+tags: Variables [[Core Variables]]
+title: storyTiddler Variable
 type: text/vnd.tiddlywiki
 
-The ''storyTiddler'' [[variable|Variables]] is set by the [[default view-template|$:/core/ui/ViewTemplate]] to the title of the tiddler in the story river. It is therefore undefined in elements like the ''sidebar''.
+When a tiddler is viewed or edited, then within its branch of the [[widget tree|Widgets]], the <<.def storyTiddler>> [[variable|Variables]] contains the title of that tiddler.
 
-!! Example
+The default [[view template|$:/core/ui/ViewTemplate]] and [[edit template|$:/core/ui/EditTemplate]] initialise <<.var storyTiddler>> to the value of the <<.vlink currentTiddler>> variable. This in turn will have been set by a <<.wlink ListWidget>> widget in [[the relevant part of the page template|$:/core/ui/PageTemplate/story]].
 
-```
-<$view tiddler=<<storyTiddler>> field=title/>
-```
+<<.var storyTiddler>> is undefined outside the story river, such as in the sidebar.
 
-<<<
-<$view tiddler=<<storyTiddler>> field=title/>
-<<<
-
-!! Other Standard Variables
-
-* [[WidgetVariable: currentTiddler]]
-* [[WidgetVariable: transclusion]]
\ No newline at end of file
+<<.variable-examples "storyTiddler">>
diff --git a/editions/tw5.com/tiddlers/variables/WidgetVariable_ transclusion.tid b/editions/tw5.com/tiddlers/variables/WidgetVariable_ transclusion.tid
index 816581980..589e845fb 100644
--- a/editions/tw5.com/tiddlers/variables/WidgetVariable_ transclusion.tid	
+++ b/editions/tw5.com/tiddlers/variables/WidgetVariable_ transclusion.tid	
@@ -1,46 +1,36 @@
 caption: transclusion
 created: 20141002004621385
-modified: 20150107121000000
-tags: Variables
-title: WidgetVariable: transclusion
+modified: 20150221225622000
+tags: Variables [[Core Variables]]
+title: transclusion Variable
 type: text/vnd.tiddlywiki
 
-The ''transclusion'' [[variable|Variables]] is automatically set by the TranscludeWidget to contain a string identifying the position of the current node within the widget tree.
+The <<.def transclusion>> [[variable|Variables]] is set by the <<.wlink TranscludeWidget>> widget to a string that identifies the position of that widget within the [[widget tree|Widgets]].
 
-With the ''transclusion'' variable, the QualifyMacro identifies the stack of transcluded tiddlers.
+~TiddlyWiki's core uses it to detect recursive [[transclusion|Transclusion]]. It is also used to implement the <<.mlink qualify>> macro.
 
-In the sidebar, the ''transclusion'' variable is set to:<br>
-`{|$:/core/ui/PageTemplate/sidebar|||}`
+The string has the following syntax:
 
-When the tiddler "HelloThere" is displayed in the story river ''transclusion'' is set to:<br> `{HelloThere|HelloThere|||}`
+<$railroad text="""
+"{" a "|" b "|" c "|" d "|" e "|" "}"
+"""/>
 
-Each nested level of transclusion appends another curly bracketed list of symbols.
+<ol style="list-style-type: lower-alpha;">
+<li>the title of the [[current tiddler|Current Tiddler]]</li>
+<li>the title of the tiddler being transcluded</li>
+<li>the name of the field being transcluded</li>
+<li>the name of the property name or index being transcluded</li>
+<li>the name of the subtiddler being transcluded from a plugin</li>
+</ol>
 
-!! Example
+Many of the five items are often blank.
 
-''identifying if we're in the sidebar or not''
+In the sidebar, the value of <<.var transclusion>> is:
 
-```
-\define mymacro()
-We are
-<$list
-filter="[<transclusion>prefix[{|$:/core/ui/PageTemplate/sidebar|||}]]"
-emptyMessage="in the story river.">
-in the sidebar.
-</$list>
-\end
+> `{|$:/core/ui/PageTemplate/sidebar|||}`
 
-<<mymacro>>
-```
+When the tiddler <<.tid HelloThere>> is displayed in the story river, <<.var transclusion>> is set to:
 
-Result in a story tiddler:
+> `{HelloThere|HelloThere|||}`
 
-<<<
-We are in the story river.
-<<<
-
-Result in the sidebar:
-
-<<<
-We are in the sidebar.
-<<<
\ No newline at end of file
+<<.variable-examples "transclusion">>
diff --git a/editions/tw5.com/tiddlers/variables/examples/currentTiddler.tid b/editions/tw5.com/tiddlers/variables/examples/currentTiddler.tid
new file mode 100644
index 000000000..71ede7cea
--- /dev/null
+++ b/editions/tw5.com/tiddlers/variables/examples/currentTiddler.tid
@@ -0,0 +1,19 @@
+created: 20150221140726000
+modified: 20150221141342000
+tags: [[currentTiddler Variable]] [[Variable Examples]]
+title: currentTiddler Variable (Examples)
+type: text/vnd.tiddlywiki
+
+The following two examples have the same meaning:
+
+<$macrocall $name=".example" n="1" eg="""<$view field=title/>"""/>
+<$macrocall $name=".example" n="2" eg="""<$view tiddler=<<currentTiddler>> field=title/>"""/>
+
+This next example shows how the <<.wlink ListWidget>> widget changes the current tiddler:
+
+<$macrocall $name=".example" n="3"
+eg="""<ol>
+<$list filter="[prefix[J]]">
+<li><<currentTiddler>></li>
+</$list>
+</ol>"""/>
diff --git a/editions/tw5.com/tiddlers/variables/examples/storyTiddler.tid b/editions/tw5.com/tiddlers/variables/examples/storyTiddler.tid
new file mode 100644
index 000000000..6659d5257
--- /dev/null
+++ b/editions/tw5.com/tiddlers/variables/examples/storyTiddler.tid
@@ -0,0 +1,12 @@
+created: 20150221141258000
+modified: 20150221141431000
+tags: [[storyTiddler Variable]] [[Variable Examples]]
+title: storyTiddler Variable (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1"
+eg="""<ol>
+<$list filter="[prefix[J]]">
+<li><<currentTiddler>>, <<storyTiddler>></li>
+</$list>
+</ol>"""/>
diff --git a/editions/tw5.com/tiddlers/variables/examples/transclusion.tid b/editions/tw5.com/tiddlers/variables/examples/transclusion.tid
new file mode 100644
index 000000000..2ea205786
--- /dev/null
+++ b/editions/tw5.com/tiddlers/variables/examples/transclusion.tid
@@ -0,0 +1,17 @@
+created: 20150221141507000
+modified: 20150221144853000
+tags: [[transclusion Variable]] [[Variable Examples]]
+title: transclusion Variable (Examples)
+type: text/vnd.tiddlywiki
+
+This example shows how to distinguish between the sidebar and other environments:
+
+<$macrocall $name=".example" n="3"
+eg="""We are
+<$list
+filter="[<transclusion>prefix[{|$:/core/ui/PageTemplate/sidebar|||}]]"
+emptyMessage="in the story river.">
+in the sidebar.
+</$list>"""/>
+
+In the sidebar, this would show `We are in the sidebar` instead.
diff --git a/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid
index d0b1a8f05..ccddfa64c 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid
@@ -1,6 +1,6 @@
 caption: action-deletefield
 created: 20141025120850184
-modified: 20141025120850184
+modified: 20150220162042000
 tags: Widgets ActionWidgets
 title: ActionDeleteFieldWidget
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ The ''action-deletefield'' widget is an [[action widget|ActionWidgets]] that del
 The ''action-deletefield'' widget is invisible. Any content within it is ignored.
 
 |!Attribute |!Description |
-|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[WidgetVariable: currentTiddler]] |
+|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]] |
 |$field |Optional name of a field to delete |
 |//{any attributes not starting with $}// |Each attribute name specifies a field to be deleted. The attribute value is ignored and need not be specified |
 
diff --git a/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid
index 5160502ff..1c1f1ce53 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid
@@ -1,6 +1,6 @@
 caption: action-navigate
 created: 20141008163514491
-modified: 20141008164303144
+modified: 20150220162057000
 tags: Widgets ActionWidgets
 title: ActionNavigateWidget
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ The ''action-navigate'' widget is an [[action widget|ActionWidgets]] that sends
 The ''action-navigate'' widget is invisible. Any content within it is ignored.
 
 |!Attribute |!Description |
-|$to |The title of the target tiddler for the navigation (if not provided defaults to the [[WidgetVariable: currentTiddler]] |
+|$to |The title of the target tiddler for the navigation (if not provided defaults to the [[current tiddler|Current Tiddler]] |
 |$scroll |Optional parameter determining whether the navigation will also cause a scroll to the target tiddler (see below) |
 
 !! Scroll handling
diff --git a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid
index 7f387b8f7..91b267fcc 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid
@@ -1,6 +1,6 @@
 caption: action-setfield
 created: 20141025120850184
-modified: 20141106173455527
+modified: 20150220162114000
 tags: Widgets ActionWidgets
 title: ActionSetFieldWidget
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ The ''action-setfield'' widget is an [[action widget|ActionWidgets]] that assign
 The ''action-setfield'' widget is invisible. Any content within it is ignored.
 
 |!Attribute |!Description |
-|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[WidgetVariable: currentTiddler]] |
+|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]] |
 |$field |Optional name of a field to be assigned the $value attribute |
 |$index |Optional index of a property in a [[data tiddler|DataTiddlers]] to be assigned the $value attribute|
 |$value |The value to be assigned to the field or index identified by the $field or $index attribute. If neither is specified then the value is assigned to the text field |
diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
index d521ea3e5..49a7f423d 100644
--- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
@@ -1,6 +1,6 @@
 title: CheckboxWidget
 created: 201310241419
-modified: 201502050050
+modified: 20150220161154000
 tags: Widgets
 caption: checkbox
 
@@ -16,7 +16,7 @@ The checkbox widget displays an HTML `<input type="checkbox">` element that is d
 The content of the `<$checkbox>` widget is displayed within an HTML `<label>` element immediately after the checkbox itself. This means that clicking on the content will toggle the checkbox.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
+|tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) |
 |tag |The name of the tag to which the checkbox should be bound |
 |field |The name of the field to which the checkbox should be bound |
 |checked |The value of the field corresponding to the checkbox being checked |
diff --git a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
index 69080e395..84c62eb11 100644
--- a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
@@ -1,5 +1,5 @@
 created: 20131024141900000
-modified: 20140221140151790
+modified: 20150220162127000
 tags: Widgets
 title: EditBitmapWidget
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ The edit bitmap widget provides a user interface in the browser for editing bitm
 The content of the `<$edit-bitmap>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
+|tiddler |The tiddler to edit (defaults to the [[current tiddler|Current Tiddler]]) |
 
 ! Configuration
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index 4b1393814..c3e69853a 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -1,6 +1,6 @@
 title: EditTextWidget
 created: 201310241419
-modified: 20141025085449609
+modified: 20150220162131000
 tags: Widgets
 caption: edit-text
 
@@ -15,7 +15,7 @@ By default, the edit text widget generates a `<textarea>` as the HTML editing el
 The content of the `<$edit-text>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
+|tiddler |The tiddler to edit (defaults to the [[current tiddler|Current Tiddler]]) |
 |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute |
 |index |The index to edit |
 |default |The default text to be provided when the target tiddler doesn't exist |
diff --git a/editions/tw5.com/tiddlers/widgets/EditWidget.tid b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
index fa7422371..22b5c8836 100644
--- a/editions/tw5.com/tiddlers/widgets/EditWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
@@ -1,6 +1,6 @@
 title: EditWidget
 created: 201310241419
-modified: 201310300837
+modified: 20150220161220000
 tags: Widgets
 caption: edit
 
@@ -13,7 +13,7 @@ The edit widget provides a general purpose interface for editing a tiddler. It d
 The content of the `<$edit>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
+|tiddler |The tiddler to edit (defaults to the [[current tiddler|Current Tiddler]]) |
 |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute |
 |index |The index to edit |
 |class |A CSS class to be added the generated editing widget |
diff --git a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
index a4933af80..860fbf4d9 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
@@ -1,5 +1,5 @@
 created: 20131024141900000
-modified: 20140125140636123
+modified: 20150220161229000
 tags: Widgets
 title: FieldManglerWidget
 type: text/vnd.tiddlywiki
@@ -20,4 +20,4 @@ The field mangler widget manipulates the fields and tags of a tiddler. It does s
 The field mangler widget displays any contained content, and responds to [[Messages]] dispatched within it.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
+|tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) |
diff --git a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
index 9e81ba094..b96c72aef 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
@@ -1,6 +1,6 @@
 title: FieldsWidget
 created: 201310241419
-modified: 201310300837
+modified: 20150220161240000
 tags: Widgets
 caption: fields
 
@@ -22,7 +22,7 @@ The provided template is rendered with the following special substitutions:
 The content of the `<$fields>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the CurrentTiddler) |
+|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the [[current tiddler|Current Tiddler]]) |
 |template |Text of the template (see above) |
 |exclude |Lists of fields to be excluded (defaults to "text") |
 |stripTitlePrefix |If set to "yes" then curly bracketed prefixes are removed from titles (for example `{prefix}HelloThere` converts to `HelloThere`) |
diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index db885e11e..4406a9da2 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,6 +1,6 @@
 title: LinkWidget
 created: 201310241419
-modified: 201408280837
+modified: 20150220161251000
 tags: Widgets
 caption: link
 
@@ -9,7 +9,7 @@ The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to ge
 ! Content and Attributes
 
 |!Attribute |!Description |
-|to |The title of the target tiddler for the link (defaults to the CurrentTiddler) |
+|to |The title of the target tiddler for the link (defaults to the [[current tiddler|Current Tiddler]]) |
 |aria-label |Optional [[Accessibility]] label |
 |tooltip |Optional tooltip WikiText |
 
@@ -89,4 +89,3 @@ Provides default text for the link tooltip:
 \define tv-wikilink-tooltip() This is a link to {{!!title}}
 <$link to="HelloThere"/>
 ```
-
diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
index a0aa5f496..dd6b61b89 100644
--- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
@@ -1,5 +1,5 @@
 created: 20131212195353929
-modified: 20131212195656344
+modified: 20150220161302000
 tags: Widgets
 title: RadioWidget
 type: text/vnd.tiddlywiki
@@ -14,7 +14,7 @@ The radio widget displays an HTML `<input type="radio">`  that reflects whether
 The content of the `<$radio>` widget is displayed within an HTML `<label>` element also containing the radio button. This means that clicking on the content will have the same effect as clicking on the button itself.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
+|tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) |
 |field |The name of the field to which the radio button will be bound |
 |value |The value for the tiddler field |
 |class |CSS classes to be assigned to the label around the radio button |
diff --git a/editions/tw5.com/tiddlers/widgets/SetWidget.tid b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
index 9a1737aea..2be6ff7fd 100644
--- a/editions/tw5.com/tiddlers/widgets/SetWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
@@ -1,12 +1,12 @@
 title: SetWidget
 created: 201311151827
-modified: 20141113212520422
+modified: 20150220162217000
 tags: Widgets
 caption: set
 
 ! Introduction
 
-The set variable widget assigns a value to a specified [[variable|WidgetVariables]]. The new value of the variable is availale to the content within the set variable widget.
+The set variable widget assigns a value to a specified [[variable|Variables]]. The new value of the variable is availale to the content within the set variable widget.
 
 ! Content and Attributes
 
diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
index 19a9c94e8..115072aa0 100644
--- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
@@ -1,5 +1,5 @@
 created: 20130824154300000
-modified: 20150102155658750
+modified: 20150220162134000
 tags: Widgets
 title: TiddlerWidget
 type: text/vnd.tiddlywiki
@@ -7,12 +7,12 @@ caption: tiddler
 
 ! Introduction
 
-The TiddlerWidget sets the CurrentTiddler that applies for processing its content.
+The TiddlerWidget sets the [[current tiddler|Current Tiddler]] that applies for processing its content.
 
 ! Content and Attributes
 
 |!Attribute |!Description |
-|tiddler |The title of the tiddler to become the new CurrentTiddler |
+|tiddler |The title of the tiddler to become the new [[current tiddler|Current Tiddler]] |
 |class |CSS classes to be added to the generated elements |
 
 ! CSS Class Variables
diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
index 69838b6c6..db32db4c1 100644
--- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
@@ -1,6 +1,6 @@
 title: ViewWidget
 created: 201310241419
-modified: 20141022131222150
+modified: 20150220161335000
 tags: Widgets
 caption: view
 
@@ -13,7 +13,7 @@ The view widget displays the contents of a tiddler field in a specified format.
 The content of the `<$view>` widget is displayed if the field or property is missing or empty.
 
 |!Attribute |!Description |
-|tiddler |The title of the tiddler (defaults to the CurrentTiddler) |
+|tiddler |The title of the tiddler (defaults to the [[current tiddler|Current Tiddler]]) |
 |field |The name of the field to view (defaults to "text") |
 |index |The name of the index to view |
 |format |The format for displaying the field (see below) |
diff --git a/editions/tw5.com/tiddlers/widgets/Widgets.tid b/editions/tw5.com/tiddlers/widgets/Widgets.tid
index a45f01ae8..5b682766f 100644
--- a/editions/tw5.com/tiddlers/widgets/Widgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/Widgets.tid
@@ -1,11 +1,19 @@
 created: 20140908130500000
-modified: 20140910215453457
-tags: Reference
+modified: 20150219182745000
+tags: Concepts Reference
 title: Widgets
 type: text/vnd.tiddlywiki
 
-Widgets add dynamic functionality to WikiText.
+~TiddlyWiki's display is driven by an underlying collection of <<.def widgets>>. These are organised into a tree structure: each widget has a parent widget and zero or more child widgets.
 
-The following widgets are built into the core:
+~TiddlyWiki generates this <<.def "widget tree">> by parsing the WikiText of tiddlers. Each component of the WikiText syntax, including even the trivial case of ordinary text, generates a corresponding widget. The widget tree is an intermediate representation that is subsequently rendered into the actual display.
+
+Widgets are analogous to elements in an HTML document. Indeed, HTML tags in WikiText generate dedicated <<.def "element widgets">>.
+
+Each class of widget contributes a specific ability to the overall functionality, such as the ability to <<.wlink2 "display an image" ImageWidget>> or <<.wlink2 "a button" ButtonWidget>>, to <<.wlink2 "call a macro" MacroCallWidget>> or <<.wlink2 "transclude text from elsewhere" TranscludeWidget>>, or to [[mark a piece of text as a heading|HTML in WikiText]].
+
+The more specialised widgets use a general-purpose [[widget syntax|Widgets in WikiText]] as their only possible WikiText representation.
+
+The following classes of widget are built into the core:
 
 <<list-links "[tag[Widgets]]">>
diff --git a/editions/tw5.com/tiddlers/wikitext/Confusion between Transclusion and Substitution.tid b/editions/tw5.com/tiddlers/wikitext/Confusion between Transclusion and Substitution.tid
index 8814301ec..e51a766fc 100644
--- a/editions/tw5.com/tiddlers/wikitext/Confusion between Transclusion and Substitution.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Confusion between Transclusion and Substitution.tid	
@@ -1,7 +1,6 @@
-caption: Confusion between Transclusion and Substitution
+title: Transclusion and Substitution
 created: 20141018090608643
-modified: 20141018181414011
-tags: WikiText
+modified: 20150220190346000
 type: text/vnd.tiddlywiki
 
 The power of WikiText comes from the ability to use the content of one tiddler inside another one. This ability takes several different forms that can easily be confused.
diff --git a/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid
new file mode 100644
index 000000000..ecccc2e4c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid	
@@ -0,0 +1,22 @@
+created: 20150220182252000
+modified: 20150221221340000
+tags: WikiText
+title: Macro Calls in WikiText
+type: text/vnd.tiddlywiki
+caption: Macro Calls
+
+To call a [[macro|Macros]], place `<<`double angle brackets`>>` around the name and any parameter values.
+
+By default, parameters are listed in the same order as in the macro's definition. A parameter can be labelled with its name, either for clarity or to modify the order.
+
+If no value is specified for a parameter, the default value given for that parameter in the macro's definition is used instead. (If no default value was defined, the parameter is simply blank.)
+
+Each parameter value can be enclosed in `'`single quotes`'`, `"`double quotes`"`, `"""`triple double quotes`"""` or `[[`double square brackets`]]`. Triple double quotes allow a value to contain almost anything. If a value contains no spaces or single or double quotes, it requires no delimiters.
+
+A more formal [[presentation|Macro Call Syntax]] of this syntax is also available.
+
+The syntax is actually a shorthand for a <<.wlink MacroCallWidget>> widget. The widget itself offers greater flexibility, including the ability to [[transclude|Transclusion]] parameter values or generate them via additional macros.
+
+As macros are simply parameterised [[variables|Variables]], a variable's value can be inserted using the same techniques.
+
+[[Examples|Macro Calls in WikiText (Examples)]]
diff --git a/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid
new file mode 100644
index 000000000..2565c2897
--- /dev/null
+++ b/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid	
@@ -0,0 +1,46 @@
+created: 20150220181617000
+modified: 20150221221642000
+tags: WikiText
+title: Macro Definitions in WikiText
+type: text/vnd.tiddlywiki
+caption: Macro Definitions
+
+A [[macro|Macros]] is defined using a `\define` [[pragma|Pragma]]. Like any pragma, this can only appear at the start of a tiddler.
+
+The first line of the definition specifies the macro name and any parameters. Each parameter has a name, and optionally a default value that is used if no value is supplied on a particular call to the macro. The lines that follow contain the macro's text (i.e. the snippet represented by the macro name), until `\end` appears on a line by itself:
+
+<$codeblock code={{$:/editions/tw5.com/macro-examples/say-hi}}/>
+
+Alternatively, the entire definition can be presented on a single line, without an `\end` marker:
+
+```
+\define sayhi(name:"Bugs Bunny") Hi, I'm $name$.
+```
+
+A more formal [[presentation|Macro Definition Syntax]] of this syntax is also available.
+
+!! Placeholders
+
+The snippet can contain placeholders for parameters. These consist of a parameter name between dollar signs, like `$this$`.
+
+It can also contain placeholders for [[variables|Variables]]. These consist of a variable name (or macro name) between dollar signs and round brackets, like `$(this)$`.
+
+The actual value of the parameter or variable is substituted for the placeholder whenever the macro is called:
+
+<$importvariables filter="$:/editions/tw5.com/macro-examples/say-hi-using-variables">
+<$codeblock code={{$:/editions/tw5.com/macro-examples/say-hi-using-variables}}/>
+<$macrocall $name=".example" n="1"
+eg="""<$set name="address" value="Rabbit Hole Hill">
+<<say-hi-using-variables>>
+</$set>"""/>
+</$importvariables>
+
+!! Scope
+
+Macros are available to the tiddler that defines them, plus any tiddlers that it transcludes.
+
+To make a macro available to all tiddlers, define it in a tiddler that has the tag <<.tag $:/tags/Macro>>.
+
+It is also possible to write a macro as a [[JavaScript module|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]]. ~JavaScript macros are available to all tiddlers, and offer the maximum flexibility.
+
+A tiddler can manually import macro definitions from a [[selection|Title Selection]] of other tiddlers by using the <<.wlink ImportVariablesWidget>> widget.
diff --git a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid
index eeb862985..a738d5389 100644
--- a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid	
@@ -1,119 +1,11 @@
 created: 20131205160746466
-modified: 20140619111725471
+modified: 20150221094003000
 tags: WikiText
 title: Macros in WikiText
 type: text/vnd.tiddlywiki
 caption: Macros
 
-! Defining Macros
+The use of [[macros|Macros]] in WikiText has two distinct aspects:
 
-Macros are snippets of text that can be inserted with a concise shortcut.
-
-Multi-line macros are defined like this:
-
-```
-\define mysamplemacro(name:"Bugs Bunny",address:"Rabbit Hole Hill")
-Hi, I'm $name$ and I live in $address$
-\end
-```
-
-!! Parameter Substitution
-
-The first line of the definition specifies the macro name and any parameters. Parameters are named and can optionally have default values that are used if the parameter isn't specified at the time of calling. The body of the macro definition follows, terminated with `\end` on a line by itself.
-
-The text of the macro can reference parameters using the `$name$` syntax. The value of the parameter is substituted at the time the macro is invoked.
-
-!! Variable Substitution
-
-The values of named variables can also be substituted into the text of a macro using the syntax `$(variable)$`. For example:
-
-```
-\define mysamplemacro2()
-Hi, I'm $(name)$ and I live in $(address)$
-\end
-\define name() Bugs Bunny
-
-<$set name="address" value="Rabbit Hole Hill">
-<<mysamplemacro2>>
-</$set>
-```
-
-The result is: `Hi, I'm Bugs Bunny and I live in Rabbit Hole Hill`.
-
-!! Single Line macros
-
-Single-line macros can omit the `\end` marker like this:
-
-```
-\define mysamplemacro3(name:"Bugs Bunny") Hi, I'm $name$
-```
-
-!! Macro Scope
-
-Macro definitions must be placed at the top of a tiddler. Macros are available to the tiddler that defines them, plus any tiddlers that it transcludes.
-
-Global macros can be defined in any tiddler with the tag [[$:/tags/Macro]]. They are then available within all tiddlers.
-
-Macros can be imported from other tiddlers with the ImportVariablesWidget.
-
-[[JavaScript Macros|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] can also be used for more flexibility.
-
-! Using Macros
-
-In their simplest form, macros are used like this:
-
-```
-<<mysamplemacro>>
-<<mysamplemacro "Donald Duck">>
-<<mysamplemacro "Mickey Mouse" "Mouse House">>
-<<mysamplemacro name:"Minnie Mouse" address:"Mouse House">>
-```
-
-Resulting in:
-
-```
-Hi I'm Bugs Bunny and I live in Rabbit Hole Hill
-Hi I'm Donald Duck and I live in Rabbit Hole Hill
-Hi I'm Mickey Mouse and I live in Mouse House
-Hi I'm Minnie Mouse and I live in Mouse House
-
-```
-
-Note that parameter values that do not specify names are mapped in sequence to the parameters defined in the macro.
-
-!! Multiline Parameters
-
-Parameters can include line breaks. For example:
-
-```
-<<mysamplemacro "Mickey Mouse" "Mouse House,
-Mouse Lane,
-Rodentville,
-Ratland.">>
-```
-
-By using triple-double quotes you can specify parameter values that include single double quotes. For example:
-
-```
-<<mysamplemacro "Mickey Mouse" """Mouse House,
-"Mouse" Lane,
-Rodentville,
-Ratland.""">>
-```
-
-! Using Macros with the MacroCallWidget
-
-Macros can also be invoked with the MacroCallWidget
-
-```
-<<italicise "Text to be made into italics">>
-<<italicise text:"Text to be made into italics">>
-<$macrocall $name="italicise" text="Text to be made into italics"/>
-<$macrocall $name="italicise" text={{Title of tiddler containing text to be italicised}}/>
-<$macrocall $name="italicise" text=<<textMaker "Another macro to generate the text to be italicised">>/>
-```
-
-Also see:
-
-* [[Macros]]
-* [[MacroCallWidget]]
+* [[Defining macros|Macro Definitions in WikiText]]
+* [[Calling macros|Macro Calls in WikiText]]
diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid
index 8cf4acd7a..f468baf6c 100644
--- a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid	
@@ -1,6 +1,6 @@
 caption: Transclusion
 created: 20131205160146648
-modified: 20141230090901681
+modified: 20150220161347000
 tags: WikiText
 title: Transclusion in WikiText
 type: text/vnd.tiddlywiki
@@ -11,7 +11,7 @@ You can incorporate the content of one tiddler within another using the [[Transc
 
 * `{{MyTiddler}}` transcludes a single tiddler
 * `{{MyTiddler||TemplateTitle}}` displays the tiddler through a specified [[TemplateTiddler|TemplateTiddlers]]
-* `{{||TemplateTitle}}` displays the specified template tiddler without altering the CurrentTiddler
+* `{{||TemplateTitle}}` displays the specified template tiddler without altering the [[current tiddler|Current Tiddler]]
 
 !! Transcluding Text References
 
diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion with Templates.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion with Templates.tid
index daf599874..2e5706bd7 100644
--- a/editions/tw5.com/tiddlers/wikitext/Transclusion with Templates.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Transclusion with Templates.tid	
@@ -1,5 +1,5 @@
 created: 20141129210304238
-modified: 20141209142028738
+modified: 20150220161405000
 tags: [[Transclusion in WikiText]]
 title: Transclusion with Templates
 caption: With Templates
@@ -22,9 +22,9 @@ Hello, my title is A
 @@
 <<<
 
-The style is applied as expected, but the title is wrong: we want ``{{!!title}}`` to refer to the target tiddler B, and not the source tiddler A. 
+The style is applied as expected, but the title is wrong: we want ``{{!!title}}`` to refer to the target tiddler B, and not the source tiddler A.
 
-The solution is to use a //template//. In this case, the source tiddler A is called the [[TemplateTiddler|TemplateTiddlers]], and it is //applied// to tiddler B using the notation ``{{||A}}``. The difference is that any TextReference which does not refer explicitly to a specific tiddler is applied to the [[current tiddler|CurrentTiddler]], that is, the target tiddler. As a result, tiddler B now looks as expected:
+The solution is to use a //template//. In this case, the source tiddler A is called the [[TemplateTiddler|TemplateTiddlers]], and it is //applied// to tiddler B using the notation ``{{||A}}``. The difference is that any TextReference which does not refer explicitly to a specific tiddler is applied to the [[current tiddler|Current Tiddler]], that is, the target tiddler. As a result, tiddler B now looks as expected:
 
 <<<
 @@background-color:yellow;
@@ -36,7 +36,7 @@ Hello, my title is B
 
 Transcluding via a template is like applying a mask: assuming that the source tiddler contains generic references (like eye holes in a mask), these will be replaced with the target tiddlers values (like the eyes of the person who wears the mask).
 
-A template can be applied to any tiddler, not necessarily the current one. This is achieved using the full notation ``{{<target>||<template>}}``. The default ``<target>`` is the [[current tiddler|CurrentTiddler]] (this is what we used in the above example). 
+A template can be applied to any tiddler, not necessarily the current one. This is achieved using the full notation ``{{<target>||<template>}}``. The default ``<target>`` is the [[current tiddler|Current Tiddler]] (this is what we used in the above example).
 
 ! Examples
 
@@ -57,4 +57,4 @@ See also:
 * TextReference
 * TemplateTiddlers
 * TranscludeWidget
-* CurrentTiddler
+* [[Current Tiddler]]
diff --git a/editions/tw5.com/tiddlers/wikitext/Variables in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Variables in WikiText.tid
index 90dc422d3..d7cba1711 100644
--- a/editions/tw5.com/tiddlers/wikitext/Variables in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Variables in WikiText.tid	
@@ -1,79 +1,36 @@
 caption: Variables
 created: 20141002141231992
-modified: 20150117152625000
+modified: 20150221221850000
 tags: WikiText
 title: Variables in WikiText
 type: text/vnd.tiddlywiki
 
-\define tags() {{!!tags}}
+See also the [[introduction to the concept of variables|Variables]].
 
-[[Variables]] contain values. They are available within the scope of the [[widget|Widgets]] in which they are defined, as well as all child widgets in the widget tree.
+To transclude the value of a variable, use the [[macro call syntax|Macro Calls in WikiText]] with no parameters. You can also use a <<.wlink MacroCallWidget>> widget.
 
-!!Defining Variables
+A [[macro|Macros]] snippet can contain `$(name$)` as a [[placeholder|Macro Definitions in WikiText]] for which the value of the variable of that name will be substituted.
 
-Variables are defined by...
+A variable's value can be used as a [[filter parameter|Filter Parameter]], or as a [[widget attribute|Widgets in WikiText]]. The latter supports macro parameters.
 
-; [[Macros|Macros in WikiText]]
-: in fact, variables are macro shorthands (see example below)
-; SetWidget
-: sets a variable to a value
-; ListWidget
-: sets list-item and iterator variabes
-; TiddlyWiki
-: in the core and core templates
+!! Example: defining a variable
 
-!!Using Variables
+<$macrocall $name=".example" n="1"
+eg="""<$set name=animal value=zebra>
+<<animal>>
+</$set>"""/>
 
-Variables are used...
+!! Example: defining a macro
 
-; via shorthand
-:`<<variableName>>`
-; via variable substitution within [[macros|Macros]]
-:`$(variableName)$`
-; as parameters to [[filter steps|Filters]]
-: `[operator<variableName>]`
-; in [[widgets|Widgets]]
-: internally, or as widget attributes
-: `<$edit tiddler=<<currentTiddler>>/>`
+The `\define` pragma below [[defines a macro|Macros in WikiText]] called <<.var tags>>. The macro returns the value of the tiddler's <<.field tags>> field, and can be accessed from anywhere else in the same tiddler (or in any tiddler that [[imports|ImportVariablesWidget]] it).
 
-!! Examples
+<$importvariables filter="$:/editions/tw5.com/macro-examples/tags-of-current-tiddler">
+<$codeblock code={{$:/editions/tw5.com/macro-examples/tags-of-current-tiddler}}/>
+<$macrocall $name=".example" n="2" eg="""The tags are: <<tags-of-current-tiddler>>"""/>
+</$importvariables>
 
-''defining a variable via SetWidget''
+!! Example: using a variable as a filter parameter
 
-```
-<$set name=foo value=bar>
-<<foo>>
-</$set>
-```
+This example uses the <<.olink backlinks>> [[operator|Filter Operators]] to list all tiddlers that link to this one.
 
-<<<
-<$set name=foo value=bar>
-<<foo>>
-</$set>
-<<<
-
-''a variable is a macro''
-
-Below, the `\define` pragma at the beginning of a tiddler [[defines the macro|Macros in WikiText]] `<<tags>>`, valid in the scope of the CurrentTiddler, returning the value of the standard `tags` field.
-
-```
-\define tags() {{!!tags}}
-
-<<tags>>
-```
-
-<<<
-<<tags>>
-<<<
-
-''using a filter variable to get all incoming links''
-
-Using the <<olink backlinks>> [[filter operator|Filter Operators]] to get all tiddlers linking to this one...
-
-```
-<<list-links filter:"[<currentTiddler>backlinks[]]">>
-```
-
-<<<
-<<list-links filter:"[<currentTiddler>backlinks[]]">>
-<<<
+<$macrocall $name=".example" n="3" eg="""<<list-links filter:"[<currentTiddler>backlinks[]]">>"""/>

From 40c6362fbe8b0832bbe3973a61a2e986260c3780 Mon Sep 17 00:00:00 2001
From: Astrid Elocson <aelocson@gmail.com>
Date: Wed, 25 Feb 2015 07:57:55 +0000
Subject: [PATCH 2/4] Resolve merge conflict in LinkWidget.tid

---
 editions/tw5.com/tiddlers/widgets/LinkWidget.tid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index 4406a9da2..97c787f1e 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,6 +1,6 @@
 title: LinkWidget
 created: 201310241419
-modified: 20150220161251000
+modified: 20150225075728000
 tags: Widgets
 caption: link
 

From e4525a95c57bd7b9c8bc30ace37ab12a985c5c7e Mon Sep 17 00:00:00 2001
From: Astrid Elocson <aelocson@gmail.com>
Date: Wed, 25 Feb 2015 08:01:38 +0000
Subject: [PATCH 3/4] Try again to resolve merge conflict in LinkWidget.tid

---
 editions/tw5.com/tiddlers/widgets/ListWidget.tid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
index 89daddb96..6e80b2d76 100644
--- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
@@ -1,5 +1,5 @@
 created: 201310241419
-modified: 20150106180000000
+modified: 201502231037
 tags: Widgets
 title: ListWidget
 caption: list

From 61b8180562b402102d65fc9a2fac91f9340d96e6 Mon Sep 17 00:00:00 2001
From: Astrid Elocson <aelocson@gmail.com>
Date: Wed, 25 Feb 2015 12:53:57 +0000
Subject: [PATCH 4/4] Resolve merge conflict in LinkWidget.tid

---
 editions/tw5.com/tiddlers/widgets/LinkWidget.tid | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index 97c787f1e..13f12c205 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,6 +1,6 @@
 title: LinkWidget
 created: 201310241419
-modified: 20150225075728000
+modified: 201502231037
 tags: Widgets
 caption: link
 
@@ -12,6 +12,9 @@ The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to ge
 |to |The title of the target tiddler for the link (defaults to the [[current tiddler|Current Tiddler]]) |
 |aria-label |Optional [[Accessibility]] label |
 |tooltip |Optional tooltip WikiText |
+|tabindex |Optional numeric [[tabindex|https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/tabIndex]] |
+|draggable |"yes" to enable the link to be draggable (defaults to "yes") |
+|tag |Optional tag to override the default "a" element |
 
 The content of the link widget is rendered within the `<a>` tag.