From 7a62a86bafc0c259833b3a69db7f0e3f9ddd4298 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Tue, 11 Feb 2014 19:10:17 +0000
Subject: [PATCH] Docs updates

---
 editions/tw5.com/tiddlers/Docs.tid                 | 10 +++++-----
 editions/tw5.com/tiddlers/concepts/Macros.tid      | 14 ++++++++++++++
 .../tiddlers/wikitext/Macros in WikiText.tid       |  8 +++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 editions/tw5.com/tiddlers/concepts/Macros.tid

diff --git a/editions/tw5.com/tiddlers/Docs.tid b/editions/tw5.com/tiddlers/Docs.tid
index e22310bb7..8b910057c 100644
--- a/editions/tw5.com/tiddlers/Docs.tid
+++ b/editions/tw5.com/tiddlers/Docs.tid
@@ -1,5 +1,5 @@
 created: 20130824141800000
-modified: 20131212093542990
+modified: 20140211165927396
 tags: introduction
 title: Docs
 type: text/vnd.tiddlywiki
@@ -11,10 +11,6 @@ type: text/vnd.tiddlywiki
 \end
 This is the main documentation hub for TiddlyWiki. See also [[TiddlyWiki for Developers]].
 
-! How to use ~TiddlyWiki5
-
-<<bulletList "howto">>
-
 ! Concepts
 
 <<bulletList "concepts">>
@@ -31,6 +27,10 @@ This is the main documentation hub for TiddlyWiki. See also [[TiddlyWiki for Dev
 
 <<bulletList "command">>
 
+! How to use ~TiddlyWiki5
+
+<<bulletList "howto">>
+
 ! Tips
 
 <<bulletList "tips">>
diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
new file mode 100644
index 000000000..8faf046de
--- /dev/null
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -0,0 +1,14 @@
+created: 20140211171341271
+modified: 20140211171348738
+tags: concepts
+title: Macros
+type: text/vnd.tiddlywiki
+
+Macros are snippets of text that can be inserted with a concise shortcut:
+
+```
+<<myMacro>>
+```
+
+You can write your own [[Macros in WikiText]] or for more flexibility you can write [[JavaScript Macros]].
+
diff --git a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid
index 8b6826c3e..004054f4b 100644
--- a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid	
@@ -1,9 +1,11 @@
 created: 20131205160746466
-modified: 20131205160758948
+modified: 20140211190841939
 tags: wikitext
 title: Macros in WikiText
 type: text/vnd.tiddlywiki
 
+! Defining Macros
+
 Macros are snippets of text that can be inserted with a concise shortcut. A macro is defined like this:
 
 ```
@@ -16,6 +18,10 @@ The first line of the definition specifies the macro name and any parameters. Pa
 
 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.
 
+[[JavaScript Macros]] can also be used for more flexibility.
+
+! Using Macros
+
 Macros are used like this:
 
 ```