Initial rewrite of the references to Subversion on the site to Git. Rewrites

welcome! A couple of important notes: - I've largely dropped references to Subversion altogether, even knowing that php-doc hasn't migrated yet. We may need to put a few more "Git/SVN account" references in there if php-doc isn't going to be migrated in the near future. - I've removed the quick start hints from git-php.php after an account request has been sent in. The documentation there was pretty skimpy anyway and probably wouldn't have been enough to get a developer going, plus it's harder to distill the Git workflow into three or four snappy commands and I'm not really convinced that a form confirmation page is the right place to have learning materials, since it's a one-time page for most users. Instead I've replaced them with links to the relevant Wiki pages, which seem more likely to be the right place for new developers to learn. News post to come, but I wanted to separate this out for easier review.
2026-03-23 23:02:13 +01:00 · 2012-03-20 10:13:32 +08:00
parent 2678a6ff83
commit f1f5e30ca3
14 changed files with 196 additions and 161 deletions
--- a/downloads.php
+++ b/downloads.php
@@ -36,8 +36,7 @@ $SIDEBAR_DATA = '
 </p>
 <p>
 To download the very latest development version,
- see the <a href="svn.php">instructions on
- using SVN</a>
+ see the <a href="git.php">instructions on using Git</a>.
 </p>
 <div class="information">
 <p>
