[phpwiki-checkins] CVS: phpwiki/pgsrc AddingPages,1.3,1.4 ConvertSpacesToTabs,1.3,1.4 FindPage,1.3,1.4 FrontPage,1.4,1.5 HowToUseWiki,1.3,1.4 MoreAboutMechanics,1.3,1.4 RecentChanges,1.13,1.14 TextFormattingRules,1.6,1.7 WabiSabi,1.2,1.3 WikiWikiWeb,1.1,1.2

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

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

Modified Files:
	AddingPages ConvertSpacesToTabs FindPage FrontPage 
	HowToUseWiki MoreAboutMechanics RecentChanges 
	TextFormattingRules WabiSabi WikiWikiWeb 
Log Message:
removed tab syntax, bold ''' -> bold __, plus other minor corrections

Index: AddingPages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/AddingPages,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AddingPages	2000/11/06 02:46:59	1.3
--- AddingPages	2000/11/06 16:14:42	1.4
***************
*** 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.
  
  Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.
--- 1,4 ----
! 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].
  
  Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.

Index: ConvertSpacesToTabs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ConvertSpacesToTabs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ConvertSpacesToTabs	2000/06/03 11:19:56	1.3
--- ConvertSpacesToTabs	2000/11/06 16:14:43	1.4
***************
*** 3,14 ****
   [[o] I can't type tabs.  Please ConvertSpacesToTabs for me when I save.
  
! A span of spaces must be at least '''three''' spaces long to be recognized 
! as a tab.  Use multiples of '''eight''' spaces to make multiple tabs. 
  Each span of eight spaces will convert to one tab.  If the  
  last span comes up a little short, that's ok, as long as  
  there are at least three spaces in the last (only) span.
  
! '''Check your work.'''  This sort of heuristic can lead to  
! unexpected results. 
  -----
  [Maintenance note:  This page is seen when the user clicks on the 
--- 3,13 ----
   [[o] I can't type tabs.  Please ConvertSpacesToTabs for me when I save.
  
! A span of spaces must be at least __three__ spaces long to be recognized 
! as a tab.  Use multiples of __eight__ spaces to make multiple tabs. 
  Each span of eight spaces will convert to one tab.  If the  
  last span comes up a little short, that's ok, as long as  
  there are at least three spaces in the last (only) span.
  
! __Check your work.__  This sort of heuristic can lead to unexpected results. 
  -----
  [Maintenance note:  This page is seen when the user clicks on the 

Index: FindPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FindPage,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FindPage	2000/06/26 21:23:41	1.3
--- FindPage	2000/11/06 16:14:43	1.4
***************
*** 1,10 ****
  Here are some good starting points for browsing.
  
! 	* HowToUseWiki gives you the quick lowdown on Wiki markup.
! 	* RecentChanges recorded automatically
! 	* MoreAboutMechanics of browsing and editing on this server
  
- 
- 
  Here's a title search.   Try something like ''wiki'' 
  or ''sandwich''.
--- 1,8 ----
  Here are some good starting points for browsing.
  
! * HowToUseWiki gives you the quick lowdown on Wiki markup.
! * RecentChanges recorded automatically
! * MoreAboutMechanics of browsing and editing on this server
  
  Here's a title search.   Try something like ''wiki'' 
  or ''sandwich''.
***************
*** 15,19 ****
  
  %%Fullsearch%%
- 
- 
- 
--- 13,14 ----

Index: FrontPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FrontPage,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FrontPage	2000/09/23 14:56:59	1.4
--- FrontPage	2000/11/06 16:14:43	1.5
***************
*** 1,9 ****
! *What is a WikiWikiWeb? A description of this application.
! *Learn HowToUseWiki and learn about AddingPages.
! *Use the SandBox page to experiment with Wiki pages.
! *Please sign your name in RecentVisitors.
! *See RecentChanges for the latest page additions and changes.
! *Find out which pages are MostPopular.
! *Read the ReleaseNotes
  
  
--- 1,9 ----
! * What is a WikiWikiWeb? A description of this application.
! * Learn HowToUseWiki and learn about AddingPages.
! * Use the SandBox page to experiment with Wiki pages.
! * Please sign your name in RecentVisitors.
! * See RecentChanges for the latest page additions and changes.
! * Find out which pages are MostPopular.
! * Read the ReleaseNotes
  
  

Index: HowToUseWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/HowToUseWiki,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** HowToUseWiki	2000/08/10 15:29:20	1.3
--- HowToUseWiki	2000/11/06 16:14:43	1.4
***************
*** 1,16 ****
  ''"Wiki wiki"'' means "quick" in Hawai'ian.
  
! '''All you really need to know is:'''
  
! 	* To edit any page click on the Edit Text link at the bottom of
! the page. You should do that right now, and read the source code of this
! page. It will make more sense.
! 	* You get italics by surrounding words with two single quotes on
! either side ''like this''.
! 	* You get '''bold text''' by using three quotes on either side.
! 	* And, '''''bold italics''''' with five.
! 	* You get bullets by using a tab and an asterick *
! 	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
! 	* To have plain monospaced font, indent with a space:
  
   this is a poem 
--- 1,12 ----
  ''"Wiki wiki"'' means "quick" in Hawai'ian.
  
! __All you really need to know is:__
  
! * To edit any page click on the Edit Text link at the bottom of the page. You should do that right now, and read the source code of this page. It will make more sense.
! * You get italics by surrounding words with two single quotes on either side ''like this''.
! * You get __bold text__ by using two underscores on either side.
! * And, __''bold italics''__ by using both.
! * You get bullets by using an asterisk * at the start of the line
! * To have plain monospaced font, indent with a space:
  
   this is a poem 
***************
*** 19,23 ****
   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 seperate paragraphs with an extra blank line. Example:
  
  I am a paragraph.
***************
*** 26,35 ****
  
  
! 	* You can get horizontal rules with four or more dashes like this:
! ----
! 	* To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
! 	* To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
  * To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
! 	* Now you are ready to begin AddingPages.
  
  ----
--- 22,31 ----
  
  
! * You can get horizontal rules with four or more dashes like this:
! ---------
! * To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
! * To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
  * To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
! * Now you are ready to begin AddingPages.
  
  ----

Index: MoreAboutMechanics
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MoreAboutMechanics,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MoreAboutMechanics	2000/10/08 18:12:14	1.3
--- MoreAboutMechanics	2000/11/06 16:14:43	1.4
***************
*** 6,17 ****
  
  Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
! 	# http://www.wcsb.org/
! 	# ftp://ftp.redhat.com/
! 	# news://news.mozilla.org/
  
  Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.
  
  PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
- 
- 
  
--- 6,15 ----
  
  Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
! # http://www.wcsb.org/
! # ftp://ftp.redhat.com/
! # news://news.mozilla.org/
  
  Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.
  
  PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
  

Index: RecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** RecentChanges	2000/10/25 04:19:27	1.13
--- RecentChanges	2000/11/06 16:14:43	1.14
***************
*** 22,26 ****
  * [WikiWikiWeb]
  
! Quick page search:
  %%Search%%
  ----
--- 22,26 ----
  * [WikiWikiWeb]
  
! Quick title search:
  %%Search%%
  ----

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** TextFormattingRules	2000/11/06 02:46:07	1.6
--- TextFormattingRules	2000/11/06 16:14:43	1.7
***************
*** 1,3 ****
! '''Paragraphs'''
  
  * Don't indent paragraphs
--- 1,3 ----
! ! Paragraphs
  
  * Don't indent paragraphs
***************
*** 8,12 ****
  
  
! '''Lists'''
  
  * asterick for first level
--- 8,12 ----
  
  
! ! Lists
  
  * asterick for first level
***************
*** 18,22 ****
  * Other leading whitespace signals preformatted text, changes font.
  
! '''Headings'''
  
  * '!' at the start of a line makes a small heading
--- 18,22 ----
  * Other leading whitespace signals preformatted text, changes font.
  
! ! Headings
  
  * '!' at the start of a line makes a small heading
***************
*** 24,28 ****
  * '!!!' at the start of a line makes a large heading
  
! '''Fonts'''
  * Indent with one or more spaces to use a monospace font:
  
--- 24,29 ----
  * '!!!' at the start of a line makes a large heading
  
! ! Fonts
! 
  * Indent with one or more spaces to use a monospace font:
  
***************
*** 30,34 ****
  This is not
  
! '''Indented Paragraphs'''
  ''(Quotes)''
  
--- 31,35 ----
  This is not
  
! !Indented Paragraphs
  ''(Quotes)''
  
***************
*** 37,45 ****
  ;: this is an indented block of text
  
! '''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:
  
