Changes between Version 9 and Version 10 of WikiFormatting

Timestamp:

Dec 14, 2014, 5:16:20 PM (9 years ago)

Author:

trac

Comment:

—

WikiFormatting

@@ -28 +28 @@
 || `'''bold'''`, `''italic''`, `'''''Wikipedia style'''''` || \
 || '''bold''', ''italic'', '''''Wikipedia style''''' ||
-|| {{{`monospaced (''other markup ignored'')`}}} || \
-|| `monospaced (''other markup ignored'')` ||
+|| {{{`monospaced and ''nowiki''`}}} || \
+|| `monospaced and nowiki` ||
 || `**bold**`, `//italic//`, `**//!WikiCreole style//**` || \
 || **bold**, //italic//, **//!WikiCreole style//** ||
@@ -41 +41 @@
 }}}
 {{{#!td style="padding-left: 2em"
-== Level 2 ==
+== Level 2
 === Level 3 ^([#hn note])^
 }}}
@@ -65 +65 @@
  {{{
  * bullets list
-   on multiple lines
+   on multiple paragraphs
    1. nested list
      a. different numbering 
@@ -73 +73 @@
 {{{#!td
 * bullets list
-  on multiple lines
+  on multiple paragraphs
   1. nested list
     a. different numbering
@@ -85 +85 @@
  {{{
   term:: definition on
-         multiple lines
+         multiple paragraphs
  }}}
 }}}
 {{{#!td
  term:: definition on
-        multiple lines
+        multiple paragraphs
 }}}
 |-----------------------------------------------------------
@@ -175 +175 @@
 || see [#point1 (1)] ||
 |-----------------------------------------------------------
-{{{#!th rowspan=3
-[#Escaping Escaping Markup]
+{{{#!th rowspan=2
+[#EscapingLinksandWikiPageNames Escaping Markup]
 }}}
 || `!'' doubled quotes` ||\
@@ -182 +182 @@
 || `!wiki:WikiFormatting`, `!WikiFormatting` ||\
 || !wiki:WikiFormatting, !WikiFormatting ||
-|| `{{{-}}} curly brackets` ||\
-|| {{{-}}} curly brackets ||
 |-----------------------------------------------------------
 ||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] ||
@@ -296 +294 @@
 followed by a single space and the headline text. 
 
-[=#hn]
-The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
+[=#hn] The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
 
 Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
@@ -314 +311 @@
   {{{
   #!div
-  = Heading =
   == Subheading
   === About ''this'' ===
@@ -725 +721 @@
 
 
-== Escaping Links, WikiPageNames and other Markup == #Escaping
+== Escaping Links and WikiPageNames ==
 
 You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
@@ -735 +731 @@
    !#42 is not a link
   }}}
-  {{{
-Various forms of escaping for list markup:
- `-` escaped minus sign \\
- ``1. escaped number  \\
- {{{*}}} escaped asterisk sign
-  }}}
 }}}
 {{{#!td
  !NoHyperLink
  !#42 is not a link
-
-Various forms of escaping for list markup:
- `-` escaped minus sign \\
- ``1. escaped number  \\
- {{{*}}} escaped asterisk sign
 }}}
 
@@ -761 +746 @@
  * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page)
  * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket)
- * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
+ * `[[Image(htdocs:picture.gif)]]` (referring to a file inside project htdocs)
  * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
 
@@ -774 +759 @@
 }}}
 
-See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
+See WikiMacros for further documentation on the `[[Image()]]` macro.
 
 
@@ -1005 +990 @@
 !WikiCreole style \\ line\\break
 }}}
-