Edgewall Software

Changes between Version 91 and Version 129 of WikiFormatting


Ignore:
Timestamp:
(multiple changes)
Author:
(multiple changes)
Comment:
(multiple changes)

Legend:

Unmodified
Added
Removed
Modified
  • WikiFormatting

    v91 v129  
    1 ** Note: this page documents the 0.12 version of Trac, see [[0.11/WikiFormatting]] if you need the previous version **
    2 = WikiFormatting =
     1= WikiFormatting
     2
    33[[TracGuideToc]]
    4 
    5 Wiki markup is a core feature in Trac, tightly integrating all the other parts of Trac into a flexible and powerful whole.
    6 
    7 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,
    8 especially [http://moinmo.in/ MoinMoin] and [trac:WikiCreole].
    9 
    10 
    11 This page will give you an in-depth explanation of the wiki markup available anywhere WikiFormatting is allowed.
    12 
    13 The ''Cheat sheet'' below gives you a quick overview for the most common syntax, each link in the ''Category'' column will lead you to the more detailed explanation later in this page.
    14 
    15 A few other wiki pages present the advanced features of the Trac wiki markup in more depth:
    16  - TracLinks covers all the possible ways to refer precisely to any Trac resource or parts thereof,
    17  - WikiPageNames talks about the various names a wiki page can take, CamelCase or not
    18  - WikiMacros lists the macros available for generating dynamic content,
    19  - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways
    20 
    21 
    22 == Cheatsheet ==
     4[[TranslatedPages]]
     5
     6Wiki markup is a core feature in Trac, tightly integrating all the other parts of Trac into a flexible and unified whole.
     7
     8Trac has a powerful wiki rendering engine that implements a subset of the commands from other popular Wikis, such as [https://moinmo.in/ MoinMoin] and [trac:WikiCreole].
     9
     10The sections below provide an overview for the most common syntax, each link in the ''Category'' column leads you to the more detailed explanation later in this page.
     11
     12The following wiki pages present the advanced features of the Trac wiki markup in more depth:
     13 - TracLinks covers all the possible ways to refer to any Trac resource or parts thereof.
     14 - WikiPageNames covers the various names a wiki page can take, whether in CamelCase or not.
     15 - WikiMacros lists the macros available for generating dynamic content.
     16 - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways.
     17 - [trac:wiki:TracDev/Proposals/AdvancedWikiOperations AdvancedWikiOperations] provides some operations in uncommon or administrative scenarios.
     18
     19== Common wiki markup
    2320
    2421||= '''Category''' =||= '''Wiki Markup''' =||= '''Display''' =||
     
    2926|| `'''bold'''`, `''italic''`, `'''''Wikipedia style'''''` || \
    3027|| '''bold''', ''italic'', '''''Wikipedia style''''' ||
    31 || {{{`monospaced and ''nowiki''`}}} || \
    32 || `monospaced and nowiki` ||
    3328|| `**bold**`, `//italic//`, `**//!WikiCreole style//**` || \
    3429|| **bold**, //italic//, **//!WikiCreole style//** ||
     30|| {{{`monospaced (''other markup ignored'')`}}} || \
     31|| `monospaced (''other markup ignored'')` ||
    3532|-----------------------------------------------------------
    3633||= [#Headings Headings] =||\
    37 {{{#!td 
    38  {{{
    39  == Level 2 ==
     34{{{#!td
     35 {{{
     36 == Level 2
    4037 === Level 3 ^([#hn note])^
    4138 }}}
     
    6562{{{#!td
    6663 {{{
    67  * bullets list
    68    on multiple paragraphs
     64 * bullet list
     65   on multiple lines
    6966   1. nested list
    70      a. different numbering 
     67     a. different numbering
    7168        styles
    7269 }}}
    7370}}}
    7471{{{#!td
    75 * bullets list
    76   on multiple paragraphs
     72* bullet list
     73  on multiple lines
    7774  1. nested list
    7875    a. different numbering
     
    8683 {{{
    8784  term:: definition on
    88          multiple paragraphs
     85         multiple lines
    8986 }}}
    9087}}}
    9188{{{#!td
    9289 term:: definition on
    93         multiple paragraphs
     90        multiple lines
    9491}}}
    9592|-----------------------------------------------------------
     
    9895 {{{
    9996 {{{
    100  multiple lines, ''no wiki''
     97 multiple lines, ''no wiki'',
    10198       white space respected
    10299 }}}
     
    105102{{{#!td
    106103 {{{
    107  multiple lines, ''no wiki''
     104 multiple lines, ''no wiki'',
    108105       white space respected
    109106 }}}
     
    149146[#Links Links]
    150147}}}
    151 || `http://trac.edgewall.org` ||\
    152 || http://trac.edgewall.org ||
     148|| `https://trac.edgewall.org` ||\
     149|| https://trac.edgewall.org ||
    153150|| `WikiFormatting (CamelCase)` ||\
    154151|| WikiFormatting (CamelCase) ||
     
    161158|| `#1 (ticket)`, `[1] (changeset)`, `{1} (report)` ||\
    162159|| #1 (ticket), [1] (changeset), {1} (report) ||
    163 || `ticket:1, ticket:1#comment:1` ||\
    164 || ticket:1, ticket:1#comment:1 ||
     160|| `ticket:1, ticket:1#comment:1, comment:1:ticket:1` ||\
     161|| ticket:1, ticket:1#comment:1, comment:1:ticket:1 ||
    165162|| `Ticket [ticket:1]`, `[ticket:1 ticket one]` ||\
    166163|| Ticket [ticket:1], [ticket:1 ticket one] ||
     
    169166|-----------------------------------------------------------
    170167{{{#!th rowspan=2
    171 [#EscapingLinksandWikiPageNames Escaping Markup]
     168[#SettingAnchors Setting Anchors]
     169}}}
     170|| `[=#point1 (1)] First...` ||\
     171|| [=#point1 (1)] First... ||
     172|| `see [#point1 (1)]` ||\
     173|| see [#point1 (1)] ||
     174|-----------------------------------------------------------
     175{{{#!th rowspan=3
     176[#Escaping Escaping Markup]
    172177}}}
    173178|| `!'' doubled quotes` ||\
     
    175180|| `!wiki:WikiFormatting`, `!WikiFormatting` ||\
    176181|| !wiki:WikiFormatting, !WikiFormatting ||
     182|| [[html(<code>`{{{-}}}` triple curly brackets</code>)]] ||\
     183|| `{{{-}}}` triple curly brackets ||
    177184|-----------------------------------------------------------
    178185||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] ||
     
    187194{{{#!td
    188195 {{{
    189  {{{
    190  #!div style="font-size: 80%"
     196 {{{#!div style="font-size: 80%"
    191197 Code highlighting:
    192198   {{{#!python
     
    197203}}}
    198204{{{#!td style="padding-left: 2em"
    199  {{{
    200  #!div style="font-size: 80%"
     205 {{{#!div style="font-size: 80%"
    201206 Code highlighting:
    202    {{{#!python 
     207   {{{#!python
    203208   hello = lambda: "world"
    204209   }}}
     
    214219 }}}
    215220}}}
    216 {{{#!td style="padding-left: 2em"
    217  {{{#!comment
    218  Note to Editors: ...
    219  }}}
    220 }}}
     221||  ''(comment is shown in edit mode only)''  ||
    221222|-----------------------------------------------------------
    222223||= [#Miscellaneous Miscellaneous] =||\
    223224{{{#!td
    224225 {{{
    225  Line [[br]] break 
     226 Line [[br]] break
    226227 Line \\ break
    227228 ----
     
    234235}}}
    235236
    236 
    237 == Font Styles ==
     237== Font Styles
    238238
    239239The Trac wiki supports the following font styles:
     
    241241{{{#!td
    242242  {{{
    243    * '''bold''', 
    244      ''' triple quotes !''' 
    245      can be bold too if prefixed by ! ''', 
     243   * '''bold''',
     244     ''' triple quotes !'''
     245     can be bold too if prefixed by ! ''',
    246246   * ''italic''
    247247   * '''''bold italic''''' or ''italic and
     
    251251     (hence `{{{` or {{{`}}} quoting)
    252252   * ~~strike-through~~
    253    * ^superscript^ 
     253   * ^superscript^
    254254   * ,,subscript,,
    255    * **also bold**, //italic as well//, 
     255   * **also bold**, //italic as well//,
    256256     and **'' bold italic **'' //(since 0.12)//
    257   }}}
    258 }}}
    259 {{{#!td
    260  * '''bold''',
    261    ''' triple quotes !'''
    262    can be bold too if prefixed by ! ''',
     257   * [[span(style=color: #FF0000, a red text )]]
     258  }}}
     259}}}
     260{{{#!td
     261 * '''bold''',
     262   ''' triple quotes !'''
     263   can be bold too if prefixed by ! ''',
    263264 * ''italic''
    264265 * '''''bold italic''''' or ''italic and
     
    268269   (hence `{{{` or {{{`}}} quoting)
    269270 * ~~strike-through~~
    270  * ^superscript^ 
     271 * ^superscript^
    271272 * ,,subscript,,
    272  * **also bold**, //italic as well//, 
     273 * **also bold**, //italic as well//,
    273274   and **'' bold italic **'' //(since 0.12)//
     275 * [[span(style=color: #FF0000, a red text )]]
    274276}}}
    275277
    276278Notes:
    277279 * `{{{...}}}` and {{{`...`}}} commands not only select a monospace font, but also treat their content as verbatim text, meaning that no further wiki processing is done on this text.
    278  * {{{ ! }}} tells wiki parser to not take the following characters as wiki format, so pay attention to put a space after !, e.g. when ending bold.
    279  * all the font styles marks have to be used in opening/closing pairs,
    280    and they must nest properly (in particular, an `''` italic can't be paired
    281    with a `//` one, and `'''` can't be paired with `**`)
    282 
    283 
    284 == Headings ==
    285 
    286 You can create heading by starting a line with one up to six ''equal'' characters ("=")
    287 followed by a single space and the headline text.
    288 
    289 [=#hn] The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
     280 * {{{ ! }}} tells wiki parser to not take the following characters as wiki format, so pay attention to put a space after `!`, e.g. when ending bold.
     281 * all the font styles marks have to be used in opening/closing pairs,
     282   and they must nest properly; in particular, an `''` italic can't be paired
     283   with a `//` one, and `'''` can't be paired with `**`.
     284
     285== Headings
     286
     287You can create a heading by starting a line with one up to six ''equal'' characters (`=`) followed by a single space and the headline text.
     288
     289[=#hn]
     290The headline text can be followed by the same number of `=` characters, but this is not mandatory. That is, `=== Section3 ===` is identical to `=== Section3`.
    290291
    291292Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
     
    304305  {{{
    305306  #!div
     307  = Heading =
    306308  == Subheading
    307309  === About ''this'' ===
     
    311313}}}
    312314
    313 == Paragraphs ==
     315== Paragraphs
    314316
    315317A new text paragraph is created whenever two blocks of text are separated by one or more empty lines.
     
    325327  one
    326328
    327   Paragraph 
     329  Paragraph
    328330  two
    329331  }}}
     
    332334  Line 1[[BR]]Line 2
    333335
    334   Paragraph 
     336  Paragraph
    335337  one
    336338
    337   Paragraph 
     339  Paragraph
    338340  two
    339341}}}
    340342
    341 == Lists ==
     343== Lists
    342344
    343345The wiki supports both ordered/numbered and unordered lists.
    344346
    345 Example:
    346347||= Wiki Markup =||= Display =||
    347348{{{#!td
     
    349350   * Item 1
    350351     * Item 1.1
    351         * Item 1.1.1   
     352        * Item 1.1.1
    352353        * Item 1.1.2
    353354        * Item 1.1.3
     
    356357  - items can start at the beginning of a line
    357358    and they can span multiple lines
    358     - be careful though to continue the line 
     359    - be careful though to continue the line
    359360    with the appropriate indentation, otherwise
    360361  that will start a new paragraph...
    361  
     362
    362363   1. Item 1
    363364     a. Item 1.a
     
    374375 * Item 1
    375376   * Item 1.1
    376       * Item 1.1.1   
     377      * Item 1.1.1
    377378      * Item 1.1.2
    378379      * Item 1.1.3
     
    381382- items can start at the beginning of a line
    382383  and they can span multiple lines
    383   - be careful though to continue the line 
     384  - be careful though to continue the line
    384385  with the appropriate indentation, otherwise
    385386that will start a new paragraph...
     
    395396}}}
    396397
    397 
    398 == Definition Lists ==
     398== Definition Lists
    399399
    400400The wiki also supports definition lists.
     
    420420Note that you need a space in front of the defined term.
    421421
    422 
    423 == Preformatted Text ==
     422== Preformatted Text
    424423
    425424Block 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.
    426  
     425
    427426||= Wiki Markup =||= Display =||
    428427{{{#!td
     
    443442Note that this kind of block is also used for selecting lines that should be processed through WikiProcessors.
    444443
    445 == Blockquotes ==
     444== Blockquotes
    446445
    447446In order to mark a paragraph as blockquote, indent that paragraph with two spaces.
     
    459458}}}
    460459
    461 == Discussion Citations ==
    462 
    463 To delineate a citation in an ongoing discussion thread, such as the ticket comment area, e-mail-like citation marks (">", ">>", etc.) may be used. 
     460== Discussion Citations
     461
     462To delineate a citation in an ongoing discussion thread, such as the ticket comment area, email-like citation marks (`>`, `>>`, etc.) may be used.
    464463
    465464||= Wiki Markup =||= Display =||
     
    479478}}}
    480479
    481 
    482 == Tables ==
    483 === Simple Tables ===
    484 Simple tables can be created like this:
     480== Tables
     481=== Simple Tables
     482
     483Simple tables can be created:
    485484||= Wiki Markup =||= Display =||
    486485{{{#!td
     
    495494}}}
    496495
    497 Cell headings can be specified by wrapping the content in a pair of '=' characters.
    498 Note that the '=' characters have to stick to the cell separators, like this:
     496Cell headings can be specified by wrapping the content in a pair of `=` characters.
     497Note that the `=` characters have to stick to the cell separators:
    499498||= Wiki Markup =||= Display =||
    500499{{{#!td
     
    511510}}}
    512511
    513 Finally, specifying an empty cell means that the next non empty cell will span the empty cells. For example:
     512Finally, specifying an empty cell means that the next non empty cell will span the empty cells:
    514513||= Wiki Markup =||= Display =||
    515514{{{#!td
     
    528527}}}
    529528
    530 Note that if the content of a cell "sticks" to one side of the cell and only one, then the text will be aligned on that side. Example:
     529Note that if the content of a cell sticks to one side of the cell and only one, then the text will be aligned on that side:
    531530||= Wiki Markup =||= Display =||
    532531{{{#!td
     
    553552}}}
    554553
    555 If contrary to the example above, the cells in your table contain more text, it might be convenient to spread a table row over multiple lines of markup. The `\` character placed at the end of a line after a cell separator tells Trac to not start a new row for the cells on the next line.
     554If contrary to the example above, the cells in your table contain more text, it might be convenient to spread a table row over multiple lines of markup. The `\` character placed at the end of a line after a cell separator tells Trac to not start a new row for the cells on the next line:
    556555
    557556||= Wiki Markup =||
    558557{{{#!td
    559558  {{{
    560   || this is column 1 [http://trac.edgewall.org/newticket new ticket] || \
    561   || this is column 2 [http://trac.edgewall.org/roadmap the road ahead] || \
     559  || this is column 1 [https://trac.edgewall.org/newticket new ticket] || \
     560  || this is column 2 [https://trac.edgewall.org/roadmap the road ahead] || \
    562561  || that's column 3 and last one ||
    563562  }}}
     
    566565||= Display =||
    567566{{{#!td style="padding: 2em;"
    568 || this is column 1 [http://trac.edgewall.org/newticket new ticket] || \
    569 || this is column 2 [http://trac.edgewall.org/roadmap the road ahead] || \
     567|| this is column 1 [https://trac.edgewall.org/newticket new ticket] || \
     568|| this is column 2 [https://trac.edgewall.org/roadmap the road ahead] || \
    570569|| that's column 3 and last one ||
    571570}}}
    572571
    573 === Complex Tables ===
    574 
    575 If the possibilities offered by the simple "pipe"-based markup for tables described above are not enough for your needs, you can create more elaborated tables by using [#Processors-example-tables WikiProcessor based tables].
    576 
    577 
    578 == Links ==
    579 
    580 Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark "!" character, such as {{{!WikiPageLink}}}.
    581 
    582 ||= Wiki Markup =||= Display =||
    583 {{{#!td
    584   {{{
    585   TitleIndex, http://www.edgewall.com/, !NotAlink
    586   }}}
    587 }}}
    588 {{{#!td
    589 TitleIndex, http://www.edgewall.com/, !NotAlink
    590 }}}
    591 
    592 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.
     572=== Complex Tables
     573
     574If the possibilities offered by the simple pipe-based markup (`||`) for tables described above are not enough for your needs, you can create more elaborate tables by using [#Processors-example-tables WikiProcessor based tables].
     575
     576== Links
     577
     578Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark (`!`), such as `!WikiPageLink`.
     579
     580||= Wiki Markup =||= Display =||
     581{{{#!td
     582  {{{
     583  TitleIndex, https://www.edgewall.com/, !NotAlink
     584  }}}
     585}}}
     586{{{#!td
     587TitleIndex, https://www.edgewall.com/, !NotAlink
     588}}}
     589
     590Links can be given a more descriptive title by writing the link followed by a space and a title and all this inside square brackets.
    593591If the descriptive title is omitted, then the explicit prefix is discarded, unless the link is an external link. This can be useful for wiki pages not adhering to the WikiPageNames convention.
    594592
     
    596594{{{#!td
    597595  {{{
    598    * [http://www.edgewall.com Edgewall Software]
    599    * [wiki:TitleIndex Title Index] 
    600    * [wiki:TitleIndex] 
     596   * [https://www.edgewall.com Edgewall Software]
     597   * [wiki:TitleIndex Title Index]
     598   * [wiki:TitleIndex]
    601599   * [wiki:ISO9000]
    602600  }}}
    603601}}}
    604602{{{#!td
    605    * [http://www.edgewall.com Edgewall Software]
    606    * [wiki:TitleIndex Title Index] 
    607    * [wiki:TitleIndex] 
     603   * [https://www.edgewall.com Edgewall Software]
     604   * [wiki:TitleIndex Title Index]
     605   * [wiki:TitleIndex]
    608606   * [wiki:ISO9000]
    609607}}}
    610608
    611 Following the [trac:WikiCreole] trend, the descriptive title can also be specified by writing the link followed by a pipe ('|') and a title and all this inside //double// square brackets.
    612 
    613 {{{#!td
    614   {{{
    615    * [[http://www.edgewall.com|Edgewall Software]]
     609Following the [trac:WikiCreole] trend, the descriptive title can also be specified by writing the link followed by a pipe (`|`) and a title and all this inside //double// square brackets.
     610
     611{{{#!td
     612  {{{
     613   * [[https://www.edgewall.com|Edgewall Software]]
    616614   * [[wiki:TitleIndex|Title Index]]
    617615     or even [[TitleIndex|Title Index]]
     
    622620}}}
    623621{{{#!td
    624    * [[http://www.edgewall.com|Edgewall Software]]
     622   * [[https://www.edgewall.com|Edgewall Software]]
    625623   * [[wiki:TitleIndex|Title Index]]
    626624     or even [[TitleIndex|Title Index]]
     
    630628}}}
    631629
    632 '''Note''': the [trac:WikiCreole] style for links is quick to type and
    633 certainly looks familiar as it's the one used on Wikipedia and in many
    634 other wikis. Unfortunately it conflicts with the syntax for [#Macros macros].
    635 So in the rare case when you need to refer to a page which is named after
    636 a macro (typical examples being TitleIndex, InterTrac and InterWiki),
    637 by writing `[[TitleIndex]]` you will actually call the macro instead of linking
    638 to the page.
    639 
    640 == Trac Links ==
     630'''Note''': the [trac:WikiCreole] style for links is quick to type and certainly looks familiar as it is the one used on Wikipedia and in many other wikis. Unfortunately it conflicts with the syntax for [#Macros macros].
     631So in the rare case when you need to refer to a page which is named after a macro (typical examples being TitleIndex, InterTrac and InterWiki), by writing `[[TitleIndex]]` you will actually call the macro instead of linking to the page.
     632
     633== Trac Links
    641634
    642635Wiki 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:
     
    649642   * Changesets: r1, [1] or changeset:1
    650643   * ...
    651    * targeting other Trac instances, 
     644   * targeting other Trac instances,
    652645     so called InterTrac links:
    653646     - Tickets: #Trac1 or Trac:ticket:1
     
    659652 * Reports: {1} or report:1
    660653 * Changesets: r1, [1] or changeset:1
    661  * ... 
    662  * targeting other Trac instances, 
     654 * ...
     655 * targeting other Trac instances,
    663656   so called InterTrac links:
    664657   - Tickets: #Trac1 or Trac:ticket:1
     
    668661There are many more flavors of Trac links, see TracLinks for more in-depth information and a reference for all the default link resolvers.
    669662
    670 
    671 == Escaping Links and WikiPageNames ==
    672 
    673 You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
     663== Setting Anchors
     664
     665An anchor, or more correctly speaking, an [https://www.w3.org/TR/REC-html40/struct/links.html#h-12.2.1 anchor name] can be added explicitly at any place in the Wiki page, to uniquely identify a position in the document:
     666
     667{{{
     668[=#point1]
     669}}}
     670
     671This syntax was chosen to match the format for explicitly naming the header id [#Headings documented above]:
     672{{{
     673== Long title == #title
     674}}}
     675
     676It is also very close to the syntax for the corresponding link to that anchor:
     677{{{
     678[#point1]
     679}}}
     680
     681Optionally, a label can be given to the anchor:
     682{{{
     683[=#point1 '''Point 1''']
     684}}}
     685
     686||= Wiki Markup =||= Display =||
     687|----------------------------------
     688{{{#!td
     689  {{{
     690  [#point2 jump to the second point]
     691
     692  ...
     693
     694  Point2:  [=#point2] Jump here
     695  }}}
     696}}}
     697{{{#!td
     698  [#point2 jump to the second point]
     699
     700  ...
     701
     702  Point2:  [=#point2] Jump here
     703}}}
     704
     705For more complex anchors (eg when a custom title is wanted), you can use the Span macro: `[[span(id=point2, class=wikianchor, title=Point 2, ^(2)^)]]`.
     706
     707== Escaping Links, WikiPageNames and other Markup == #Escaping
     708
     709You may avoid making hyperlinks out of TracLinks by preceding an expression with a single exclamation mark (`!`).
    674710
    675711||= Wiki Markup =||= Display =||
     
    679715   !#42 is not a link
    680716  }}}
     717  {{{
     718Various forms of escaping for list markup:
     719 ^^- escaped minus sign \\
     720 ^^1. escaped number  \\
     721 ^^* escaped asterisk sign
     722  }}}
    681723}}}
    682724{{{#!td
    683725 !NoHyperLink
    684726 !#42 is not a link
    685 }}}
    686 
    687 == Images ==
     727
     728Various forms of escaping for list markup:
     729 ^^- escaped minus sign \\
     730 ^^1. escaped number  \\
     731 ^^* escaped asterisk sign
     732}}}
     733
     734== Images
    688735
    689736Urls ending with `.png`, `.gif` or `.jpg` are no longer automatically interpreted as image links, and converted to `<img>` tags.
     
    694741 * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page)
    695742 * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket)
    696  * `[[Image(htdocs:picture.gif)]]` (referring to a file inside project htdocs)
     743 * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
    697744 * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
    698745
     
    707754}}}
    708755
    709 See WikiMacros for further documentation on the `[[Image()]]` macro.
    710 
    711 
    712 == Macros ==
    713 
    714 Macros are ''custom functions'' to insert dynamic content in a page.
     756See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
     757
     758== Macros
     759
     760Macros are ''custom functions'' that insert dynamic content in a page.
    715761
    716762||= Wiki Markup =||= Display =||
     
    726772See WikiMacros for more information, and a list of installed macros.
    727773
    728 The detailed help for a specific macro can also be obtained more directly by appending a "?" to the macro name.
     774The detailed help for a specific macro can also be obtained more directly by appending a `?` to the macro name.
    729775
    730776||= Wiki Markup =||= Display =||
     
    738784}}}
    739785
    740 
    741 == Processors ==
    742 
    743 Trac supports alternative markup formats using WikiProcessors. For example, processors are used to write pages in
    744 [wiki:WikiRestructuredText reStructuredText] or [wiki:WikiHtml HTML].
     786== Processors
     787
     788Trac supports alternative markup formats using WikiProcessors. For example, processors are used to write pages in
     789[wiki:WikiRestructuredText reStructuredText] or [wiki:WikiHtml HTML].
    745790
    746791||= Wiki Markup =||= Display =||
     
    754799{{{#!td style="border: 0px"
    755800  {{{
    756   {{{
    757   #!html
     801  {{{#!html
    758802  <h1 style="text-align: right; color: blue">
    759803   HTML Test
     
    764808{{{#!td valign="top"  style="border: 0px"
    765809
    766 {{{
    767 #!html
     810{{{#!html
    768811<h1 style="text-align: right; color: blue">HTML Test</h1>
    769812}}}
     
    779822{{{#!td style="border: 0px"
    780823  {{{
    781   {{{
    782   #!python
     824  {{{#!python
    783825  class Test:
    784  
     826
    785827      def __init__(self):
    786828          print "Hello World"
     
    790832  }}}
    791833}}}
    792 {{{
    793 #!td valign="top"  style="border: 0px"
    794 
    795 {{{
    796 #!python
     834{{{#!td valign="top"  style="border: 0px"
     835
     836{{{#!python
    797837class Test:
    798838    def __init__(self):
     
    824864  |----------------
    825865  {{{#!td
    826   As processors can be easily nested, 
     866  As processors can be easily nested,
    827867  so can be tables:
    828868    {{{#!th
     
    841881  }}}
    842882}}}
    843 {{{
    844 #!td  valign="top"  style="border: 0px"
     883{{{#!td  valign="top"  style="border: 0px"
    845884
    846885  {{{#!th rowspan=4 align=justify
     
    856895  |----------------
    857896  {{{#!td
    858   As processors can be easily nested, 
     897  As processors can be easily nested,
    859898  so can be tables:
    860899    {{{#!th
     
    876915See WikiProcessors for more information.
    877916
    878 
    879 == Comments ==
     917== Comments
    880918
    881919Comments can be added to the plain text. These will not be rendered and will not display in any other format than plain text.
     
    885923  {{{
    886924  Nothing to
    887   {{{
    888   #!comment
     925  {{{#!comment
    889926  Your comment for editors here
    890927  }}}
    891   see ;-)
     928  see.
    892929  }}}
    893930}}}
    894931{{{#!td
    895932  Nothing to
    896   {{{
    897   #!comment
     933  {{{#!comment
    898934  Your comment for editors here
    899935  }}}
    900   see ;-)
    901 }}}
    902 
    903 == Miscellaneous ==
    904 
    905 An horizontal line can be used to separated different parts of your page:
    906 
    907 ||= Wiki Markup =||= Display =||
    908 {{{#!td
    909   {{{
    910   Four or more dashes will be replaced
    911   by an horizontal line (<HR>)
     936  see.
     937}}}
     938
     939== Miscellaneous
     940
     941||= Wiki Markup =||= Display =||
     942{{{#!td
     943  Horizontal line:
     944  {{{
     945  Four or more dashes will be replaced
     946  by a horizontal line (<HR>)
    912947  ----
    913948  See?
     
    916951{{{#!td
    917952Four or more dashes will be replaced
    918 by an horizontal line (<HR>)
     953by a horizontal line (<HR>)
    919954----
    920955See?
     
    922957|----------------------------------
    923958{{{#!td
    924   {{{
    925   "macro" style [[br]] line break
    926   }}}
    927 }}}
    928 {{{#!td
    929 "macro" style [[br]] line break
     959  Two examples of line breaks:
     960  {{{
     961  "macro" style [[BR]] line break
     962  }}}
     963  or:
     964  {{{
     965  !WikiCreole style \\ line\\break
     966  }}}
     967}}}
     968{{{#!td
     969"macro" style [[BR]] line break
     970
     971!WikiCreole style \\ line\\break
    930972}}}
    931973|----------------------------------
    932 {{{#!td
    933   {{{
    934   !WikiCreole style \\ line\\break
    935   }}}
    936 }}}
    937 {{{#!td
    938 !WikiCreole style \\ line\\break
    939 }}}