--- 38,46 ----
  ;: this is an indented block of text
  
! ! 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:
  
***************
*** 47,51 ****
  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/]
--- 48,52 ----
  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/]
***************
*** 57,61 ****
  
  
! '''HTML Mark-Up Language'''
  
  * Don't bother
--- 58,62 ----
  
  
! ! HTML Mark-Up Language
  
  * Don't bother
***************
*** 63,66 ****
  * 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.
- 
- 
--- 64,65 ----

Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WabiSabi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WabiSabi	2000/06/02 15:59:04	1.2
--- WabiSabi	2000/11/06 16:14:43	1.3
***************
*** 1,3 ****
! Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it "occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."
  
  Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
--- 1,3 ----
! Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it ''"occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."''
  
  Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
***************
*** 7,24 ****
  It is the beauty of things unconventional.
  
! The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes "direct, intuitive insight into transcendental truth beyond all intellectual conception." At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
  
! 	*All things are impermanent
! 	*All things are imperfect
! 	*All things are incomplete 
  
  Material characteristics of wabi-sabi:
  
! 	*suggestion of natural process
! 	*irregular
! 	*intimate
! 	*unpretentious
! 	*earthy
! 	*simple
  
  For more about wabi-sabi, see
--- 7,24 ----
  It is the beauty of things unconventional.
  
! The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes ''"direct, intuitive insight into transcendental truth beyond all intellectual conception."'' At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
  
! * All things are impermanent
! * All things are imperfect
! * All things are incomplete 
  
  Material characteristics of wabi-sabi:
  
! * suggestion of natural process
! * irregular
! * intimate
! * unpretentious
! * earthy
! * simple
  
  For more about wabi-sabi, see

Index: WikiWikiWeb
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/WikiWikiWeb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WikiWikiWeb	2000/08/10 03:03:07	1.1
--- WikiWikiWeb	2000/11/06 16:14:43	1.2
***************
*** 7,11 ****
  ''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
  
! You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Currently this Wiki has no "theme" for discussion, so go ahead and play with it and have fun!
  
  --SteveWainstead
--- 7,11 ----
  ''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
  
! You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Go ahead, join the discussion, play with it, and have fun!
  
  --SteveWainstead