[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.3,1.4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8178

Modified Files:
	TextFormattingRules 
Log Message:
Updated rules for the 1.1.8 release.

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TextFormattingRules	2000/06/02 23:37:56	1.3
--- TextFormattingRules	2000/10/23 12:53:01	1.4
***************
*** 1,90 ****
  '''Paragraphs'''

! 	* Don't Indent paragraphs

- 	* Words wrap and fill as needed

- 	* Use blank lines as separators
- 
- 	* Four or more minus signs make a horizontal rule
- 
- 	* %%''''% makes a linebreak (in headings and lists too)
- 
- 
  '''Lists'''
- 
- 	* tab-* for first level
- 
- 		* tab-tab-* for second level, etc.
- 
- 	* Use * for bullet lists, 1. for numbered lists (mix at will)

! 	* tab-Term:-tab Definition for definition lists

- 	* One line for each item
- 
- 	* Other leading whitespace signals preformatted text, changes font.
- 
- 
  '''Headings'''
- 
- 	* '!' at the start of a line makes a small heading

! 	* '!!' at the start of a line makes a medium heading 

- 	* '!!!' at the start of a line makes a large heading
- 
- 
  '''Fonts'''
! 	* Indent with one or more spaces to use a monospace font:

   This is in monospace
  This is not

- 
  '''Indented Paragraphs'''
  ''(Quotes)''

! 	* tab-space-:-tab -- often used (with emphasis) for quotations.  (See SimulatingQuoteBlocks)

  '''Emphasis'''

! 	* Use doubled single-quotes ('') for emphasis (usually italics)

! 	* Use tripled single-quotes (''') for strong emphasis (usually bold)

- 	* Use five single-quotes ('''''), or triples within doubles, for some other kind of emphasis (BoldItalicInWiki), but be careful about the bugs in the Wiki emphasis logic...
- 
- 	* Emphasis can be used multiple times within a line, but cannot cross line boundaries
- 
- 
  '''References'''
! 	* Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link]
! 
! 	* Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! 
! 	* You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/]  
! 
! 	* Old Wiki linking is still supported: JoinCapitalizedWords to make local references
! 
! 	* You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
! 
! 	* [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
! 
! 	* Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
! 
! 	* URLs ending with .png are inlined ''if inserted as a remote reference'' 
! 
! 
! '''Mark-Up Language'''
! 
! 	* Don't bother
! 
! 	* < and > are themselves

- 	* The & characters will not work

! 	* If you really must use HTML, start each line with a bar (|). Note that this featured must be enabled by the system administrator.

--- 1,64 ----
  '''Paragraphs'''

! * Don't indent paragraphs
! * Words wrap and fill as needed
! * Use blank lines as separators
! * Four or more minus signs make a horizontal rule
! * %%''''% makes a linebreak (in headings and lists too)

  '''Lists'''

! * asterick for first level
! ** asterick-asterick for second level, etc.
! * Use * for bullet lists, # for numbered lists (mix at will)
! * tab-Term:-tab Definition for definition lists
! * One line for each item
! * Other leading whitespace signals preformatted text, changes font.

  '''Headings'''

! * '!' at the start of a line makes a small heading
! * '!!' at the start of a line makes a medium heading 
! * '!!!' at the start of a line makes a large heading

  '''Fonts'''
! * Indent with one or more spaces to use a monospace font:

   This is in monospace
  This is not

  '''Indented Paragraphs'''
  ''(Quotes)''

! * tab-space-:-tab -- often used (with emphasis) for quotations.

  '''Emphasis'''

! * Use doubled single-quotes ('') for emphasis (usually italics)
! * Use doubled underscores (__) for strong emphasis (usually bold)
! * Mix them at will: ''__bold italics__''
! * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries:

! ''this
! will not work''

  '''References'''
! * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
! * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/]  
! * You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
! * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
! * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
! * URLs ending with .png, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/png.png]

! '''HTML Mark-Up Language'''
! 
! * Don't bother
! * < and > are themselves
! * The & characters will not work
! * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.