Author: vlendec Date: 2007-07-29 15:09:03 +0000 (Sun, 29 Jul 2007) New Revision: 1136
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1136 Log: Update the "hack samba" page. Deryck, please check! I've removed the references to the 3_x_RELEASE branch. With the new branching scheme I think those are not relevant for anybody but Jerry. Jerry, please correct me if I'm wrong here. Modified: trunk/devel/index.html Changeset: Modified: trunk/devel/index.html =================================================================== --- trunk/devel/index.html 2007-07-26 21:20:01 UTC (rev 1135) +++ trunk/devel/index.html 2007-07-29 15:09:03 UTC (rev 1136) @@ -18,11 +18,21 @@ href="/samba/history/samba-3.0.25b.html">release notes</a> and <a href="/samba/download/">download</a>).</p> +<p>With the release of version 3 of the GPL, the Samba Team decided to release +the next major production version of Samba under Samba 3.2.0 and discontinue +the <em>feature</em> development for Samba 3.0. See the Team's <a +href="http://news.samba.org/announcements/samba_gplv3/";>Announcement</a> on +GPLv3.</p> + <p>Ongoing future research is being done for Samba 4.0 -This work is concurrent with Samba 3.0 maintenance +This work is concurrent with Samba 3.2 maintenance and development. A <a href="/samba/ftp/samba4/">technology preview release</a> is available.</p> +<p>In addition to the Subversion references also see Jerry's wiki article on +<a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development";>Using +Git for Samba Development</a>.</p> + <br /> <h3>Samba Branches</h3> @@ -36,38 +46,26 @@ </ul> <ul> - <li><h4><em>SAMBA_3_0</em></h4> - <p>This is the current development branch for 3.0.x production releases.</p> + <li><h4><em>SAMBA_3_2</em></h4> + <p>This is the current development branch for 3.2.x production releases.</p> <p>Example checkout command:</p></li> </ul> <pre> -svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_0 samba3 +svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_2 samba3 </pre> <ul> - <li><h4><em>SAMBA_3_0_RELEASE</em></h4> - <p>This is the staging area used for freezing the 3.0.x release snapshots.</p> - <p>Example checkout command:</p></li> - </ul> - -<pre> -svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_0_RELEASE samba3_release -</pre> - - - <ul> - <li><h4>SAMBA_3_0_X</h4> - <p>After a release, a SAMBA_3_0_X branch is created, where X is the latest - release number (SAMBA_3_0_23, for example). This branch is a copy of - SAMBA_3_0_RELEASE at the time of release and is used for bug fixes only, so - that development may continue in SAMBA_3_0.</p> + <li><h4>SAMBA_3_2_X</h4> + <p>Before a release, a SAMBA_3_2_X branch is created, where X is the latest + release number (SAMBA_3_2_0, for example). This branch is used by + developers to check in stuff they want to see in the 3.2.x release.</p> <p>Example checkout command (remember to substitute for current release):</p> </li> </ul> <pre> -svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_0_23 samba_3.0.23 +svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_2_0 samba_3.2.0 </pre> <ul>
