Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2733DFB4 for ; Thu, 29 Nov 2012 23:17:46 +0000 (UTC) Received: (qmail 3159 invoked by uid 500); 29 Nov 2012 23:17:46 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 3126 invoked by uid 500); 29 Nov 2012 23:17:46 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 3108 invoked by uid 99); 29 Nov 2012 23:17:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2012 23:17:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 956FE813855; Thu, 29 Nov 2012 23:17:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [#5316] document ~~~~ markdown Message-Id: <20121129231746.956FE813855@tyr.zones.apache.org> Date: Thu, 29 Nov 2012 23:17:46 +0000 (UTC) [#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/d460995c Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d460995c Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d460995c Branch: refs/heads/db/5316 Commit: d460995c2709297a6e6f4ab737d998059d2f208d Parents: 7bed302 Author: Dave Brondsema Authored: Thu Nov 29 23:05:34 2012 +0000 Committer: Dave Brondsema Committed: Thu Nov 29 23:05:34 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/d460995c/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.""")}}

Preformatted Text

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).

+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 +Code Highlighting section +

     This line won't *have any markdown* formatting applied.
     I can even write <b>HTML</b> and it will show up as text.
@@ -301,9 +304,8 @@ spaces (or 1 tab).

     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.`

Output:

@@ -314,9 +316,8 @@ at all.` Markdown. this won't show up as HTML but exactly as you see it in this text file. -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.`""")}}