diff options
| -rw-r--r-- | CODING_STANDARDS | 2 | ||||
| -rw-r--r-- | INSTALL | 19 | ||||
| -rw-r--r-- | README.SUBMITTING_PATCH | 40 |
3 files changed, 19 insertions, 42 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS index 5fe00ddd42..06cfa8be01 100644 --- a/CODING_STANDARDS +++ b/CODING_STANDARDS @@ -259,7 +259,7 @@ The file labelled 'EXPERIMENTAL' should include the following information:: Any authoring information (known bugs, future directions of the module). - Ongoing status notes which may not be appropriate for CVS comments. + Ongoing status notes which may not be appropriate for SVN comments. Aliases & Legacy Documentation ----------------------------------- @@ -1308,8 +1308,8 @@ Introduction to PECL Installations When building PHP modules, it's important to have known-good versions of the required tools (autoconf, automake, libtool, etc.) See the - Anonymous CVS Instructions for details on the required tools, and - required versions. + SVN Instructions for details on the required tools, and required + versions. __________________________________________________________________ Downloading PECL extensions @@ -1325,14 +1325,11 @@ Downloading PECL extensions PECL extensions that have releases listed on the PECL web site are available for download and installation using the pecl command. Specific revisions may also be specified. - * CVS - Most PECL extensions also reside in CVS. A web-based view may be - seen at http://cvs.php.net/pecl/. To download straight from CVS, - the following sequence of commands may be used. Note that phpfi is - the password for user cvsread: + * SVN + All PECL files reside in SVN. A web-based view may be seen at + http://svn.php.net/pecl/. To download straight from SVN, use: -$ cvs -d:pserver:cvsread@cvs.php.net:/repository login -$ cvs -d:pserver:cvsread@cvs.php.net:/repository co pecl/extname +$ svn co http://svn.php.net/repository/pecl/<extname>/trunk <extname> * Windows downloads Windows users may find compiled PECL binaries by downloading the @@ -1380,7 +1377,7 @@ Compiling shared PECL extensions with phpize Sometimes, using the pecl installer is not an option. This could be because you're behind a firewall, or it could be because the extension you want to install is not available as a PECL compatible package, such - as unreleased extensions from CVS. If you need to build such an + as unreleased extensions from SVN. If you need to build such an extension, you can use the lower-level build tools to perform the build manually. @@ -1527,7 +1524,7 @@ The configuration file directives are documented in the manual though. For a complete list of directives available in your PHP version, please read your well commented php.ini file. Alternatively, you may find the the latest - php.ini from CVS helpful too. + php.ini from SVN helpful too. Example 6-1. php.ini example ; any text on a line after an unquoted semicolon (;) is ignored diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH index 04847d79c2..8229bf0757 100644 --- a/README.SUBMITTING_PATCH +++ b/README.SUBMITTING_PATCH @@ -8,11 +8,11 @@ part is making it acceptable for inclusion into our repository. :-) How to create patch? -------------------- -We are working with CVS. You need to get CVS source to create a patch -that we accept. Visit http://www.php.net/anoncvs.php to get CVS -source. You can check out older versions, but make sure you get -the default branch (i.e. Do not use -r option when you check out the -CVS source) +We use Subversion (SVN) for revision control. You need to get the +source from SVN in order to create a patch. Read +http://www.php.net/svn.php for help on using SVN. You can check out +older branches, but make sure you get trunk as well and make your +patch work there. Read CODING_STANDARDS file before you start working. @@ -21,7 +21,7 @@ add a new feature to PHP. After you finished editing, please test your patch. Read README.TESTING for testing. After you finish testing your patch, take diff file using -"cvs diff > your.patch" command. +"svn diff > your.patch" command. Read README.TESTING for submitting a test script for your patch. This is not strictly required, but it is preferred to submit a test script along @@ -41,25 +41,8 @@ maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if you are patching PEAR. Official module maintainers can be found in EXTENSIONS file in PHP source. -If you are new to CVS (Concurrent Versions System), visit -http://cvshome.org/ for details. - - -Recommended CVS client settings for creating patch file ------------------------------------------------------- -Recommended ~/.cvsrc file setting is: ------- -cvs -z3 -update -d -P -checkout -P -diff -u - ------- -diff -u means: - -u Use the unified output format. - -With this CVS setting, you don't have to worry about adding/deleting -newlines and spaces. +If you are new to SVN (Subversion), visit +http://svnbook.red-bean.com/ for details. Check list for submitting patch @@ -70,10 +53,7 @@ Check list for submitting patch web server error logs when you test your patch? - Did you build PHP for multi-threaded web servers. (Optional) - Did you create test script for "make test"? (Recommended) - - Did you check your patch is unified format and it does not - contain white space changes? (If you are not using recommended - cvs setting) - - Did you update CVS source before you take final patch? + - Did you update SVN source before you take final patch? - Did you read the patch again? @@ -118,7 +98,7 @@ these questions: What happens when your patch is applied? ---------------------------------------- -Your name will be included together with your email address in the CVS +Your name will be included together with your email address in the SVN commit log. If your patch affects end-users, a brief description and your name might be added to the NEWS file. |