--- a/error.php
+++ b/error.php
@@ -428,17 +428,23 @@ $uri_aliases = array (
    "projects.php" => "projects", // BC
    
    # CVS -> SVN
-    "anoncvs.php"   => "svn",
-    "cvs-php.php"   => "svn-php",
+    "anoncvs.php"   => "git",
+    "cvs-php.php"   => "git-php",
+
+    # SVN -> Git
+    "svn"       => "git",
+    "svn-php"   => "git-php",
+
+    # Other items
    "security/crypt" => "security/crypt_blowfish",
 );

 $external_redirects = array(
-    "php4news"    => "http://svn.php.net/viewvc/php/php-src/branches/PHP_4_4/NEWS?view=markup",
-    "php5news"    => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/NEWS?view=markup", // BC
-    "php53news"   => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/NEWS?view=markup",
-    "php54news"   => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/NEWS?view=markup",
-    "phptrunknews"=> "http://svn.php.net/viewvc/php/php-src/trunk/NEWS?view=markup",
+    "php4news"    => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-4.4",
+    "php5news"    => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.4",
+    "php53news"   => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.3",
+    "php54news"   => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.4",
+    "phptrunknews"=> "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/master",
    "projects"    => "http://freshmeat.net/tags/php",
    "pear"        => "http://pear.php.net/",
    "bugs"        => "http://bugs.php.net/",
--- a/get-involved.php
+++ b/get-involved.php
@@ -60,10 +60,10 @@ PHP creates a script called <em>config.nice</em> after every successful <em>./co
 </p>
    
 <p>
-Once you have the build dependencies installed you'll need to checkout PHP from SVN, configure and build it;
+Once you have the build dependencies installed you'll need to checkout PHP from Git, configure and build it;
 <ul>
-    <li>svn co https://svn.php.net/repository/php/php-src/branches/PHP_5_4 php54</li>
-    <li>cd php54</li>
+    <li>git clone -b PHP-5.4 http://git.php.net/repository/php-src.git php-5.4</li>
+    <li>cd php-5.4</li>
    <li>./buildconf</li>
    <li>./configure (see the <a href="#config.nice">shell script helper below)</a></li>
    <li>make all test</li>
@@ -262,11 +262,11 @@ directory if you want to learn more about the testing mechanism.
 <p style="margin: 5px; padding: 5px;">
    Even though most of the mailing lists are very active, not everything that is
    contributed to PHP needs to be approved there first. For example, minor
-    features are often simply committed directly to SVN without asking or telling
+    features are often simply committed directly to Git without asking or telling
    anyone. These are typically things for which a developer working on an
    external application saw a need and decided to add, in case anyone else might
    need it in the future. PHP has a great peer review process so it's very hard
-    to "sneak" things in. Every commit to SVN is reviewed by quite a lot of people
+    to "sneak" things in. Every commit to Git is reviewed by quite a lot of people
    who are interested in what is going on - or who simply enjoy reading code. If
    a reviewer discovers issues with the commit, he or she will send a quick reply
    to the commit email and discuss it on the developers list. Often the peer review
@@ -325,20 +325,20 @@ directory if you want to learn more about the testing mechanism.

 <p style="margin: 5px; padding: 5px;">
    Getting involved is a lot easier than most people think - and chances are that
-    you are already involved in one way or another. You don't need an SVN account
-    and commit access to get started - SVN accounts need to be earned. Registering
+    you are already involved in one way or another. You don't need an Git account
+    and commit access to get started - Git accounts need to be earned. Registering
    on the mailing lists related to the topic in which you are interested - and
    actively participating in the discussions - is a good start toward getting
-    your request for an SVN account granted. Browse the wiki to see if there are
+    your request for an Git account granted. Browse the wiki to see if there are
    outstanding TODO items you can help to clear, for example. Another great way
    to get involved and really help out is by reviewing the bug tracker for bugs
    you could potentially fix, or perhaps for which you could write a unit test.
-    Sending several patches to the mailing lists will quickly show that you are
-    interested and serious about your desire to contribute. Eventually someone
-    will get annoyed with the amount of time they must spend to commit your patches
-    for you, and will probably respond with something along the lines of, "Stop
-    bothering me. Do it yourself!" and ask you to submit the SVN account form.
-    Mission accomplished!
+	Sending several pull requests, or attaching patches to bug reports will
+	quickly show that you are interested and serious about your desire to
+	contribute. Eventually someone will get annoyed with the amount of time
+	they must spend to commit your patches for you, and will probably respond
+	with something along the lines of, "Stop bothering me. Do it yourself!" and
+	ask you to submit the Git account form.  Mission accomplished!
 </p>


@@ -387,7 +387,7 @@ directory if you want to learn more about the testing mechanism.
        <p style="margin: 5px; padding: 5px;">
            Unsure which task to tackle first? Stuck on a problem? Need a
            quick brainstorming session? IRC is a very convenient way to get
-            help quickly for smaller things, such as "where was the SVN module
+            help quickly for smaller things, such as "where was the Git module
            for zyx?" or if you simply want to run an idea by people to get
            their opinions - or even just to hang out. There aren't any
            "official" IRC channels for the PHP project, but a good chunk of
@@ -469,8 +469,8 @@ directory if you want to learn more about the testing mechanism.
    and therefore it will allow anonymous users to "login" and use the
    application. Modification, validation, translation, creation of new files,
    and everything else you need for writing documentation is possible without
-    an SVN account. When saving changes, a patch will be created and saved to
-    the "patch queue," while pending approval by someone with SVN karma to
+    an Git account. When saving changes, a patch will be created and saved to
+    the "patch queue," while pending approval by someone with Git karma to
    commit the changes. PhD O.E. also bundles a variety of scripts to ensure the
    docs use a consistent structure, allow the contributor to view undocumented
    functions, and check the translation status of an entry (among other things).
--- a/git-php.php
+++ b/git-php.php
@@ -1,26 +1,25 @@
 <?php
 // $Id$ 
-$_SERVER['BASE_PAGE'] = 'svn-php.php';
+$_SERVER['BASE_PAGE'] = 'git-php.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/email-validation.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/posttohost.inc';

 $SIDEBAR_DATA = '
-<h3>More about SVN</h3>
+<h3>More about Git</h3>
 <p>
- You can find more information about SVN, and
- download clients for most major platforms, at
- <a href="http://subversion.tigris.org/">the official SVN site</a>.
+ You can find more information about Git and download clients for most major
+ platforms at <a href="http://git-scm.com/">the official Git site</a>.
 </p>

-<h3>SVN access</h3>
+<h3>Git access</h3>
 <p>
 If you would like to grab PHP sources or other PHP.net
 hosted project data from PHP.net, you can also use 
- <a href="/svn.php">SVN</a>. No SVN account is required.
+ <a href="/git.php">Git</a>. No Git account is required.
 </p>
 ';
-site_header("Using SVN for PHP Development", array("current" => "FIXME"));
+site_header("Using Git for PHP Development", array("current" => "FIXME"));

 $groups = array(
  "none" => "Choose One",
@@ -32,7 +31,7 @@ $groups = array(

 ?>

-<h1>Using SVN for PHP Development</h1>
+<h1>Using Git for PHP Development</h1>

 <?php

@@ -53,7 +52,7 @@ if (count($_POST) && (!isset($_POST['purpose']) || !is_array($_POST['purpose'])

    // Check for errors
    if (empty($_POST['id'])) {
-        $error .= "You must supply a desired SVN user id. <br />";
+        $error .= "You must supply a desired Git user id. <br />";
    } elseif(!preg_match('!^[a-z]\w+$!', $_POST['id'])) {
        $error .= "Your user id must be >1 char long, start with ".
                  "a letter and contain nothing but a-z, 0-9, and _ <br />";
@@ -62,7 +61,7 @@ if (count($_POST) && (!isset($_POST['purpose']) || !is_array($_POST['purpose'])
        $error .= "You must supply your real name. <br />";
    }
    if (empty($_POST['realpurpose'])) {
-        $error .= "You must supply a reason for requesting the SVN account. <br />";
+        $error .= "You must supply a reason for requesting the Git account. <br />";
    }
    if (empty($_POST['password'])) {
        $error .= "You must supply a desired password. <br />";
@@ -123,58 +122,40 @@ if (count($_POST) && (!isset($_POST['purpose']) || !is_array($_POST['purpose'])
 forgotten you, but you haven't forgotten us! It happens. There's several of
 us, and sometimes we think that someone else has taken care of your request,
 and they think that we took care of it. Sorry. You can also speed up the
- process by having an existing SVN account holder who works in the area you are
+ process by having an existing Git account holder who works in the area you are
 interested in mail us to vouch for you.
 </p>

 <p>
- If you are not familiar with SVN, you should have a look at the various
- documentation resources available in <a
- href="http://subversion.tigris.org/">the official SVN site</a>. This is
- also where to get the most recent version of the SVN client.
+ If you are not familiar with Git, you should have a look at the various
+ documentation resources available at
+ <a href="http://git-scm.com/">the official Git site</a>.  This is also where
+ to get the most recent version of the Git client.
 </p>

 <p>
- All SVN commit messages to the PHP sources get sent to the php-svn mailing lists.
+ All Git commit messages to the PHP sources get sent to the php-git mailing lists.
 You should subscribe yourself to one or more of these mailing lists. Instructions
 for subscribing are on the <a href="/mailing-lists.php">Mailing Lists</a> page.
 </p>

 <p>
- SVN itself is quite easy to use. You can follow the steps listed on the
- <a href="/svn.php">anonymous SVN</a> page for checking out your tree.
- Please note that you do not have to log in to check out your tree; you will
- not be asked for your username and password until you attempt to commit changes.
+ Git itself is quite easy to use. You can follow the steps listed on the
+ <a href="/git.php">Git</a> page for checking out your tree.  Please note that
+ you do not have to log in to check out your tree; you will not be asked for
+ your username and password until you attempt to commit changes.
 </p>

 <p>
- Next, once you have your SVN tree you need to know the following commands.
- They should all be executed from within the checked out tree. eg.
- <tt>cd php-src</tt>.
+ The <a href="https://wiki.php.net/vcs/gitworkflow">Git workflow</a> and
+ <a href="https://wiki.php.net/vcs/gitfaq">Git FAQ</a> pages on the Wiki are
+ good starting points to learn how we use Git to develop PHP. Beyond that, you
+ can familiarise yourself with Git in general via the
+ <a href="http://git-scm.com/documentation">Git documentation</a> and the
+ <a href="http://progit.org/">Pro Git</a> book.  They should all be executed
+ from within the checked out tree. eg.  <code>cd php-src</code>.
 </p>

-<dl>
- <dt><strong><tt>svn update</tt></strong></dt>
- <dd>
-  This fetches all updates made by others and brings your tree up to date.
-  Before starting to edit anything in the tree you should do this. Generally
-  you would do this whenever you see a SVN commit message on the php-SVN
-  mailing list.</dd>
- <dt><strong><tt>svn diff</tt></strong></dt>
- <dd>
-  This displays all changes you have made anywhere in the tree in
-  <a href="http://en.wikipedia.org/wiki/Unified_diff">unified diff</a> format.
-  This is a very good (and strongly recommended) way to review your changes
-  before you decide to commit them.
- </dd>
- <dt><strong><tt>svn commit</tt></strong></dt>
- <dd>
-  This commits any changes you have made anywhere in the tree. A text
-  editor will pop up and you will need to describe the changes you made.
-  Please provide a good description here as it may help people in the
-  future when looking at your code changes.
- </dd>
-</dl>
 <?php
        site_footer();
        exit;
@@ -194,15 +175,15 @@ EOT;

 <p>
 All PHP development is done through a distributed revision control system
- called SVN. This helps us track changes and it makes it possible for people
+ called Git. This helps us track changes and it makes it possible for people
 located in all corners of the world to collaborate on a project without
 having to worry about stepping on each others' toes.
 </p>

 <p>
- Please note that you do <strong>not</strong> need a SVN account to <a
- href="/svn.php"><strong>access</strong> the SVN tree</a>, to use PHP,
- or to write PHP scripts. You only need a SVN account if you will be a
+ Please note that you do <strong>not</strong> need a Git account to <a
+ href="/git.php"><strong>access</strong> the Git tree</a>, to use PHP,
+ or to write PHP scripts. You only need a Git account if you will be a
 regular contributor to the development of PHP itself.
 </p>

@@ -212,8 +193,8 @@ EOT;

 <table border="0" cellpadding="3" class="standard">
 <tr>
-  <th>Does Not Require SVN Account</th>
-  <th>Requires SVN Account</th>
+  <th>Does Not Require Git Account</th>
+  <th>Requires Git Account</th>
 </tr>
 <tr>
  <td class="sub">Learning PHP</td>
@@ -255,10 +236,16 @@ EOT;

 <p>
 If you are contributing a patch, a small fix, or another minor change you do
- not need to ask for a SVN account before submitting it. Just send your patch to
- <a href="mailto:internals@lists.php.net">the internals mailing list</a>. You
- should <a href="mailto:internals-subscribe@lists.php.net">subscribe to that
- list</a> to participate in any discussion your patch generates! Your patch may
+ not need to ask for a Git account before submitting it. Fork our
+ <a href="https://github.com/php/php-src">GitHub repository</a> and create a
+ <a href="http://help.github.com/send-pull-requests/">pull request</a>, attach
+ a patch to a
+ <a href="https://bugs.php.net/">bug report or feature request</a>,
+ or send your patch to
+ <a href="mailto:internals@lists.php.net">the Internals mailing list</a>. If
+ you send the patch to Internals, you should
+ <a href="mailto:internals-subscribe@lists.php.net">subscribe to that list</a>
+ to participate in any discussion your patch generates! Your patch may
 not get noticed the first time. Make sure that when you send your patch, you
 explain what it does. Make sure you use a clear subject when sending your
 patch (you might even want to prefix it with <tt>"[PATCH]"</tt>). If nobody
@@ -268,8 +255,8 @@ EOT;
 </p>

 <p>
- Submitting patches and participating in the discussion on the 'internals' list
- <strong>before</strong> requesting full SVN access is strongly suggested, so
+ Submitting patches and participating in the discussion on the Internals list
+ <strong>before</strong> requesting full Git access is strongly suggested, so
 the PHP development team can get to know you and what you'll be contributing.
 It is suggested that all PHP developers (<strong>people developing PHP
 itself</strong>, not people developing in PHP) subscribe to this list.
@@ -283,9 +270,9 @@ EOT;
 If you wish to contribute to the documentation please contact the translation
 team for the language you wish to help with. If you have trouble finding the
 team, ask on the phpdoc mailing list. Once you have made contact you may
- apply for a SVN account here by including the name of one or more people from
- the existing translation team that referred you and of course the language
- you wish to translate to.
+ apply for a Git/SVN account here by including the name of one or more people
+ from the existing translation team that referred you and of course the
+ language you wish to translate to.
 </p>

 <p>
@@ -297,42 +284,42 @@ EOT;
 <br />
 Once your PEAR package has been approved, or you get the sense that
 people generally agree that your PECL contribution is worthwhile, you
- may apply for a SVN account here. Specify the name of your PEAR package
- or PECL contribution (single word SVN module name) and also reference an
+ may apply for a Git account here. Specify the name of your PEAR package
+ or PECL contribution (single word Git module name) and also reference an
 existing account holder who can vouch for your contribution, or provide
 a link to your PEAR proposal.
 </p>

 <p>
- Okay, if you are still reading, then you may actually need a SVN account.
+ Okay, if you are still reading, then you may actually need a Git account.
 This is <strong>not</strong> an automatic process. Fill in the form below to
 request an account. In the box next to "Purpose", describe what it is that
- you intend to do with SVN access. If it isn't clear from what you've
- described already, tell us what parts of the SVN repository you need access
+ you intend to do with Git access. If it isn't clear from what you've
+ described already, tell us what parts of the Git repository you need access
 to (for example, "phpdoc" is the documentation tree, "php-src/ext/readline"
 is the PHP readline extension). If someone told you to fill out the form
 here, make sure to mention them here!
 </p>

 <p>
- The SVN account, once granted and activated (which could take a while, so be
+ The Git account, once granted and activated (which could take a while, so be
 patient!), gives you access to a number of things. First, and most
- importantly, it gives you access to modify those parts of the PHP SVN tree for
+ importantly, it gives you access to modify those parts of the PHP Git tree for
 which you have requested and been granted access. It also allows you to comment
 on and close bugs in our <a href="http://bugs.php.net/">bug database</a>, and
 allows you to modify the documentation notes in the <a href="/manual/">annotated
- manual</a>. Your SVN account also translates into a foo@php.net forwarding email
- address where <strong>foo</strong> is your SVN user id. Feel free to use it!
+ manual</a>. Your Git account also translates into a foo@php.net forwarding email
+ address where <strong>foo</strong> is your Git user id. Feel free to use it!
 </p>

-<h2>Request a SVN account</h2>
+<h2>Request a Git account</h2>

 <p class="warn">
- Please note that you do <em>NOT</em> need a SVN account to study PHP. You do
- <em>NOT</em> need a SVN account to learn PHP, to use PHP or to in any way do
+ Please note that you do <em>NOT</em> need a Git account to study PHP. You do
+ <em>NOT</em> need a Git account to learn PHP, to use PHP or to in any way do
 anything at all with PHP. If you are sitting there wondering if you need a
- SVN account, then you don't! If an existing SVN account holder suggested you
- request an account, please mention their SVN id in the request.
+ Git account, then you don't! If an existing Git account holder suggested you
+ request an account, please mention their Git id in the request.
 </p>
 <p class="warn">
 Also note that information provided here will be sent to a public
@@ -343,7 +330,7 @@ EOT;
 } // endif: no data submitted

 ?>
-<form action="/svn-php.php" method="post">
+<form action="/git-php.php" method="post">
 <table border="0" class="standard" style="width: 80%;">
 <tr>
 <th class="subr">Full Name:</th>
@@ -356,7 +343,7 @@ EOT;
      class="max" value="<?php if (isset($_POST['email'])) echo clean($_POST['email']);?>" /></td>
 </tr>
 <tr>
- <th class="subr">For what purpose do you require a SVN account:<br />
+ <th class="subr">For what purpose do you require a Git account:<br />
 (check all that apply)</th>
 <td>
 <?php 
--- a/git.php
+++ b/git.php
@@ -1,13 +1,16 @@
 <?php
 // $Id$
-$_SERVER['BASE_PAGE'] = 'svn.php';
+$_SERVER['BASE_PAGE'] = 'git.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 $SIDEBAR_DATA = '
-<h3>What is SVN?</h3>
+<h3>What is Git?</h3>
 <p>
- You can find more information about SVN, and
- download clients for most major platforms, at
- <a href="http://subversion.apache.org">the official SVN site</a>.
+ You can find more information about Git and download clients for most major
+ platforms at <a href="http://git-scm.com/">the official Git site</a>.
+</p>
+
+<p>
+ The <a href="http://progit.org/">Pro Git book</a> may also be useful.
 </p>


@@ -15,7 +18,7 @@ $SIDEBAR_DATA = '
 <p>
 If you would like to join PHP development or would like to
 contribute to the PHP documentation, contact the relevant
- group. You may want <a href="/svn-php.php">your own SVN account</a>
+ group. You may want <a href="/git-php.php">your own Git account</a>
 to contribute.
 </p>

@@ -26,18 +29,17 @@ $SIDEBAR_DATA = '
 Compiled snapshots for Windows users are also included.
 </p>
 ';
-site_header("SVN Access", array("current" => "community"));
+site_header("Git Access", array("current" => "community"));
 ?>

-<h1>SVN Access</h1>
+<h1>Git Access</h1>

 <p>
- If you wish to get the latest PHP source tree, you can obtain it
- through SVN. You should be warned that the SVN version
- is a development version, and as such, is often unstable, and may
- not even compile properly. The advantage of using SVN, though,
- is that you can get the latest fixes and updates, without having
- to wait for the official releases.
+ If you wish to get the latest PHP source tree, you can obtain it through Git.
+ You should be warned that the Git version is a development version, and as
+ such, is often unstable, and may not even compile properly. The advantage of
+ using Git, though, is that you can get the latest fixes and updates, without
+ having to wait for the official releases.
 </p>

 <p>
@@ -62,30 +64,42 @@ site_header("SVN Access", array("current" => "community"));
 <a href="#buildconf_fail">buildconf failures</a>.
 </p>

-<h2>Steps for using PHP from SVN</h2>
-<p>Note to PHP.net developers: SSL is set up, so use your credentials and https://svn.php.net/ to access SVN.</p>
+<h2>Steps for using PHP from Git</h2>
+
 <ol>
+ <li>
+  You can retrieve the PHP source code from
+  <a href="http://git.php.net/">git.php.net</a> with this command:
+  <br /><br />
+  <code>git clone http://git.php.net/repository/php-src.git</code>
+  <br /><br />
+
+  Or from the <a href="https://github.com/php/php-src">GitHub mirror</a>, which
+  you may want to use if you plan to create pull requests:
+  <br /><br />
+  <code>git clone https://github.com/php/php-src.git</code>
+  <br /><br />
+ </li>

 <li>
-  The <em>recommended</em> way is to make a sparse checkout of the php-src directory only, then grab
-  the parts that you need. This enables a single commit to span multiple branches.
+  Make sure you're in the right directory to work on PHP:
  <br /><br />
-  <code>svn checkout https://svn.php.net/repository/php/php-src --depth immediates php-src</code><br />
-  <code>cd php-src</code><br />
-  <code>svn update branches tags --set-depth immediates</code><br />
-  <code>svn update trunk branches/PHP_5_4 branches/PHP_5_3 --set-depth infinity</code><br /><br />
+  <code>cd php-src</code>
+  <br /><br />
+ </li>

-  Or alternatively, you can fetch the current PHP source code and the active branches:<br /><br />
+ <li>
+  You can then check out the branch you want to build:
+  <br /><br />
  <strong>PHP 5.3</strong>:
-  <code>svn checkout https://svn.php.net/repository/php/php-src/branches/PHP_5_3 php-src-5.3</code>
+  <code>git checkout PHP-5.3</code>
  <br />
  <strong>PHP 5.4</strong>:
-  <code>svn checkout https://svn.php.net/repository/php/php-src/branches/PHP_5_4 php-src-5.4</code>
+  <code>git checkout PHP-5.4</code>
  <br />
  <strong>PHP HEAD</strong>:
-  <code>svn checkout https://svn.php.net/repository/php/php-src/trunk php-src-trunk</code>
+  <code>git checkout master</code>
  <br /><br />
-  The branch names can also be used for SVN diff and merge operations.
 </li>

 <li>
@@ -107,16 +121,32 @@ site_header("SVN Access", array("current" => "community"));
  the official packages with one main difference &ndash; you may need bison 1.28 or later
  and flex 2.5.4 (PHP 5.2 and earlier) or re2c 0.13.4+ or later (PHP 5.3 and later) to
  compile, because the pre-generated scanner and parser files may not
-  be included in SVN.
+  be included in Git.
 </li>
 </ol>

 <p>
 There are many other things, such as the XML source code
- for the documentation, available via SVN. See
- <a href="http://svn.php.net/">the web-based view of the SVN
- server</a> to see what is available. For example, to checkout the
- latest english version of the PHP manual:<br />
+ for the documentation, available via Git. See
+ <a href="http://git.php.net/">the web-based view of the Git
+ server</a> to see what is available.
+</p>
+
+<p>
+ The PHP Wiki has a useful
+ <a href="https://wiki.php.net/vcs/gitfaq">Git FAQ</a>, which provides useful
+ tips and cheatsheets for using the PHP Git repository, and if you want to
+ become involved in developing PHP, the
+ <a href="https://wiki.php.net/vcs/gitworkflow">Git Workflow</a> page is also
+ likely to be of interest.
+</p>
+
+<h2>PHP manual</h2>
+
+<p>
+ The PHP manual is still currently hosted on SVN, although it will be migrated
+ to Git in the near future. To checkout the latest English version of the PHP
+ manual:<br />
 <code>svn checkout https://svn.php.net/repository/phpdoc/modules/doc-en ./phpdoc-en</code>
 <br /><br />
 You can also check the <a href="https://wiki.php.net/vcs/svnfaq">SVN FAQ on the wiki</a>.
--- a/include/header.inc
+++ b/include/header.inc
@@ -198,7 +198,7 @@ if (isset($shortname) && $shortname) {
        <dd><a href="/mailing-lists.php">Mailing lists</a></dd>
        <dd><a href="/support.php">General resources</a></dd>
        <dd><a href="/ChangeLog-5.php">Changelog (PHP 5)</a></dd>
-        <dd><a href="/svn.php">SVN (PHP Source)</a></dd>
+        <dd><a href="/git.php">Git (PHP Source)</a></dd>
    </dl>
    <dl>
      <dt><a href="https://bugs.php.net/">Bugs</a></dt>
--- a/license/contrib-guidelines-code.php
+++ b/license/contrib-guidelines-code.php
@@ -7,7 +7,7 @@ site_header("License Information", array("current" => "help"));
 <h2>PHP Contributor Guidelines for Code Developers</h2>

 <p>
-  Before you complete the form to request a SVN account, you must understand and accept the principles under which PHP 
+  Before you complete the form to request a Git account, you must understand and accept the principles under which PHP 
  itself is developed. These are summarised in the next paragraph.
 </p>
 <p>
--- a/mailing-lists.php
+++ b/mailing-lists.php
@@ -241,12 +241,12 @@ if (isset($_POST['maillist'])) {
      FALSE, FALSE, TRUE, "php.internals.win"
    ),
    array (
-      'php-cvs', 'SVN commit list',
+      'php-cvs', 'Git commit list',
      'All commits to internals (php-src) and the Zend Engine are posted to this list automatically',
      TRUE, TRUE, FALSE, "php.cvs"
    ),
    array (
-      'php-cvs-daily', 'Daily SVN commit summary',
+      'php-cvs-daily', 'Daily Git commit summary',
      'Daily changelog and NEWS file updates',
      TRUE, FALSE, FALSE, ""
    ),
--- a/sitemap.php
+++ b/sitemap.php
@@ -76,11 +76,11 @@ site_header("Sitemap", array("current" => "help"));
 <li><a href="/sites.php">PHP.net Sites List</a></li>
 </ul>

-<h2>SVN instructions</h2>
+<h2>Git instructions</h2>

 <ul>
- <li><a href="/svn.php">Getting PHP from SVN</a></li>
- <li><a href="/svn-php.php">Using SVN for PHP Development</a></li>
+ <li><a href="/git.php">Getting PHP from Git</a></li>
+ <li><a href="/git-php.php">Using Git for PHP Development</a></li>
 <!-- <li><a href="/svnsync.php">Maintaining a Local SVN Repository</a></li> -->
 </ul>

--- a/sitemap.xml
+++ b/sitemap.xml
@@ -49,6 +49,12 @@
 <url>
  <loc>http://php.net/get-involved.php</loc>
 </url>
+ <url>
+  <loc>http://php.net/git-php.php</loc>
+ </url>
+ <url>
+  <loc>http://php.net/git.php</loc>
+ </url>
 <url>
  <loc>http://php.net/license/</loc>
 </url>
@@ -118,12 +124,6 @@
 <url>
  <loc>http://php.net/support.php</loc>
 </url>
- <url>
-  <loc>http://php.net/svn-php.php</loc>
- </url>
- <url>
-  <loc>http://php.net/svn.php</loc>
- </url>
 <url>
  <loc>http://php.net/thanks.php</loc>
 </url>
@@ -139,4 +139,4 @@
 <url>
  <loc>http://php.net/usage.php</loc>
 </url>
-</urlset>
+</urlset>
--- a/sites.php
+++ b/sites.php
@@ -163,27 +163,40 @@ site_header("A Tourist's Guide", array("current" => "help"));
 process.
 </p>

-<h2><a href="http://svn.php.net/">svn.php.net</a>: SVN Repository</h2>
+<h2><a href="http://git.php.net/">git.php.net</a>: Git Repository</h2>

 <p>
- The PHP project is organized with a SVN server, and this website is the web
+ The PHP project is organized with a Git server, and this website is the web
 interface to it. There you can browse the history (and latest versions) of the
- source code for all of the PHP projects. For example, the <a
- href="http://svn.php.net/php/php-src/">php-src</a> module is the 
- repository for the source code to the latest version of PHP itself. Checking
- out the source code can be done <a href="svn.php">anonymously</a>.
+ source code for all of the PHP projects. For example, the
+ <a href="http://git.php.net/?p=php-src.git;a=summary">php-src</a> module is
+ the repository for the source code to the latest version of PHP itself.
+ Checking out the source code can be done <a href="git.php">anonymously</a>.
+</p>
+<p>
+ The Git repository is also mirrored on
+ <a href="https://github.com/php/php-src">GitHub</a>, for those who would
+ prefer to use GitHub's interface.
 </p>
 <p>
 Using <a href="http://lxr.php.net/">OpenGrok</a> is another option to view the
 source code, and it offers additional features like search and cross referencing.
 </p>

+<h2><a href="http://svn.php.net/">svn.php.net</a>: Archived SVN Repository</h2>
+
+<p>
+ The PHP project used to be organized under the SVN revision control system, but
+ migrated to <a href="http://git.php.net/">Git</a> (see above) in March 2012.
+ The old SVN repository is archived here for posterity.
+</p>
+
 <h2><a href="http://cvsold.php.net/">cvsold.php.net</a>: Archived CVS Repository</h2>

 <p>
 The PHP project used to be organized under the CVS revision control system, but
 migrated to <a href="http://svn.php.net/">Subversion</a> (see above) in July of 2009.
- The old CVS repository is archived here for posterity. It was formally named
+ The old CVS repository is archived here for posterity. It was formerly named
 cvs.php.net, but that now redirects to the SVN repository.
 </p>

@@ -223,7 +236,7 @@ site_header("A Tourist's Guide", array("current" => "help"));

 <p>
 This site is dedicated to automatic PHP code coverage testing. On a regular 
- basis current SVN snapshots are being build and tested on this machine. After 
+ basis current Git snapshots are being build and tested on this machine. After 
 all tests are done the results are visualized along with a code coverage 
 analysis.  
 </p>
--- a/source.php
+++ b/source.php
@@ -28,8 +28,8 @@ $SIDEBAR_DATA = '
 <p>
 Of course, if you want to see the <a href="/source.php?url=/source.php">source
 of this page</a>, we have it available.
- You can also browse the SVN repository for this website on
- <a href="http://svn.php.net/web/php/">svn.php.net</a>.
+ You can also browse the Git repository for this website on
+ <a href="http://git.php.net/?p=web/php.git;a=summary">git.php.net</a>.
 </p>
 ';
 site_header("Show Source", array("current" => "FIXME"));
--- a/thanks.php
+++ b/thanks.php
@@ -50,7 +50,7 @@ site_header("Thanks", array("current" => "FIXME"));

 <p>
 <a href="http://www.yahoo.com/">Yahoo! Inc.</a> provides bandwidth and 
- hardware for www.php.net and cvs.php.net.
+ hardware for www.php.net and git.php.net.
 </p>

 <p>
--- a/urlhowto.php
+++ b/urlhowto.php
@@ -178,7 +178,7 @@ function a($href) {
 before the first step (PHP page search) mentioned above. Some examples
 of shortcut aliases: <tt><?php echo $MYSITE; ?>whatisphp</tt>,
 <tt><?php echo $MYSITE; ?>php4news</tt>. The latter is an external page
- alias, as it points to a file on the SVN server, containing information
+ alias, as it points to a file on the Git server, containing information
 about changes in PHP. There are also some convenient aliases, like
 <tt><?php echo $MYSITE; ?>de/phpversion</tt> which displays the German
 manual page for the phpversion() function.