Commit:    b278aba429ee86574f3f02294ffbcd4e858b15b1
Author:    Johannes Schlüter <johan...@php.net>         Fri, 19 Jul 2013 
22:00:01 +0200
Parents:   17361b9707377ef545932362615fa01b0fa7b8ab
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=b278aba429ee86574f3f02294ffbcd4e858b15b1

Log:
Update patch submitting instructions

- we use git
- pecl bugs were merged into bugs.php.net
- A bit less on PEAR

Changed paths:
  M  README.SUBMITTING_PATCH


Diff:
diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH
index 63b7156..d1b74bd 100644
--- a/README.SUBMITTING_PATCH
+++ b/README.SUBMITTING_PATCH
@@ -5,7 +5,7 @@ This document describes how to submit an enhancement or patch 
for PHP.
 It's easy!
 
 You don't need any login accounts or special access to download,
-build, debug and begin submitting PHP, PECL or PEAR code, tests or
+build, debug and begin submitting PHP or PECL code, tests or
 documentation.  Once you've followed this README and had several
 patches accepted, commit privileges are often quickly granted.
 
@@ -16,8 +16,8 @@ 
http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
 Online Forums
 -------------
 There are several IRC channels where PHP developers are often
-available to discuss questions.  They include #php.pecl, #php.doc and
-#pear on the EFNet network and #php-dev-win on FreeNode.
+available to discuss questions.  They include #php.pecl and #php.doc
+on the EFNet network and #php-dev-win on FreeNode.
 
 
 PHP Patches
@@ -78,7 +78,7 @@ of type 'text/*' are accepted.
 PECL Extension Patches: http://pecl.php.net/
 --------------------------------------------
 If you are fixing broken functionality in a PECL extension then create
-a bug or identify an existing bug at http://pecl.php.net/bugs/.  A bug
+a bug or identify an existing bug at http://bugs.php.net/.  A bug
 can be used to track the patch progress and prevent your changes
 getting lost in the PHP mail archives.
 
@@ -114,15 +114,15 @@ http://pear.php.net/manual/en/guide-developers.php
 
 How to create your PHP, PHP Documentation or PECL patch
 -------------------------------------------------------
-PHP and PECL use Subversion (SVN) for revision control.  Read
-http://www.php.net/svn.php for help on using SVN to get and build PHP
-source code.  We recommend using a Sparse Directory checkout described
-in http://wiki.php.net/vcs/svnfaq.  If you are new to SVN, read
-http://svnbook.red-bean.com.
+PHP and most PECL packages use Git for revision control. Some PECL
+packages use Subversion (SVN) Read http://www.php.net/git.php for help
+on using Git to get and build PHP source code.  We recommend to look 
+at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
+https://wiki.php.net/vcs/gitfaq.
 
 Generally we ask that bug fix patches work on the current stable PHP
-development branches and on "trunk".  New PHP features only need to
-work on "trunk".
+development branches and on "master".  New PHP features only need to
+work on "master".
 
 Read CODING_STANDARDS before you start working.
 
@@ -134,7 +134,7 @@ comprehensive.
 
 After testing is finished, create a patch file using the command:
 
-  svn diff > your_patch.txt
+  git diff > your_patch.txt
 
 For ease of review and later troubleshooting, submit individual
 patches for each bug or feature.
@@ -142,7 +142,7 @@ patches for each bug or feature.
 
 Checklist for submitting your PHP or PECL code patch
 ----------------------------------------------------
- - Update SVN source just before running your final 'diff' and
+ - Update git source just before running your final 'diff' and
    before testing.
  - Add in-line comments and/or have external documentation ready.
    Use only "/* */" style comments, not "//".
@@ -175,7 +175,7 @@ about these questions:
 
 What happens when your PHP or PECL patch is applied
 ---------------------------------------------------
-Your name will likely be included in the SVN commit log.  If your
+Your name will likely be included in the Git commit log.  If your
 patch affects end users, a brief description and your name might be
 added to the NEWS file.


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to