Fossil SCM
Clarification of wiki formatting rules.
Commit
3beb38596487a1e6d0de06c24a096d5c47f5912a
Parent
3dce979214cc309…
1 file changed
+11
-7
+11
-7
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -502,12 +502,13 @@ | ||
| 502 | 502 | void wikirules_page(void){ |
| 503 | 503 | style_header("Wiki Formatting Rules"); |
| 504 | 504 | @ <h2>Formatting Rule Summary</h2> |
| 505 | 505 | @ <ol> |
| 506 | 506 | @ <li> Blank lines are paragraph breaks |
| 507 | - @ <li> Bullet list items are a "*" at the beginning of the line. | |
| 508 | - @ <li> Enumeration list items are a number at the beginning of a line. | |
| 507 | + @ <li> Bullets are "*" surrounded by two spaces at the beginning of the line. | |
| 508 | + @ <li> Enumeration items a number surrounded by two space | |
| 509 | + @ at the beginning of a line. | |
| 509 | 510 | @ <li> Indented pargraphs begin with a tab or two spaces. |
| 510 | 511 | @ <li> Hyperlinks are contained with square brackets: "[target]" |
| 511 | 512 | @ <li> Most ordinary HTML works. |
| 512 | 513 | @ <li> <verbatim> and <nowiki>. |
| 513 | 514 | @ </ol> |
| @@ -518,16 +519,18 @@ | ||
| 518 | 519 | @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms |
| 519 | 520 | @ a paragraph break. Centered or right-justified paragraphs are not |
| 520 | 521 | @ supported by wiki markup, but you can do these things if you need them |
| 521 | 522 | @ using HTML.</p> |
| 522 | 523 | @ <li> <p><b>Bullet Lists</b>. |
| 523 | - @ A bullet list item begins with a single "*" character surrounded on | |
| 524 | + @ A bullet list item are lines that begin with a single "*" character | |
| 525 | + @ surrounded on | |
| 524 | 526 | @ both sides by two or more spaces or by a tab. Only a single level |
| 525 | 527 | @ of bullet list is supported by wiki. For tested lists, use HTML.</p> |
| 526 | 528 | @ <li> <p><b>Enumeration Lists</b>. |
| 527 | - @ An enumeration list item begins with one or more digits optionally | |
| 528 | - @ followed by a "." surrounded on both sides by two or more spaces or | |
| 529 | + @ An enumeration list items are lines that begin | |
| 530 | + @ with one or more digits optionally | |
| 531 | + @ followed by a "." and surrounded on both sides by two or more spaces or | |
| 529 | 532 | @ by a tab. The number is significant and becomes the number shown |
| 530 | 533 | @ in the rendered enumeration item. Only a single level of enumeration |
| 531 | 534 | @ list is supported by wiki. For nested enumerations or for |
| 532 | 535 | @ enumerations that count using letters or roman numerials, use HTML.</p> |
| 533 | 536 | @ <li> <p><b>Indented Paragraphs</b>. |
| @@ -590,12 +593,13 @@ | ||
| 590 | 593 | @ In addition, there are two non-standard elements available: |
| 591 | 594 | @ <verbatim> and <nowiki>. |
| 592 | 595 | @ No other elements are allowed. All attributes are checked and |
| 593 | 596 | @ only a few benign attributes are allowed on each element. |
| 594 | 597 | @ In particular, any attributes that specify javascript or CSS |
| 595 | - @ are elided.</p> | |
| 596 | - @ <p>The <verbatim> tag disables all wiki and HTML markup | |
| 598 | + @ are elided.</p></li> | |
| 599 | + @ <li><p><b>Special Markup.</b> | |
| 600 | + @ The <verbatim> tag disables all wiki and HTML markup | |
| 597 | 601 | @ up through the next </verbatim>. The <nowiki> tag |
| 598 | 602 | @ disables all wiki formatting rules through the matching |
| 599 | 603 | @ </nowiki> element. |
| 600 | 604 | @ </ol> |
| 601 | 605 | style_footer(); |
| 602 | 606 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -502,12 +502,13 @@ | |
| 502 | void wikirules_page(void){ |
| 503 | style_header("Wiki Formatting Rules"); |
| 504 | @ <h2>Formatting Rule Summary</h2> |
| 505 | @ <ol> |
| 506 | @ <li> Blank lines are paragraph breaks |
| 507 | @ <li> Bullet list items are a "*" at the beginning of the line. |
| 508 | @ <li> Enumeration list items are a number at the beginning of a line. |
| 509 | @ <li> Indented pargraphs begin with a tab or two spaces. |
| 510 | @ <li> Hyperlinks are contained with square brackets: "[target]" |
| 511 | @ <li> Most ordinary HTML works. |
| 512 | @ <li> <verbatim> and <nowiki>. |
| 513 | @ </ol> |
| @@ -518,16 +519,18 @@ | |
| 518 | @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms |
| 519 | @ a paragraph break. Centered or right-justified paragraphs are not |
| 520 | @ supported by wiki markup, but you can do these things if you need them |
| 521 | @ using HTML.</p> |
| 522 | @ <li> <p><b>Bullet Lists</b>. |
| 523 | @ A bullet list item begins with a single "*" character surrounded on |
| 524 | @ both sides by two or more spaces or by a tab. Only a single level |
| 525 | @ of bullet list is supported by wiki. For tested lists, use HTML.</p> |
| 526 | @ <li> <p><b>Enumeration Lists</b>. |
| 527 | @ An enumeration list item begins with one or more digits optionally |
| 528 | @ followed by a "." surrounded on both sides by two or more spaces or |
| 529 | @ by a tab. The number is significant and becomes the number shown |
| 530 | @ in the rendered enumeration item. Only a single level of enumeration |
| 531 | @ list is supported by wiki. For nested enumerations or for |
| 532 | @ enumerations that count using letters or roman numerials, use HTML.</p> |
| 533 | @ <li> <p><b>Indented Paragraphs</b>. |
| @@ -590,12 +593,13 @@ | |
| 590 | @ In addition, there are two non-standard elements available: |
| 591 | @ <verbatim> and <nowiki>. |
| 592 | @ No other elements are allowed. All attributes are checked and |
| 593 | @ only a few benign attributes are allowed on each element. |
| 594 | @ In particular, any attributes that specify javascript or CSS |
| 595 | @ are elided.</p> |
| 596 | @ <p>The <verbatim> tag disables all wiki and HTML markup |
| 597 | @ up through the next </verbatim>. The <nowiki> tag |
| 598 | @ disables all wiki formatting rules through the matching |
| 599 | @ </nowiki> element. |
| 600 | @ </ol> |
| 601 | style_footer(); |
| 602 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -502,12 +502,13 @@ | |
| 502 | void wikirules_page(void){ |
| 503 | style_header("Wiki Formatting Rules"); |
| 504 | @ <h2>Formatting Rule Summary</h2> |
| 505 | @ <ol> |
| 506 | @ <li> Blank lines are paragraph breaks |
| 507 | @ <li> Bullets are "*" surrounded by two spaces at the beginning of the line. |
| 508 | @ <li> Enumeration items a number surrounded by two space |
| 509 | @ at the beginning of a line. |
| 510 | @ <li> Indented pargraphs begin with a tab or two spaces. |
| 511 | @ <li> Hyperlinks are contained with square brackets: "[target]" |
| 512 | @ <li> Most ordinary HTML works. |
| 513 | @ <li> <verbatim> and <nowiki>. |
| 514 | @ </ol> |
| @@ -518,16 +519,18 @@ | |
| 519 | @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms |
| 520 | @ a paragraph break. Centered or right-justified paragraphs are not |
| 521 | @ supported by wiki markup, but you can do these things if you need them |
| 522 | @ using HTML.</p> |
| 523 | @ <li> <p><b>Bullet Lists</b>. |
| 524 | @ A bullet list item are lines that begin with a single "*" character |
| 525 | @ surrounded on |
| 526 | @ both sides by two or more spaces or by a tab. Only a single level |
| 527 | @ of bullet list is supported by wiki. For tested lists, use HTML.</p> |
| 528 | @ <li> <p><b>Enumeration Lists</b>. |
| 529 | @ An enumeration list items are lines that begin |
| 530 | @ with one or more digits optionally |
| 531 | @ followed by a "." and surrounded on both sides by two or more spaces or |
| 532 | @ by a tab. The number is significant and becomes the number shown |
| 533 | @ in the rendered enumeration item. Only a single level of enumeration |
| 534 | @ list is supported by wiki. For nested enumerations or for |
| 535 | @ enumerations that count using letters or roman numerials, use HTML.</p> |
| 536 | @ <li> <p><b>Indented Paragraphs</b>. |
| @@ -590,12 +593,13 @@ | |
| 593 | @ In addition, there are two non-standard elements available: |
| 594 | @ <verbatim> and <nowiki>. |
| 595 | @ No other elements are allowed. All attributes are checked and |
| 596 | @ only a few benign attributes are allowed on each element. |
| 597 | @ In particular, any attributes that specify javascript or CSS |
| 598 | @ are elided.</p></li> |
| 599 | @ <li><p><b>Special Markup.</b> |
| 600 | @ The <verbatim> tag disables all wiki and HTML markup |
| 601 | @ up through the next </verbatim>. The <nowiki> tag |
| 602 | @ disables all wiki formatting rules through the matching |
| 603 | @ </nowiki> element. |
| 604 | @ </ol> |
| 605 | style_footer(); |
| 606 |