Changes between Version 41 and Version 42 of WikiFormatting

Timestamp:

Sep 12, 2005, 11:35:57 AM (19 years ago)

Author:

Christian Boos

Comment:

Be more consistent in the way each syntax feature is presented, plus a few updates for 0.9 along the way

WikiFormatting

@@ -8 +8 @@
 This page demonstrates the formatting syntax available anywhere WikiFormatting is allowed.
 
+
 == Font styles ==
 
 The Trac wiki supports the following font styles:
+{{{
  * '''bold'''
  * ''italic''
@@ -19 +21 @@
  * ^superscript^ 
  * ,,subscript,,.
-
-{{{
-The Trac wiki supports the following font styles:
+}}}
+
+Display:
  * '''bold'''
  * ''italic''
@@ -30 +32 @@
  * ^superscript^ 
  * ,,subscript,,.
-}}}
 
 
@@ -39 +40 @@
 followed by the same number of ''equal'' characters. 
 
-''Note: As of writing, headings cannot contain TracLinks.''
-
-=== Example: ===
+Example:
 {{{
 = Heading =
 == Subheading ==
-}}}
+== About ''this'' ==
+}}}
+
+Display:
+= Heading =
+== Subheading ==
+== About ''this'' ==
 
 
@@ -63 +68 @@
   Text paragraphs can be indented by starting the lines with two or more spaces.
 
+
 == Lists ==
+
 The wiki supports both ordered/numbered and unordered lists.
 (Note: there must be a space preceding the star (*) or number (1.), or nothing will happen.)
@@ -87 +94 @@
  1. Item 2
 
+
 == Preformatted text ==
+
 Block quotes, preformatted text, are suitable for source code snippets, notes and examples. Use three ''curly braces'' wrapped around the text to define a block quote:
   
@@ -104 +113 @@
 }}}
 
+
 == Tables ==
 
@@ -111 +121 @@
 ||Cell 4||Cell 5||Cell 6||
 }}}
+
 Display:
 ||Cell 1||Cell 2||Cell 3||
 ||Cell 4||Cell 5||Cell 6||
 
+
 == Links ==
 
-!Hyperlinks are automatically created for WikiPageNames and urls. !WikiPageLinks can be disabled by
+Hyperlinks are automatically created for WikiPageNames and urls. 
+!WikiPageLinks can be disabled by
 prepending an exclamation mark (!) character, such as {{{!WikiPageLink}}}.
 
-Examples:
-
- TitleIndex, http://www.edgewall.com/.
+Example:
+{{{
+ TitleIndex, http://www.edgewall.com/, !NotAlink
+}}}
+
+Display:
+ TitleIndex, http://www.edgewall.com/, !NotAlink
 
 Links can be given a more descriptive title by writing the link followed by
-a space and a title and all this inside square brackets. Like this:
+a space and a title and all this inside square brackets. 
+If the descriptive title is omitted, then the explicit prefix is disguarded,
+unless the link is an external link. This can be useful for wiki pages
+not adhering to the WikiPageNames convention.
+
+Like this:
 {{{
  * [http://www.edgewall.com/ Edgewall Software]
  * [wiki:TitleIndex Title Index]
-}}}
-Display:
-
+ * [wiki:ISO9000]
+}}}
+
+Display:
  * [http://www.edgewall.com/ Edgewall Software]
  * [wiki:TitleIndex Title Index]
+ * [wiki:ISO9000]
+
 
 === Trac Links ===
@@ -140 +165 @@
 Pages can refer to tickets, reports, changesets, milestones, source files and
 other Wiki pages using the following notation:
- * Tickets: '''!#1''' or '''!ticket:1'''
- * Reports: '''!{1}''' or '''!report:1'''
- * Changesets: '''!r1''', '''![1]''' or '''!changeset:1'''
- * Revision log: '''!r1:3''', '''![1:3]''' or '''!log:#1:3'''
- * Wiki pages: '''CamelCase''' or '''!wiki:CamelCase'''
- * Milestones: '''!milestone:1.0'''
- * Files: '''!source:trunk/COPYING'''
- * A specific file revision: '''!source:/trunk/COPYING#200'''
-Display:
+{{{
  * Tickets: #1 or ticket:1
  * Reports: {1} or report:1
  * Changesets: r1, [1] or changeset:1
- * Differences: r1:3, [1:3] or log:#1:3
+ * Revision Logs: r1:3, [1:3] or log:branches/0.9-stable#1:3
  * Wiki pages: CamelCase or wiki:CamelCase
- * Milestones: milestone:1.0
+ * Milestones: milestone:1.0 or milestone:"End-of-days Release"
  * Files: source:trunk/COPYING
  * A specific file revision: source:/trunk/COPYING#200
+ * A filename with embedded space:"/trunk/README FIRST"
+}}}
+
+Display:
+ * Tickets: #1 or ticket:1
+ * Reports: {1} or report:1
+ * Changesets: r1, [1] or changeset:1
+ * Revision Logs: r1:3, [1:3] or log:branches/0.8-stable#1000:2000
+ * Wiki pages: CamelCase or wiki:CamelCase
+ * Milestones: milestone:1.0 or milestone:"End-of-days Release"
+ * Files: source:trunk/COPYING
+ * A specific file revision: source:/trunk/COPYING#200
+ * A filename with embedded space:"/trunk/README FIRST"
 
 See TracLinks for more in-depth information.
 
+
 == Escaping Links and WikiNames ==
+
 You may avoid making hyperlinks out of TracLinks by preceding an expression with a single '!' (exclamation mark).
 
@@ -172 +204 @@
  !#42 is not a link
 
+
 == Images ==
 
-Urls ending with .png, .gif or .jpg are automatically interpreted as image links, and converted to IMG tags.
+Urls ending with `.png`, `.gif` or `.jpg` are automatically interpreted as image links, and converted to IMG tags.
 
 Example:
@@ -184 +217 @@
 http://www.edgewall.com/gfx/trac_example_image.png
 
+
 == Macros ==
-Macros are ''custom functions'' to insert dynamic content in a page. See WikiMacros for usage.
+
+Macros are ''custom functions'' to insert dynamic content in a page. 
+See WikiMacros for usage.
 
 Example:
@@ -191 +227 @@
  [[Timestamp]]
 }}}
+
 Display:
  [[Timestamp]]
 
+
 == Processors ==
-Trac supports alternative markup formats using WikiProcessors. For example, processors are used to write pages in [wiki:WikiRestructuredText reStructuredText] or [wiki:WikiHtml HTML]. 
+
+Trac supports alternative markup formats using WikiProcessors. 
+For example, processors are used to write pages in 
+[wiki:WikiRestructuredText reStructuredText] or [wiki:WikiHtml HTML]. 
 
 See WikiProcessors for more information.
@@ -207 +248 @@
 }}}</pre>
 }}}
+
 Display:
 {{{
@@ -225 +267 @@
 }}}</pre>
 }}}
+
 Display:
 {{{
@@ -235 +278 @@
 }}}
 
+
 == Miscellaneous ==
 
 Four or more dashes will be replaced by a horizontal line (<HR>)
 
+Example:
 {{{
  ----
@@ -246 +291 @@
 ----
 
----
+
 ----
--
+
 See also: TracLinks, TracGuide, WikiHtml, WikiMacros, WikiProcessors, TracSyntaxColoring.