[phpwiki-checkins] CVS: phpwiki/pgsrc TestPage,1.7,1.8 TextFormattingRules,1.7,1.8

[Arno H. <aho...@us...>]

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

Modified Files:
	TestPage TextFormattingRules 
Log Message:
update for new syntax: !http and [named internal link|WikiPage]

Index: TestPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TestPage,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TestPage	2000/10/24 10:32:38	1.7
--- TestPage	2000/11/08 17:07:32	1.8
***************
*** 67,85 ****
  ----
  __Link tests__
! # FrontPage
! # [FrontPage]
  # Link in brackets: [http://phpwiki.sourceforge.net/]
  # Link outside brackets: http://phpwiki.sourceforge.net/
  # Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage
  # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
- # And what about a WikiLink and another WikiLinkWithSameStem on one line?
- # Other way around: WikiLinkWithSameStem plus WikiLink
  # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
  # [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
! # Javascript: [boo! | javascript:alert('oops') ] 
  # A [[Link] produces a [Link]
  # A [Link] looks like this: [[Link]
  # This is a [%%%] line break link
! # Also this page is [[not linked to], and this one is !NotLinkedTo.
  #* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
  #* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
--- 67,83 ----
  ----
  __Link tests__
! # normal: FrontPage
! # in brackets: [FrontPage] -- named: [the front page|FrontPage]
  # Link in brackets: [http://phpwiki.sourceforge.net/]
  # Link outside brackets: http://phpwiki.sourceforge.net/
  # Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage
  # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
  # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
  # [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
! # Javascript: [boo! | javascript:alert('oops') ]  (is now: named internal link)
  # A [[Link] produces a [Link]
  # A [Link] looks like this: [[Link]
  # This is a [%%%] line break link
! # Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
  #* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
  #* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TextFormattingRules	2000/11/06 16:14:43	1.7
--- TextFormattingRules	2000/11/08 17:07:32	1.8
***************
*** 51,56 ****
  * 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: [PhpWiki home page | http://phpwiki.sourceforge.net/]  
! * 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/
--- 51,56 ----
  * 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 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/