[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.17,1.18

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv25064/phpwiki/pgsrc

Modified Files:
	TextFormattingRules 
Log Message:
Moved the TextFormattingRules from the editpage template to the actual TFR page. The IncludePage plugin is now used to insert the first 6 lines of the TFR page for reference. This eliminates any requirement to modify the templates when localizing for another language, and allows for easy online customization (the TFR page is still locked by default).

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** TextFormattingRules	2001/12/16 15:49:26	1.17
--- TextFormattingRules	2001/12/16 16:52:50	1.18
***************
*** 1,7 ****
! From [no address given]  Sun Dec 16 07:34:01 2001
  Subject: TextFormattingRules
  From: [no address given] (PhpWiki)
! Date: Wed, 12 Dec 2001 07:56:52 -0800
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2pre)
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
--- 1,7 ----
! From [no address given]  Sun Dec 16 11:36:09 2001
  Subject: TextFormattingRules
  From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 11:34:12 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
***************
*** 9,12 ****
--- 9,27 ----
  Content-Transfer-Encoding: quoted-printable
  
+ __Emphasis:__ '____' for ''italics'', _''''_ for __bold__, '____'_''''_ =
+ for ''__both__''%%%
+ __Lists:__ * for bullet lists, # for numbered lists, "; term : definition" =
+ for definition lists%%%
+ __References:__ !JoinCapitalizedWords or use square brackets for a [[page =
+ link] or URL [[!http://cool.wiki.int/].%%%
+ __Footnotes:__ Use [[1],[[2],[[3],...%%%
+ __Preventing linking__ Prefix with "!": !!DoNotHyperlink, name links like =
+ [[text | URL] (double up on the "[")%%%
+ __Misc__ "!", "!!", "!!!" make headings, "%%''''%" makes a linebreak, =
+ "-''''-''''-''''-" makes a horizontal rule
+ 
+ ''[[__Note:__ the first six lines of this page will appear on the Edit =
+ page.]''
+ ----
  ! Paragraphs