[phpwiki-checkins] CVS: phpwiki/doc INSTALL.MacOSX,1.2,1.3

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

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv1538/phpwiki/doc

Modified Files:
	INSTALL.MacOSX 
Log Message:
o Corrected a mistake in file path for Apache alias directive (the ? incorrectly included in the path was only applicable to version 1.2).
o Updated info for PEAR (no longer pertinent, PhpWiki by default now knows that Mac OS X keeps PEAR.php in /System/Library/PHP).

Index: INSTALL.MacOSX
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.MacOSX,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** INSTALL.MacOSX	2001/12/19 22:21:55	1.2
--- INSTALL.MacOSX	2001/12/20 19:43:35	1.3
***************
*** 22,29 ****
  alternative to TextEdit, especially if you are intent on heavily
  customizing PhpWiki, working with PHP or doing any other code
! development. Among other niceties it provides line numbering and
! syntax coloring, but don't rely on PB's text colors too much, it
! doesn't yet properly deal with escaped (\") quotes which are
! frequently called for in PHP when generating HTML code.
  
  
--- 22,30 ----
  alternative to TextEdit, especially if you are intent on heavily
  customizing PhpWiki, working with PHP or doing any other code
! development. Among other niceties it provides multiple undos (even
! beyond the last file save), line numbering and syntax coloring; but
! don't rely on PB's text colors too much, it doesn't always properly
! handle coloring for \"escaped quotes\" which are frequently called for
! in PHP when generating HTML code.
  
  
***************
*** 42,46 ****
  
  
! Apache PHP Module
  -----------------
  The default PHP module for Apache as supplied by Apple does work with
--- 43,47 ----
  
  
! Apache PHP Modulex
  -----------------
  The default PHP module for Apache as supplied by Apple does work with
***************
*** 57,61 ****
--- 58,75 ----
  experimental plugin for Wiki 1.3.
  
+ PhpWiki 1.3 already knows where to find the required PEAR.php on Mac
+ OS X systems. However if you need to use PEAR with other PHP
+ applications, edit or create the file /usr/local/lib/php.ini then add
+ the following line:
  
+ include_path = ".:/System/Library/PHP";
+ 
+ If you compiled a version of PHP yourself (perhaps newer than the
+ 4.0.6 version included by Apple) the path will already be included in
+ the php.ini file. In that case you shouldn't have to change the path,
+ unless you installed PHP into a location other than the default
+ /usr/local/ prefix.
+ 
+ 
  Obtaining and Installing mySQL and libphp4.so
  ---------------------------------------------
***************
*** 73,80 ****
  
  A good place to find other distributions of mySQL or PostgreSQL which
! can be used with Mac OS X are listed at
! <http://versiontracker.com/macosx/>.
  
  
  PhpWiki Configuration Notes
  ---------------------------
--- 87,95 ----
  
  A good place to find other distributions of mySQL or PostgreSQL which
! can be used with Mac OS X are listed at:
  
+     <http://versiontracker.com/macosx/>
  
+ 
  PhpWiki Configuration Notes
  ---------------------------
***************
*** 87,100 ****
  but with the changes below.
  
- 0. PhpWiki 1.3 needs to know where to find PEAR.php. Edit line 31 of
-    index.php to match the following:
- 
- ini_set('include_path', '.: /System/Library/PHP');
- 
- If you compiled a version of PHP yourself (perhaps newer than the
- 4.0.6 version included by Apple) this step may be omitted--unless you
- changed the default PHP installation directories from /usr/local/. In
- that case you will have to substitute the appropriate location of
- PEAR.php according to your PHP installation.
  
  1. The Mac OS X Apache web server runs as user "www" and this works
--- 102,105 ----
***************
*** 139,143 ****
      Alias /wiki/images/ "/Library/WebServer/Documents/phpwiki/images/"
      Alias /wiki/images "/Library/WebServer/Documents/phpwiki/images"
!     Alias /wiki/ "/Library/WebServer/Documents/phpwiki/index.php?"
      Alias /wiki "/Library/WebServer/Documents/phpwiki/index.php"
  
--- 144,148 ----
      Alias /wiki/images/ "/Library/WebServer/Documents/phpwiki/images/"
      Alias /wiki/images "/Library/WebServer/Documents/phpwiki/images"
!     Alias /wiki/ "/Library/WebServer/Documents/phpwiki/index.php/"
      Alias /wiki "/Library/WebServer/Documents/phpwiki/index.php"