Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory usw-pr-cvs1:/tmp/cvs-serv4426/pgsrc Modified Files: Tag: release-1_2-branch AddingPages HowToUseWiki PhpWikiAdministration TextFormattingRules Log Message: Propagate bug fixes from MAIN CVS branch into the stable release branch. I have not added Arno's new transform.php code. Should we? (Is it functionally equivalent to the old code?) Index: AddingPages =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AddingPages,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** AddingPages 2000年11月06日 16:14:42 1.4 --- AddingPages 2001年02月08日 18:28:31 1.4.2.1 *************** *** 1,3 **** ! To add a new page to Wiki, all you have to do is come up with a meaningful title, capatalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink. Alternatively, you can put anything into [square brackets]. --- 1,3 ---- ! To add a new page to Wiki, all you have to do is come up with a meaningful title, capitalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink. Alternatively, you can put anything into [square brackets]. Index: HowToUseWiki =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HowToUseWiki,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** HowToUseWiki 2000年11月06日 16:14:43 1.4 --- HowToUseWiki 2001年02月08日 18:28:31 1.4.2.1 *************** *** 15,19 **** nothing rhymes with monospacing ! * You can seperate paragraphs with an extra blank line. Example: I am a paragraph. --- 15,19 ---- nothing rhymes with monospacing ! * You can separate paragraphs with an extra blank line. Example: I am a paragraph. Index: PhpWikiAdministration =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWikiAdministration,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** PhpWikiAdministration 2000年11月08日 15:54:00 1.2 --- PhpWikiAdministration 2001年02月08日 18:28:31 1.2.2.1 *************** *** 12,16 **** recent versions of all pages in the PhpWiki. The pages are stored, one per file, as MIME (RFC2045) e-mail (RFC822) messages, with the content type ! application/x-phpwiki for the snapshot and content type mulipart/mixed for the dump. In the latter case, there is one subpart (with type application/x-phpwiki) for each version of the --- 12,16 ---- recent versions of all pages in the PhpWiki. The pages are stored, one per file, as MIME (RFC2045) e-mail (RFC822) messages, with the content type ! application/x-phpwiki for the snapshot and content type multipart/mixed for the dump. In the latter case, there is one subpart (with type application/x-phpwiki) for each version of the Index: TextFormattingRules =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** TextFormattingRules 2000年11月08日 17:07:32 1.8 --- TextFormattingRules 2001年02月08日 18:28:31 1.8.2.1 *************** *** 10,15 **** ! Lists ! * asterick for first level ! ** asterick-asterick for second level, etc. * Use * for bullet lists, # for numbered lists (mix at will) * semicolon-term-colon-definition for definition lists: --- 10,15 ---- ! Lists ! * asterisk for first level ! ** asterisk-asterisk for second level, etc. * Use * for bullet lists, # for numbered lists (mix at will) * semicolon-term-colon-definition for definition lists: *************** *** 52,56 **** * Hyperlinks to external pages are done like this: [http://www.wcsb.org/] * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | FrontPage] ! * You can suppress linking to old-style references and URIs by preceeding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/ * [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/ --- 52,56 ---- * Hyperlinks to external pages are done like this: [http://www.wcsb.org/] * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | FrontPage] ! * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/ * [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/