Multi-branch test commit to see if email notifications are working

diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 044f352968c450dc5229c705824739e5548db0c4..88b84824dd8dd294d984687815a956808e2c1d45 100644 (file)
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -58,8 +58,8 @@ Exceptions:
     calling.
 
 [7] When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
-    cvs user foo.  This allows easier tracking of why code was commented out, 
+    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
+    svn user foo.  This allows easier tracking of why code was commented out, 
     especially in bundled libraries.  
 
 [8] Do not define functions that are not available.  For instance, if a

diff --git a/UPGRADING b/UPGRADING
index 02b6c2f227afc0546acd9005715de560df95f01b..13b01e880b4d38562e8869255937a48c24708078 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -381,12 +381,12 @@ ext/pfpro           not actively maintained
 ext/w32api          pecl/ffi
 ext/yp              not actively maintained
 sapi/activescript   http://pecl4win.php.net/ext.php/php5activescript.dll (PECL package)
-                    or pecl/activescript (CVS)
+                    or pecl/activescript (SVN)
 
 Modules in PECL that are not actively maintained (i.e. have not been supported
 for some time, have no active maintainer working on them currently, and do not
-have any PECL package releases), are still available in CVS at
-http://cvs.php.net/pecl/. However, unreleased PHP modules are by their nature
+have any PECL package releases), are still available in SVN at
+http://svn.php.net/pecl/. However, unreleased PHP modules are by their nature
 unsupported, and your mileage may vary when attempting to install or use them.
 
 9b. Class constants in new PHP 5.1 extensions