Author: deryck
Date: 2006-08-10 20:10:26 +0000 (Thu, 10 Aug 2006)
New Revision: 1029

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1029

Log:
Merge to trunk.


Added:
   branches/samba-web-2.0/history/samba-3.0.23b.html
   branches/samba-web-2.0/patches/series-3.0.23b
Modified:
   branches/samba-web-2.0/devel/index.html
   branches/samba-web-2.0/docs/FAQ/index.html
   branches/samba-web-2.0/header_columns.html
   branches/samba-web-2.0/history/index.html
   branches/samba-web-2.0/index.html
   branches/samba-web-2.0/support/germany.html
   branches/samba-web-2.0/team/index.html


Changeset:
Modified: branches/samba-web-2.0/devel/index.html
===================================================================
--- branches/samba-web-2.0/devel/index.html     2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/devel/index.html     2006-08-10 20:10:26 UTC (rev 
1029)
@@ -14,8 +14,8 @@
 
 <p>As of 4 April 2004, the Samba Team converted from CVS to Subversion for 
maintaining the Samba source code.  All current development is done in a 
Subversion repository.  All older code is in the original CVS tree; this would 
include 2.2.x versions of Samba, which are no longer in active development.</p>
 
-<p>The latest production release is <em>Samba 3.0.23a</em> (<a
-href="/samba/history/samba-3.0.23a.html">release notes</a> and <a
+<p>The latest production release is <em>Samba 3.0.23b</em> (<a
+href="/samba/history/samba-3.0.23b.html">release notes</a> and <a
 href="/samba/download/">download</a>).</p> 
 
 <p>Ongoing future research is being done for Samba 4.0
@@ -30,19 +30,14 @@
 
   <ul>
     <li><h4><em>TRUNK</em></h4>
-    <p>This is the current development branch, based on the Samba 3.0
-    code base.  It is, obviously, not stable, as it is the ground where
-    features for future stable releases in the Samba 3.0.x series are 
implemented and tested.</p>
-    <p>Example checkout command:</p></li>
+    <p><b>NOTE:</b> TRUNK is no longer used for development.  See the news item
+       <a href="http://news.samba.org/developers/svn_repo_reorganized/";>SVN 
Repo 
+       Reorganzied</a> for more info.</p>
   </ul>
 
-<pre>
-svn co svn://svnanon.samba.org/samba/trunk samba-trunk
-</pre>
-
   <ul>
     <li><h4><em>SAMBA_3_0</em></h4>
-    <p>This is the development area for the 3.0.x production releases.</p>
+    <p>This is the current development branch for 3.0.x production 
releases.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -62,6 +57,20 @@
 
 
   <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>
+       <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
+</pre> 
+
+  <ul>
     <li><h4><em>SAMBA_4_0</em></h4>
     <p>This is the research branch for Samba 4. 
        <a href="/samba/ftp/samba4/">Technical Previews</a> of this code base 
are available 

Modified: branches/samba-web-2.0/docs/FAQ/index.html
===================================================================
--- branches/samba-web-2.0/docs/FAQ/index.html  2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/docs/FAQ/index.html  2006-08-10 20:10:26 UTC (rev 
1029)
@@ -34,7 +34,7 @@
 <h3>How can I keep up to date with Samba development?</h3>
 
 <p>For general information, such as release announcements, see 
-<a href="/http://news.samba.org/";>http://news.samba.org/</a>.
+<a href="http://news.samba.org/";>http://news.samba.org/</a>.
 For more in-depth info on the daily work of Samba development,
 it's best to subscribe to the <a 
href="https://lists.samba.org/mailman/listinfo/samba-technical";>samba-technical</a>
 mailing list, or visit 
 #samba-technical on irc.freenode.net.  The obsessive-compulsive will follow

Modified: branches/samba-web-2.0/header_columns.html
===================================================================
--- branches/samba-web-2.0/header_columns.html  2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/header_columns.html  2006-08-10 20:10:26 UTC (rev 
1029)
@@ -129,9 +129,9 @@
   <div class="releases">
     <h4>Current Stable Release</h4>
     <ul>
-    <li><a href="/samba/ftp/stable/samba-3.0.23a.tar.gz">Samba 3.0.23a 
(gzipped)</a></li>
-    <li><a href="/samba/history/samba-3.0.23a.html">Release Notes</a></li>
-    <li><a href="/samba/ftp/stable/samba-3.0.23a.tar.asc">Signature</a></li>
+    <li><a href="/samba/ftp/stable/samba-3.0.23b.tar.gz">Samba 3.0.23b 
(gzipped)</a></li>
+    <li><a href="/samba/history/samba-3.0.23b.html">Release Notes</a></li>
+    <li><a href="/samba/ftp/stable/samba-3.0.23b.tar.asc">Signature</a></li>
     </ul>
     
     <h4>Historical</h4>

Modified: branches/samba-web-2.0/history/index.html
===================================================================
--- branches/samba-web-2.0/history/index.html   2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/history/index.html   2006-08-10 20:10:26 UTC (rev 
1029)
@@ -6,8 +6,8 @@
 
 <div class="latest"> 
   <ul>
-  <li>Latest Release &mdash; <a href="/samba/#latest">Samba 3.0.23a</a></li>
-  <li>Current Stable Release &mdash; <a href="/samba/#latest">Samba 
3.0.23a</a></li> 
+  <li>Latest Release &mdash; <a href="/samba/#latest">Samba 3.0.23b</a></li>
+  <li>Current Stable Release &mdash; <a href="/samba/#latest">Samba 
3.0.23b</a></li> 
   <!-- Second link will point to #stable on this page when current release is 
a development release -->
   </ul>
 </div>
@@ -16,7 +16,26 @@
 
 
 <h2>Previous Release Announcments</h2>
+<h4><a>21 Jul 2006</a></h4>
+<p class="headline">Samba 3.0.23a Available for Download</p>
 
+<p>The Samba Team is pleased to announce the general availability of Samba 
3.0.23a.
+This is the latest stable release of Samba. This is the version 
+that production Samba servers should be running for all current 
+bug-fixes.  Please read the changes in the 
+<a href="http://www.samba.org/samba/history/samba-3.0.23a.html";>Release 
Notes</a>
+for details on new features and difference in behavior 
+from previous releases.</p>
+
+<p>The <a href="/samba/ftp/samba-3.0.23a.tar.gz">Samba 3.0.23a
+source code</a> can be downloaded now.  The <a
+href="/samba/ftp/samba-3.0.23a.tar.asc">GnuPG
+signature for the <em>un</em>compressed tarball</a> is also 
+available.  Precompiled packages are available in the 
+<a href="/samba/ftp/Binary_Packages/">Binary_Packages
+download area</a>.</p>
+
+
 <h4><a>10 Jul 2006</a></h4>
 <p class="headline">Samba 3.0.23 Available for Download</p>
 
@@ -271,35 +290,4 @@
 Packages for other platforms will be available shortly.</p>
 
 
-<h4><a>30 Dec 2005</a></h4>
-<p class="headline">Samba 3.0.21a Available for Download</p>
-
-<p>This is the latest stable release of Samba. This is the version
-that production Samba servers should be running for all current
-bug-fixes.  This release is to address a bug in the oplock code 
-which may cause clients to stall when multiple users are accessing 
-a share concurrently (<a href="https://bugzilla.samba.org/bug/3349";>BUG 
3349</a>).
-Please read the <a 
-href="/samba/history/samba-3.0.21a.html">changes in this release</a>.</p>
-
-<p>The <a href="/samba/ftp/samba-3.0.21a.tar.gz">Samba 3.0.21a
-source code</a> can be downloaded now.  The <a
-href="/samba/ftp/samba-3.0.21a.tar.asc">GnuPG
-signature for the <em>un</em>compressed tarball</a> is also available.
-If you prefer to download just the diff from 3.0.21 to 3.0.21a, the 
-<a href="/samba/ftp/patch-3.0.21-3.0.21a.diffs.gz">patch file</a> 
-(<a href="/samba/ftp/patch-3.0.21-3.0.21a.diffs.asc">gpg signature</a>) is 
also available.  
-The single patch for Samba 3.0.21 is available from 
-<a href="http://www.samba.org/samba/patches/";>the patches page</a>.
-Precompiled packages for Fedora Core 4, RedHat 9, AIX, and Solaris are 
available in the
-<a href="/samba/ftp/Binary_Packages/">Binary_Packages download area</a>.  
-Packages for other platforms will be available shortly.</p>
-
-<p>Samba 3.0.21a is also available via BitTorrent
-(<a 
href="http://torrent.samba.org/samba/ftp/samba-3.0.21a.tar.gz.torrent";>samba-3.0.21a.tar.gz.torrent</a>).
-Note that when downloading via BitTorrent, you are encouraged
-to verify the resulting uncompressed tarball's
-<a href="/samba/ftp/samba-3.0.21a.tar.asc">GPG signature</a>.</p>
-
-
 <!--#include virtual="footer_history.html" -->

Copied: branches/samba-web-2.0/history/samba-3.0.23b.html (from rev 1028, 
trunk/history/samba-3.0.23b.html)

Modified: branches/samba-web-2.0/index.html
===================================================================
--- branches/samba-web-2.0/index.html   2006-08-10 19:59:14 UTC (rev 1028)
+++ branches/samba-web-2.0/index.html   2006-08-10 20:10:26 UTC (rev 1029)
@@ -15,24 +15,24 @@
 
     <h2>Current Release</h2>
 
-    <h4><a name="latest">21 Jul 2006</a></h4>
-    <p class="headline">Samba 3.0.23a Available for Download</p>
+    <h4><a name="latest">8 Aug 2006</a></h4>
+    <p class="headline">Samba 3.0.23b Available for Download</p>
 
-    <p>The Samba Team is pleased to announce the general availability of Samba 
3.0.23a.
+    <p>The Samba Team is pleased to announce the general availability of Samba 
3.0.23b.
        This is the latest stable release of Samba. This is the version 
        that production Samba servers should be running for all current 
        bug-fixes.  Please read the changes in the 
-       <a href="http://www.samba.org/samba/history/samba-3.0.23a.html";>Release 
Notes</a>
+       <a href="http://www.samba.org/samba/history/samba-3.0.23b.html";>Release 
Notes</a>
        for details on new features and difference in behavior 
        from previous releases.</p>
 
-    <p>The <a href="/samba/ftp/samba-3.0.23a.tar.gz">Samba 3.0.23a
+    <p>The <a href="/samba/ftp/samba-3.0.23b.tar.gz">Samba 3.0.23b
        source code</a> can be downloaded now.  The <a
-       href="/samba/ftp/samba-3.0.23a.tar.asc">GnuPG
+       href="/samba/ftp/samba-3.0.23b.tar.asc">GnuPG
        signature for the <em>un</em>compressed tarball</a> is also 
-       available.  Precompiled packages are available in the 
-       <a href="/samba/ftp/Binary_Packages/">Binary_Packages
-       download area</a>.</p>
+       available.  Please read these <a href="/samba/download/">instructions 
on  
+       how to verify the gpg signature</a>.  Precompiled packages are 
available in the 
+       <a href="/samba/ftp/Binary_Packages/">Binary_Packages download 
area</a>.</p>
 
     <h4>23 Mar 2006</h4>
     <p class="headline">Samba 4.0.0TP2 Available for Download</p> 

Copied: branches/samba-web-2.0/patches/series-3.0.23b (from rev 1028, 
trunk/patches/series-3.0.23b)

Modified: branches/samba-web-2.0/support/germany.html
===================================================================
--- branches/samba-web-2.0/support/germany.html 2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/support/germany.html 2006-08-10 20:10:26 UTC (rev 
1029)
@@ -72,7 +72,7 @@
 <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
 <a href="http://www.univention.de/";>www.univention.de</a>
 
-Univention gehi&ouml;rt zu den f&uuml;hrenden Anbietern von L&ouml;sungen und
+Univention geh&ouml;rt zu den f&uuml;hrenden Anbietern von L&ouml;sungen und
 Dienstleistungen, die Organisationen den Wechsel zu wirtschaftlichen
 Linux-L&ouml;sungen gestatten. Im Mittelpunkt stehen die 
Linux-Komplettl&ouml;sung
 Univention Corporate Server (UCS) und die Groupware-Komplettl&ouml;sung 
Univention

Modified: branches/samba-web-2.0/team/index.html
===================================================================
--- branches/samba-web-2.0/team/index.html      2006-08-10 19:59:14 UTC (rev 
1028)
+++ branches/samba-web-2.0/team/index.html      2006-08-10 20:10:26 UTC (rev 
1029)
@@ -44,7 +44,7 @@
 <li><a href="mailto:[EMAIL PROTECTED]">Alexander Bokovoy</a></li>
 <li><a href="http://www.plainjoe.org/";>Gerald Carter</a></li>
 
-<li><a href="mailto:[EMAIL PROTECTED]">Guenther Deschner</a></li>
+<li><a href="http://samba.org/~gd";>G&uuml;nther Deschner</a></li>
 <li><a href="mailto:[EMAIL PROTECTED]">David Fenwick</a></li>
 <li><a href="mailto:[EMAIL PROTECTED]">Steve French</a></li>
 <li><a href="mailto:[EMAIL PROTECTED]">Paul Green</a></li>

Reply via email to