
buildbot at apache
Aug 8, 2012, 9:28 AM
Post #1 of 1
(18 views)
Permalink
|
|
svn commit: r828393 - in /websites/staging/httpd/trunk/content: ./ dev/devnotes.html
|
|
Author: buildbot Date: Wed Aug 8 16:28:59 2012 New Revision: 828393 Log: Staging update by buildbot for httpd Modified: websites/staging/httpd/trunk/content/ (props changed) websites/staging/httpd/trunk/content/dev/devnotes.html Propchange: websites/staging/httpd/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Wed Aug 8 16:28:59 2012 @@ -1 +1 @@ -1366144 +1370821 Modified: websites/staging/httpd/trunk/content/dev/devnotes.html ============================================================================== --- websites/staging/httpd/trunk/content/dev/devnotes.html (original) +++ websites/staging/httpd/trunk/content/dev/devnotes.html Wed Aug 8 16:28:59 2012 @@ -104,7 +104,7 @@ changes are applied:</p> <ol> <li>Developer checks out a copy of the files on which he wants to work (in this case, the trunk), into a private working directory -called<samp>httpd-trunk</samp>:</li> +called <samp>httpd-trunk</samp>:</li> </ol> <dl> <dd><samp>% svn checkout http://svn.apache.org/repos/asf/httpd/httpd/trunk @@ -112,7 +112,7 @@ called<samp>httpd-trunk</samp>:</li> </dl> <p>This step only needs to be performed once (unless the private working directory is tainted or deleted.) Committers should use a URL prefix -of<samp>https</samp>on the checkout, to save themselves headaches later.</p> +of <samp>https</samp> on the checkout, to save themselves headaches later.</p> <ol> <li>Developer keeps his working directory synchronised with changes made to the repository:</li> @@ -130,7 +130,7 @@ generates a patch so others can apply th <dd><samp>% svn diff httpd-trunk/modules/http/mod_mime.c > /tmp/foo</samp></dd> </dl> -<p>The<samp>/tmp/foo</samp>file is mailed to the <a href="http://httpd.apache.org/lists.html#http-dev">developers +<p>The <samp>/tmp/foo</samp> file is mailed to the <a href="http://httpd.apache.org/lists.html#http-dev">developers list</a> so they can consider the value/validity of the patch. It is worth making sure your code follows the Apache style, as described in the <a href="styleguide.html">style guide</a>.</p> @@ -142,14 +142,14 @@ developer checks the changes into the re <dd><samp>% svn commit httpd-trunk/modules/http/mod_mime.c</samp></dd> </dl> <h1 id="svn-subtrees">SVN Subtrees</h1> -<p>There are several different branches under the<samp>httpd</samp>subtree in +<p>There are several different branches under the <samp>httpd</samp> subtree in the Apache SVN repository that pertain to the different releases. The top level can be perused with the <a href="http://svn.apache.org/viewcvs.cgi/">SVN ViewCVS</a> pages. The main subtrees -pertaining to the<samp>httpd</samp>server source are:</p> +pertaining to the <samp>httpd</samp>server source are:</p> <h2 id="httpd-22">httpd-2.2</h2> <p>To create a directory tree containing the 2.2 sources, and call -it<samp>httpd-2.2</samp>, change your current directory to the <em>parent</em> of +it <samp>httpd-2.2</samp>, change your current directory to the <em>parent</em> of the tree and then check the 2.2 sources out as follows: <pre> % cd /usr/local/apache @@ -157,7 +157,7 @@ the tree and then check the 2.2 sources httpd-2.2</pre></p> <h2 id="httpd-24">httpd-2.4</h2> <p>To create a directory tree containing the 2.4 sources, and call -it<samp>httpd-2.4</samp>, change your current directory to the <em>parent</em> of +it <samp>httpd-2.4</samp>, change your current directory to the <em>parent</em> of the tree and then check the 2.4 sources out as follows: <pre> % cd /usr/local/apache @@ -166,22 +166,22 @@ the tree and then check the 2.4 sources <h2 id="httpd-25">httpd-2.5</h2> <p>If you want to check out the bleeding edge of development, the httpd-2.5 development tree (slated for a release 2.6), and call -it<samp>httpd-trunk</samp>, checkout as follows: +it <samp>httpd-trunk</samp>, checkout as follows: <pre> % cd /usr/local/apache % svn checkout http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk</pre></p> <h2 id="httpd-site">httpd-site</h2> <p>This subtree contains the files that live -at<samp>http://httpd.apache.org/</samp>. The directory on the host that +at <samp>http://httpd.apache.org/</samp>. The directory on the host that maps to that URL is actually a set of checked-out working copies of the SVN files.</p> <p>The SVN URL -is<samp>https://svn.apache.org/repos/asf/httpd/site/trunk/docs</samp>. +is <samp>https://svn.apache.org/repos/asf/httpd/site/trunk/docs</samp>. <make_note>It is important that the files on the Web host not be modified directly. If you want or need to change one, check it out into a private working copy, modify <strong>that</strong> , commit the change into SVN, and then -perform a<samp>svn update</samp>to bring the host directory into sync with +perform a <samp>svn update</samp>to bring the host directory into sync with the SVN sources.</make_note> The Web site <em>directories</em> (as opposed to files) are not maintained in synch with the SVN files automatically. They are manually updated from SVN @@ -189,20 +189,20 @@ by various people as they consider appro issue, unless a group of files are being updated according to an ongoing group discussion.</p> <h2 id="httpd-dist">httpd-dist</h2> -<p>Like the<samp>httpd-site</samp>subtree, this one is used to maintain the +<p>Like the <samp>httpd-site</samp>subtree, this one is used to maintain the files that comprise a website - in this -case,<samp>http://www.apache.org/dist/httpd/</samp>. Also like the previous +case, <samp>http://www.apache.org/dist/httpd/</samp>. Also like the previous subtree, the directory on the server is a checked-out working copy of this subtree. However, since this is a distribution directory, we only have the surrounding documentation and control files checked into this subtree -- the actual tarballs are simply copied to www.apache.org.</p> <p>The SVN URL -is<samp>https://svn.apache.org/repos/asf/httpd/httpd/dist</samp>.</p> +is <samp>https://svn.apache.org/repos/asf/httpd/httpd/dist</samp>.</p> <p>Committers will generally deal with this subtree when "rolling" a release. This is a series of steps taken to create a complete new release of the Apache httpd software. Amongst other things, the key to this subtree is -the<samp>tools/</samp>directory, which contains -the<samp>release.sh</samp>shell script. More information on the policies +the <samp>tools/</samp>directory, which contains +the <samp>release.sh</samp>shell script. More information on the policies and procedures relating to rolling releases can be found on the <a href="release.html">Release Guidelines</a> page.</p> <h1 id="setting-up-remote-svn">Setting Up Remote SVN</h1>
|