Hey.

On Wed, 2012-02-08 at 22:11 +0100, Ondřej Surý wrote:
> care to provide a text we can copy&paste into README.Debian? Small paragraph
> should be enough.
Have a look at the attached patch. Also includes some minor cleanups.

Cheers,
Chris.
* Miscellaneous cleanups.
* Added information on PHP_INI_SCAN_DIR.
--- a/debian/php5-common.README.Debian
+++ b/debian/php5-common.README.Debian
@@ -1,10 +1,10 @@
-Table of Contents:
----------------------------------------------------------------------
+Table of Contents
+-----------------
 * Using php5 with threaded webservers (eg. apache2-mpm-worker, caudium)
-* Problems starting apache2 with php5
+* Problems starting Apache2 with php5
 * Session storage
 * Other caveats
-* php5-cgi and apache2
+* php5-cgi and Apache2
 * Restarting your web server after installing modules
 * Configuration layout
 * Timezone data from system timezone database
@@ -24,8 +24,8 @@
 Adam Conrad <adcon...@0c3.net>  Sun, 06 Feb 2005 08:24:56 -0700
 
 
-Problems starting apache2 with php5
-----------------------------------
+Problems starting Apache2 with php5
+-----------------------------------
 
    At the time of writing, there are no *known* incompatibilities
    between any of the php5 modules we ship.  However, there have been
@@ -54,7 +54,7 @@
 
     Session files are stored in /var/lib/php5.  For security purposes, this
     directory is unreadable by non-root users.  This means that php5 running
-    from apache2, for example, will not be able to clean up stale session
+    from Apache2, for example, will not be able to clean up stale session
     files.  Instead, we have a cron job run every 30 mins that cleans up
     stale session files; /etc/cron.d/php5.  You may need to modify how
     often this runs, if you've modified session.gc_maxlifetime in your
@@ -71,13 +71,14 @@
    special settings for them so php will look in compiled-in paths. If you set
    them, you should also add appropriate php install directories there.
 
-php5-cgi and apache2
----------------------------
+
+php5-cgi and Apache2
+--------------------
 
 In 99% of cases, what you probably want isn't php5-cgi at all, but rather
 the libapache2-mod-php5 package, which will configure itself on
 installation and Just Work(tm).  If, however, you have a need to use
-the CGI version of php5 with apache2, the following should help
+the CGI version of php5 with Apache2, the following should help
 get you going, though there are dozens of different ways to do this.
 
 Please note that this process will never be made automatic, as php5-cgi
@@ -86,8 +87,8 @@
 such as libapache2-mod-php5.  If both were installed side-by-side and both
 were automatically enabled, the results would be a bit confusing, obviously.
 
-To use php5-cgi with apache2
-  1) activate CGI (it's on by default in default debian setups)
+To use php5-cgi with Apache2
+  1) activate CGI (it's on by default in default Debian setups)
      a) If using the prefork MPM, use 'a2enmod cgi'
      b) If using a threaded MPM, use 'a2enmod cgid'
   2) activate mod_actions (a2enmod actions)
@@ -98,8 +99,9 @@
 
 Adam Conrad <adcon...@0c3.net>  Sat, 04 Sep 2004 23:04:26 -0600
 
+
 Configuration Layout
----------------------------------------------------------------------
+--------------------
 
 Each of the 3 SAPI's (apache2/cgi/cli) have a different
 central configuration file /etc/php5/$SAPI/php.ini.  
@@ -117,10 +119,16 @@
 but at the same time if you want to have SAPI-specific configuration,
 you can just remove the symlink.
 
+Note that the usage of the PHP_INI_SCAN_DIR environment variable
+overrides what is set with --with-config-file-scan-dir and thus the
+directory /etc/php5/$SAPI/conf.d will no longer be included.
+
 sean finney <sean...@debian.org>  Thu, 19 Oct 2006 23:33:05 +0200
+Christoph Anton Mitterer <m...@christoph.anton.mitterer.name> Wed, 8 Feb 2012 23:19:00 +0100
+
 
 Timezone data from system timezone database
----------------------------------------------------------------------
+-------------------------------------------
 
 Debian PHP has been patched to use of the system wide timezone database
 from the tzdata package, making sure any updates there are automatically
@@ -134,11 +142,12 @@
  
 Thijs Kinkhorst <th...@debian.org>  Wed, 23 Jul 2008 17:42:06 +0200
 
-Further documentation, errata, etc
----------------------------------------------------------------------
+
+Further documentation, errata, etc.
+-----------------------------------
 
 Errata and other general information about PHP in Debian can be found
-in the debian wiki at:
+in the Debian wiki at:
 
 	http://wiki.debian.org/PHP
 	

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Reply via email to