diff --git a/editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid b/editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid
index 12e5d4402..65eeccc4e 100644
--- a/editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid
+++ b/editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid
@@ -1,5 +1,5 @@
created: 20150123220237000
-modified: 20150124120447000
+modified: 20150226163104000
tags: Concepts
title: Hard and Soft Links
type: text/vnd.tiddlywiki
@@ -12,4 +12,4 @@ A link is <<.def "soft">> if it is:
* supplied via a [[macro|Macros]] or [[variable|Variables]]
* generated by a link widget whose <<.attr to>> attribute is a transclusion, macro or variable
-Soft links are not detected by link-related filter operators such as <<.olink backlinks>>, <<.olink links>>, <<.olink all>> and <<.olink is>>.
+<$macrocall $name=".warning" _="""Soft links are not detected by link-related filter operators such as <<.olink backlinks>>, <<.olink links>>, <<.olink all>> and <<.olink is>>."""/>
diff --git a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
index f6c0e9fb8..89afc1364 100644
--- a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
+++ b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
@@ -1,12 +1,12 @@
created: 20140410101941871
-modified: 20150221152006000
+modified: 20150226162742000
tags: Learning Filters
title: Introduction to filter notation
type: text/vnd.tiddlywiki
<<.preamble """This explains the basics of writing a [[filter|Filters]] to select a set of tiddlers. For a more technical presentation, see [[Filter Syntax]].""">>
-<$macrocall $name=".note" _="""Filters do nothing if you just type them into a tiddler on their own. They need a context. An easy way to experiment with filters is to type them into the <<.advancedsearch-tab Filter>> tab of [[Advanced Search|$:/AdvancedSearch]]."""/>
+<$macrocall $name=".tip" _="""Filters do nothing if you just type them into a tiddler on their own. They need a context. An easy way to experiment with filters is to type them into the <<.advancedsearch-tab Filter>> tab of [[Advanced Search|$:/AdvancedSearch]]."""/>
The simplest case is where you already know exactly which tiddlers you want. Type each title in double square brackets, with a space between each one and the next:
diff --git a/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid b/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid
index 8ae525608..64606b6a4 100644
--- a/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid
+++ b/editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid
@@ -1,5 +1,5 @@
created: 20150110182600000
-modified: 20150221181632000
+modified: 20150226161700000
title: Documentation Macros
tags: [[Improving TiddlyWiki Documentation]]
@@ -14,6 +14,12 @@ The following macros are used throughout ~TiddlyWiki's documentation. Their name
|.strong |major emphasis within a tiddler |<<.strong Important!>> |
|.word |a mention of an ordinary word or phrase |<<.word "hello world">> |
+!Advice
+
+|!Macro |!Used for |!Example |
+|^.tip |^hints and tips |<<.tip "Turn your screen on, otherwise
you won't be able to see much.">> |
+|^.warning |^warning advice |<<.warning "Make a backup of your file
before your upgrade.">> |
+
!Blocks
|!Macro |!Used for |
|.preamble |an introductory sentence that stands apart from the rest of the tiddler |
diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid
index 6aecd33aa..2bfb20ead 100644
--- a/editions/tw5.com/tiddlers/system/doc-macros.tid
+++ b/editions/tw5.com/tiddlers/system/doc-macros.tid
@@ -1,5 +1,5 @@
created: 20150117152607000
-modified: 20150221200048000
+modified: 20150226161637000
title: $:/editions/tw5.com/doc-macros
tags: $:/tags/Macro
@@ -62,6 +62,10 @@ tags: $:/tags/Macro
\define .button(_)
+\define .tip(_)