Overview
SHA1 Hash: | 3beb38596487a1e6d0de06c24a096d5c47f5912a |
---|---|
Date: | 2008-05-24 16:02:14 |
User: | drh |
Comment: | Clarification of wiki formatting rules. |
Timelines: | ancestors | descendants | both | trunk |
Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/wiki.c from [09891f13ef] to [4931ce9b65].
@@ -502,12 +502,13 @@ void wikirules_page(void){ style_header("Wiki Formatting Rules"); @ <h2>Formatting Rule Summary</h2> @ <ol> @ <li> Blank lines are paragraph breaks - @ <li> Bullet list items are a "*" at the beginning of the line. - @ <li> Enumeration list items are a number at the beginning of a line. + @ <li> Bullets are "*" surrounded by two spaces at the beginning of the line. + @ <li> Enumeration items a number surrounded by two space + @ at the beginning of a line. @ <li> Indented pargraphs begin with a tab or two spaces. @ <li> Hyperlinks are contained with square brackets: "[target]" @ <li> Most ordinary HTML works. @ <li> <verbatim> and <nowiki>. @ </ol> @@ -518,16 +519,18 @@ @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms @ a paragraph break. Centered or right-justified paragraphs are not @ supported by wiki markup, but you can do these things if you need them @ using HTML.</p> @ <li> <p><b>Bullet Lists</b>. - @ A bullet list item begins with a single "*" character surrounded on + @ A bullet list item are lines that begin with a single "*" character + @ surrounded on @ both sides by two or more spaces or by a tab. Only a single level @ of bullet list is supported by wiki. For tested lists, use HTML.</p> @ <li> <p><b>Enumeration Lists</b>. - @ An enumeration list item begins with one or more digits optionally - @ followed by a "." surrounded on both sides by two or more spaces or + @ An enumeration list items are lines that begin + @ with one or more digits optionally + @ followed by a "." and surrounded on both sides by two or more spaces or @ by a tab. The number is significant and becomes the number shown @ in the rendered enumeration item. Only a single level of enumeration @ list is supported by wiki. For nested enumerations or for @ enumerations that count using letters or roman numerials, use HTML.</p> @ <li> <p><b>Indented Paragraphs</b>. @@ -590,12 +593,13 @@ @ In addition, there are two non-standard elements available: @ <verbatim> and <nowiki>. @ No other elements are allowed. All attributes are checked and @ only a few benign attributes are allowed on each element. @ In particular, any attributes that specify javascript or CSS - @ are elided.</p> - @ <p>The <verbatim> tag disables all wiki and HTML markup + @ are elided.</p></li> + @ <li><p><b>Special Markup.</b> + @ The <verbatim> tag disables all wiki and HTML markup @ up through the next </verbatim>. The <nowiki> tag @ disables all wiki formatting rules through the matching @ </nowiki> element. @ </ol> style_footer();