none

1 files changed, 16 insertions, 12 deletions

diff --git a/TWiki/TextFormattingFAQ.mdwn b/TWiki/TextFormattingFAQ.mdwn
index b9ab5fd4..2c6e1926 100644
--- a/TWiki/TextFormattingFAQ.mdwn
+++ b/TWiki/TextFormattingFAQ.mdwn
@@ -8,7 +8,7 @@ The most frequently asked questions about text formatting are answered. Also, [[
 >
 > ### <a name="How_do_I_make_a_separator_"> How do I make a separator? </a>
 >
-> You can make a horizontal separator by entering three dashes at the beginning of a line: `---`.
+> Create a separator - a horizontal rule - by entering three dashes at the beginning of a blank line: `---`. You can enter more than three if you like, for a more visible separator in edit mode: <br />`--------------`
 >
 > ----
 >
@@ -24,7 +24,7 @@ The most frequently asked questions about text formatting are answered. Also, [[
 >
 > ### <a name="Text_enclosed_in_angle_brackets_"> Text enclosed in angle brackets like &lt;filename&gt; is not displayed. How can I show it as it is? </a>
 >
-> TWiki interprets text as HTML. The '&lt;' and '&gt;' characters are used to define HTML commands. Text contained in angle brackets is interpreted by the browser if it's a valid HTML instruction, or ignored if it isn't - either way, the brackets and its contents are not displayed.
+> TWiki interprets text as HTML, and the '&lt;' and '&gt;' characters define where HTML commands start and end. Text _inside_ angle brackets is treated as HTML, and ignored if it doesn't actually do anything - either way, the brackets and its contents are not displayed.
 >
 > If you want to display angle brackets, enter them as HTML codes instead of typing them in directly:
 >
@@ -56,7 +56,7 @@ The most frequently asked questions about text formatting are answered. Also, [[
 >
 > ### <a name="Text_I_enter_gets_wrapped_around"> Text I enter gets wrapped around. How can I keep the formatting as it is? </a>
 >
-> TWiki interprets text as HTML, so you can use the `preformatted` HTML text option to keep the new line of text as is. Enclose the text in &lt;pre&gt; &lt;/pre&gt;, or in TWiki's own &lt;verbatim&gt; &lt;/verbatim&gt; tags:
+> TWiki interprets text as HTML, so you can use the `preformatted` HTML option to keep the new line of text as is. Enclose the text in &lt;pre&gt; &lt;/pre&gt;, or in TWiki's own &lt;verbatim&gt; &lt;/verbatim&gt; tag:
 >
 >     This text will keep its format as it is:
 >     <verbatim>
@@ -65,7 +65,7 @@ The most frequently asked questions about text formatting are answered. Also, [[
 >       aaa       12.00    3   36.00
 >     </verbatim>
 >
-> The `pre` tag is standard HTML; `verbatim` is a special TWiki tag that also forces text to fixed font mode, and also prevents other tags and TWiki shortcuts from being expanded.
+> The `pre` tag is standard HTML; `verbatim` is a special TWiki tag that forces text to fixed font mode, and also prevents other tags and TWiki shortcuts from being expanded.
 >
 > ----
 >
@@ -132,31 +132,35 @@ The most frequently asked questions about text formatting are answered. Also, [[
 >
 > ----
 >
-> ### <a name="Can_I_include_images_and_picture"> Can I include images and pictures? </a>
+> ### <a name="Can_I_include_images_on_a_page_"> Can I include images on a page? </a>
 >
-> Yes, this is possible. The easiest way of including images is to attach a GIF, JPG or PNG file to a topic and then to include it with text <code>%ATTACHURL%/myImage.gif</code> . [[FileAttachment]] has more.
+> Yes. The easiest way is to [[FileAttachment]] a GIF, JPG or PNG file to a topic and then to place it with: <code>%ATTACHURL%/myImage.gif</code>. This works only for the page that the image is attached to.
 >
-> There are actually two ways of including inline images.
+> To place an image on any page, ther are two ways of including inline images.
 >
 > **1\. Using URL ending in .gif, .jpg, .jpeg, .png**
 >
-> This is a simple and automatic way of including inline images. Simply write the URL of the image file, this will create the inline image for you. **Note:** The images must be accessible as a URL.
+> This is a simple and automatic way of including inline images. Simply write the URL of the image file, this will create the inline image for you. **_NOTE:_** The images must be accessible as a URL.
 >
 > * **_You enter:_** <code> TWiki %PUBURL%/wikiHome.gif logo.</code><br />**_Result:_** TWiki %PUBURL%/wikiHome.gif logo.
 >
+> <a name="ImgUpload"></a> You can upload images directly to your server with FTP access. You can also [[FileAttachment]] image files to a topic - you could even create a dedicated image topic, like `ImageLibrary` - and then link to the images directly:
+>
+> * Attach `pic.gif` to `Someweb.SomeTopic`<br /> Display with <code>%PUBURL%/Someweb/SomeTopic/pic.gif</code>
+>
 > **2\. Using &lt;img&gt; tag**
 >
-> This is a manual process where you have more control over the rendering of the image. Use the &lt;img&gt; tag of HTML to include GIF, JPG and PNG files. **Note:** The display of the topic is faster if you include the WIDTH and HEIGHT parameters that have the actual image size. <http://www.htmlhelp.com/reference/wilbur/special/img.html> has more on inline images.
+> This is a manual process where you have more control over the rendering of the image. Use the &lt;img&gt; tag of HTML to include GIF, JPG and PNG files. **Note:** The display of the topic is faster if you include the `WIDTH` and `HEIGHT` parameters that have the actual image size. <http://www.htmlhelp.com/reference/wilbur/special/img.html> has more on inline images.
 >
-> * **_You enter:_** `TWiki <img src="%PUBURL%/wikiHome.gif" width="46" height="50" /> logo.`<br />**_Result:_**<br /> TWiki <img src="%PUBURL%/wikiHome.gif" width="46" height="50" /> logo.
+> * **_You enter:_** `TWiki <img src="%PUBURL%/wikiHome.gif" width="46" height="50" border="0" alt="logo" /> logo.`<br />**_Result:_**<br /> TWiki <img src="%PUBURL%/wikiHome.gif" width="46" height="50" alt="logo" /> logo.
 >
 > ----
 >
 > ### <a name="Can_I_write_colored_text_"> Can I write colored text? </a>
 >
-> Sure. The quickest way is to use the &lt;font color="colorCode"&gt; and &lt;/font&gt; tags - they're HTML tags that work in any browser, (although they've been phased in the latest version).
+> Sure. The quickest way is to go &lt;font color="colorCode"&gt;colorize&lt;/font&gt; - `font` is an HTML tag that works in any browser, although it's been phased out in the latest HTML specs.
 >
-> You can also use a `style` attribute: `style="color:#ff0000"`, placed in most HTML tags - `span` is an all-purpose choice: "&lt;span style="color:#ff0000"&gt;.
+> You can also use the up-to-date `style` attribute - ex: `style="color:#ff0000"` - placed in most HTML tags. `span` is an all-purpose choice: "&lt;span style="color:#ff0000"&gt;CoLoR&lt;/span&gt;. Only old (like 3.x IE &amp; NS) browsers have a problem with `style`.
 >
 > "colorCode" is the _hexadecimal RGB color code_, which is simply Red, Green and Blue values in hex notation (base 16, 0-F). For pure red, the RGB components are 255-0-0 - full red (255), no green or blue. That's FF-0-0 in hex, or <code>"#ff000=" for Web page purposes. For a basic color selection (you can [[StandardColors]] names instead of hex code in the =font</code> tag only):
 >