[1/2] git commit: [#5316] document ~~~~ markdown

[jo...@apache.org]

Updated Branches:
  refs/heads/master 8ae6302bc -> cb6a9e372


[#5316] document ~~~~ markdown


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/af0c0b48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/af0c0b48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/af0c0b48

Branch: refs/heads/master
Commit: af0c0b48e7eda69b361cdd0fb678744553ad1e1c
Parents: 8ae6302
Author: Dave Brondsema <db...@geek.net>
Authored: Thu Nov 29 23:05:34 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Mon Dec 3 20:07:15 2012 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/lib.html |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/af0c0b48/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 7762bc9..7bfdddc 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -293,7 +293,10 @@ paragraph.""")}}
 <h2 id="md_ex_pre{{id}}">Preformatted Text</h2>
 <p>If you want some text to show up exactly as you write it, without
 Markdown doing anything to it, just indent every line by at least 4
-spaces (or 1 tab).</p>
+spaces (or 1 tab).  As an alternative to indenting, you can use 4 or
+more tildes before and after the text.  See examples in the
+<a href="#md_ex_code">Code Highlighting section</a>
+</p>
 <div class="codehilite"><pre>
     This line won't *have any markdown* formatting applied.
     I can even write &lt;b&gt;HTML&lt;/b&gt; and it will show up as text.
@@ -301,9 +304,8 @@ spaces (or 1 tab).</p>
     Markdown. &lt;b&gt;this won't show up as HTML&lt;/b&gt; but
     exactly &lt;i&gt;as you see it in this text file&lt;/i&gt;.
 
-As a shortcut you can use backquotes to do the same thing while
-inside a normal pargraph.  `This won't be *italic* or **bold**
-at all.`
+Within a paragraph, you can use backquotes to do the same thing.
+`This won't be *italic* or **bold** at all.`
 </pre></div>
 
 <p>Output:</p>
@@ -314,9 +316,8 @@ at all.`
     Markdown. <b>this won't show up as HTML</b> but
     exactly <i>as you see it in this text file</i>.
 
-As a shortcut you can use backquotes to do the same thing while
-inside a normal pargraph.  `This won't be *italic* or **bold**
-at all.`""")}}
+Within a paragraph, you can use backquotes to do the same thing.
+`This won't be *italic* or **bold** at all.`""")}}
 </div>