Changes between Version 1 and Version 2 of WikiFormatting

Timestamp:

06/12/09 11:45:10 (4 years ago)

Author:

trac

Comment:

--

WikiFormatting

@@ -5 +5 @@
 
 Trac has a built in small and powerful wiki rendering engine. This wiki engine implements an ever growing subset of the commands from other popular Wikis,
-especially [http://moinmoin.wikiwikiweb.de/ MoinMoin].
+especially [http://moinmoin.wikiwikiweb.de/ MoinMoin]. 
 
 
@@ -21 +21 @@
  * {{{monospace}}} or `monospace`
  * ~~strike-through~~
- * ^superscript^
+ * ^superscript^ 
  * ,,subscript,,
 }}}
@@ -32 +32 @@
  * {{{monospace}}} or `monospace`
  * ~~strike-through~~
- * ^superscript^
+ * ^superscript^ 
  * ,,subscript,,
 
@@ -42 +42 @@
 
 You can create heading by starting a line with one up to five ''equal'' characters ("=")
-followed by a single space and the headline text. The line should end with a space
+followed by a single space and the headline text. The line should end with a space 
 followed by the same number of ''='' characters.
 The heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
@@ -81 +81 @@
  * Item 1
    * Item 1.1
+      * Item 1.1.1   
+      * Item 1.1.2
+      * Item 1.1.3
+   * Item 1.2
  * Item 2
 
@@ -96 +100 @@
  * Item 1
    * Item 1.1
+      * Item 1.1.1
+      * Item 1.1.2
+      * Item 1.1.3
+   * Item 1.2
  * Item 2
 
@@ -137 +145 @@
 
 Block containing preformatted text are suitable for source code snippets, notes and examples. Use three ''curly braces'' wrapped around the text to define a block quote. The curly braces need to be on a separate line.
-
+  
 Example:
 {{{
@@ -167 +175 @@
 == Discussion Citations ==
 
-To delineate a citation in an ongoing discussion thread, such as the ticket comment area, e-mail-like citation marks (">", ">>", etc.) may be used.
+To delineate a citation in an ongoing discussion thread, such as the ticket comment area, e-mail-like citation marks (">", ">>", etc.) may be used.  
 
 Example:
@@ -225 +233 @@
  * [wiki:ISO9000]
 
-
-=== Trac Links ===
+== Trac Links ==
 
 Wiki pages can link directly to other parts of the Trac system. Pages can refer to tickets, reports, changesets, milestones, source files and other Wiki pages using the following notations:
@@ -240 +247 @@
  * Reports: {1} or report:1
  * Changesets: r1, [1] or changeset:1
- * ...
-
-See TracLinks for more in-depth information.
+ * ... 
+
+There are many more flavors of Trac links, see TracLinks for more in-depth information.
 
 
@@ -264 +271 @@
 Urls ending with `.png`, `.gif` or `.jpg` are no longer automatically interpreted as image links, and converted to `<img>` tags.
 
-You now have to use the ![[Image]] macro (see below).
+You now have to use the ![[Image]] macro. The simplest way to include an image is to upload it as attachment to the current page, and put the filename in a macro call like `[[Image(picture.gif)]]`.
+
+In addition to the current page, it is possible to refer to other resources:
+ * `[[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 project htdocs)
+ * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
+
+Example display: [[Image(htdocs:../common/trac_logo_mini.png)]]
+
+
+See WikiMacros for further documentation on the `[[Image()]]` macro.
 
 
@@ -273 +291 @@
 Example:
 {{{
- [[Timestamp]]
-}}}
-
-Display:
- [[Timestamp]]
+ [[RecentChanges(Trac,3)]]
+}}}
+
+Display:
+ [[RecentChanges(Trac,3)]]
 
 See WikiMacros for more information, and a list of installed macros.
@@ -284 +302 @@
 == 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]. 
 
 Example 1:
@@ -338 +356 @@
 
 
+== Comments ==
+
+Comments can be added to the plain text. These will not be rendered and will not display in any other format than plain text.
+{{{
+{{{
+#!comment
+Your comment here
+}}}
+}}}
+
+
 == Miscellaneous ==
 
@@ -349 +378 @@
 Display:
 ----
+