none

1 files changed, 4 insertions, 20 deletions

diff --git a/TWiki/TWikiShorthand.mdwn b/TWiki/TWikiShorthand.mdwn
index 0a138797..5379738e 100644
--- a/TWiki/TWikiShorthand.mdwn
+++ b/TWiki/TWikiShorthand.mdwn
@@ -2,11 +2,7 @@
 
 # <a name="TWiki_Shorthand"> TWiki Shorthand </a>
 
-Working in TWiki is as easy as typing in text - exactly like email. You don't need to know HTML, though you can use it if you prefer. Links to topics are created automatically when you enter [[WikiWords]]. And TWiki shorthand gives you all the power of HTML with a simple coding system that takes no time to learn. It's all layed out below - refer back to this page in a pop-up window from the **Edit** screen.
-
-<a name="TWikiShorthand"></a>
-
-## <a name="TWiki_Editing_Rules"> TWiki Editing Rules </a>
+Working in TWiki is as easy as typing in text - exactly like email. You don't need to know HTML, though you can use it if you prefer. Links to topics are created automatically when you enter [[WikiWords]]. And [[TWikiShorthand]] gives you all the power of HTML with a simple coding system that takes little time to learn. It's all layed out below - refer back to this table in a pop-up window from the **Edit** screen.
 
 <table bgcolor="#000000" border="0" cellpadding="3" cellspacing="1">
   <tr bgcolor="#ffffff">
@@ -257,11 +253,7 @@ Know.ReadmeFirst
 
 ## <a name="Using_HTML"> </a> Using HTML
 
-You can use just about any HTML tag without a problem - however, to keep in mind:
-
-* On collaboration pages, it's preferable NOT to use HTML, and to use TWiki shorthand instead - this keeps the text uncluttered and easy to edit.
-  * **_NOTE:_** TWiki converts shorthand notation to XHTML 1.0 for display. To copy a fully marked-up page, simply view source in your browser and save the contents.
-  * **_NOTE:_** The standard installation TWiki is compatible across a wide range of browsers and computer platforms. If this is important to you, remember that using browser-specific tags or any other mark-up that doesn't degrade well will reduce compatibility.
+You can use just about any HTML tag without a problem, HOWEVER, it's recommended NOT to. Using [[TWikiShorthand]], you can do practically anything you'd normally do with HTML, and it keeps the text uncluttered and easy for people to browse edit.
 
 ## <a name="Hyperlinks"> Hyperlinks </a>
 
@@ -283,7 +275,7 @@ Being able to create links without any formatting required is a core TWiki featu
 
 ## <a name="TWiki_Variables"> TWiki Variables </a>
 
-Variables are names that are enclosed in percent signs `%` that are expanded on the fly.
+[[TWikiVariables]] are names that are enclosed in percent signs `%` that are expanded on the fly. Using the existing variables, and even creating your own, adds an amazing extra level of content to your posts. For example:
 
 * <code>%TOC%</code> : Automatically generates a table of contents based on headings in a topic - see the top of this page for an example.
 
@@ -307,12 +299,4 @@ TWiki formatting rules are fairly simple to use and quick to type. However, ther
 * **Q:** Why is the `'&'` character sometimes not displayed?
   * **A:** The `'&'` character has a special meaning in HTML, it starts a so called character entity, i.e. `'&copy;'` is the `©` copyright character. You need to escape `'&'` to see it as it is, so write `'&amp;'` instead of `'&'`. <br /> Example: Type `'This &amp; that'` to get `'This & that'`.
 
-## <a name="TWiki_Plugins"> TWiki Plugins </a>
-
-Plugins provide additional text formatting capabilities and can extend the functionality of %WIKITOOLNAME% into many other areas. For example, one optional Plugin lets you create a basic spreadsheet in a similar way to tables. Available Plugins are located in the [[TWikiPlugins]] web on TWiki.org. Currently enabled plugins on here:
-
-%PLUGINDESCRIPTIONS%
-
-Check on current Plugin status and settings for this site in [[TWikiPreferences]].
-
--- [[MikeMannix]] - 01 Oct 2001 <br />
+-- [[Main/MikeMannix]] - 02 Dec 2001