[SCM] Samba Website Repository - branch master updated

Wed Oct 7 20:56:53 UTC 2015

The branch, master has been updated
       via  c86966c Remove information that is obsolte, better and duplicated in the wiki
       via  7333616 Remove list of branches from devel.samba.org
       via  e1f1ccc Improve mailing list info on the website
      from  811621c NEWS[SDC_and_IO_Lab]: ...and fix broken links

https://git.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c86966cf4d10b2a92acd027194c53490b6d381e4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 8 09:54:35 2015 +1300

    Remove information that is obsolte, better and duplicated in the wiki
    
    (Our history with CVS and SVN is interesting, but now quite historic)
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit 7333616e00490f80ac63d6fc09c62127a974df08
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 8 09:35:35 2015 +1300

    Remove list of branches from devel.samba.org
    
    This list is easier to maintain on the wiki
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit e1f1ccc6497c9f1c9f7cfc4a1681630d20bd2a64
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 8 09:06:58 2015 +1300

    Improve mailing list info on the website

-----------------------------------------------------------------------

Summary of changes:
 bugreports.html      |  8 ++++--
 devel/index.html     | 80 ++++++++++------------------------------------------
 docs/SambaIntro.html |  2 +-
 3 files changed, 21 insertions(+), 69 deletions(-)


Changeset truncated at 500 lines:

diff --git a/bugreports.html b/bugreports.html
index 902fb66..1916a4f 100755
--- a/bugreports.html
+++ b/bugreports.html
@@ -24,8 +24,10 @@ tracking interface at
 <em>Note that only legitimate bug reports
 will be dealt with via the bug tracking system.<br>
 Any queries for configuration help or general information will 
-be disregarded.  Please send such requests to <a href="mailto:samba at lists.samba.org">
-samba at lists.samba.org</a>.</em><br>
+be disregarded.  Please send such requests
+ to <a href="mailto:samba at lists.samba.org"> samba at lists.samba.org</a>
+ after <a href="https://lists.samba.org/mailman/listinfo/samba">subscribing
+ to the list</a>.</em><br>
 </p>
 
 <p>To make the most of your message and to help
@@ -35,7 +37,7 @@ about your operating system, compiler and runtime environment.</p>
 <h2>How to send patches?</h2>
 
 <p>Send patches to
-<a href="mailto:samba-technical at lists.samba.org">samba-technical at samba.org</a>
+<a href="mailto:samba-technical at lists.samba.org">samba-technical at lists.samba.org</a>
 Make sure they are in unidiff format and include any
 necessary documentation changes and take account of cross-platform
 issues. Half baked patches aren't really much use.</p>
diff --git a/devel/index.html b/devel/index.html
index f8698b9..5ec760d 100755
--- a/devel/index.html
+++ b/devel/index.html
@@ -8,82 +8,32 @@
 
 <blockquote><b>Important:</b> In order to avoid any potential licensing issues we require that anyone who has signed the <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cifs/protocol/royalty-free_cifs_technical_reference_license_agreement.asp">Microsoft CIFS Royalty Free Agreement</a> not submit patches to Samba, nor base patches on the referenced specification.  We require, too, that patches submitted to Samba not infringe on any known patents.  Finally, as with all GPL work, the submitter should ensure that submitted patches do not conflict with any third-party copyright.</blockquote>
 
-<h3>General Overview</h3>
-
-<p>On 10 January 2008 the Samba team completed the switch from Subversion to
-Git for all development branches.  With the transition to Git we also
-recovered in the main tree the CVS history.  All older code is in the
-original Subversion and CVS trees; this would include 3.0.x and 2.2.x
-versions of Samba, which are no longer in active development.
-</p>
-
-<p>With the release of Samba 4.3.0, the 4.2 series has been turned into
-maintenance mode, which means severe bug fixes and security fixes only.</p>
-
-<p>There will be security fixes only for the 4.1 series.</p>
-
-<p>The 4.0 series will be discontinued.</p>
-
-<p>For more details on the release series, current schedules and release modi,
-please see
-<a href="https://wiki.samba.org/index.php/Samba_Release_Planning">Samba Wiki
-Release Planning</a>.
-
-<br />
-<h3>Samba Branches</h3>
-
-<p>Areas of Samba development are listed below according to their branches within the Git source tree.  Plans for each release follow its listing, along with a sample check out command.</p>
-
-<h3>GIT</h3>
+<h3>Samba development is in GIT</h3>
 
 <p>Example checkout command for the main git repo:<br>
 </p>
 <pre>
-git-clone git://git.samba.org/samba.git samba
+git clone git://git.samba.org/samba.git samba
+</pre>
+or
+<pre>
+git clone https://git.samba.org/samba.git samba
 </pre>
-<p>See Jerry's wiki article on
+<p>For more details see
 <a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using
 Git for Samba Development</a>.</p>
 <p>Also see the wiki article on
 <a href="http://wiki.samba.org/index.php/Contribute">Contribute</a>.</p>
-<p>For more details on the Samba release planning and supported versions, please
-see <a href="https://wiki.samba.org/index.php/Samba_Release_Planning">Samba
-Release Planning</a>.</p>
 
-<p>List of branches:</p>
+<h3>Current release status</h3>
+
+<p>For more details on the release series, branch names, current schedules and release modi,
+please see
+<a href="https://wiki.samba.org/index.php/Samba_Release_Planning">Samba Wiki
+Release Planning</a>.
+
+<br />
 
-  <ul>
-    <li>
-      <h4><em>master</em></h4>
-      <p>This is the current Samba development branch.</p>
-    </li>
-    <li>
-      <h4><em>v4-1-test</em></h4>
-      <p>This is the current branch for 4.1.x maintenance releases
-	 (security fixes <em>only</em>).</p>
-    </li>
-    <li>
-      <h4><em>v4-1-stable</em></h4>
-      <p>This is the current branch for 4.1.x maintenance releases
-	 (security fixes <em>only</em>).</p>
-    </li>
-    <li>
-      <h4><em>v4-2-test</em></h4>
-      <p>This is the current branch for 4.2.x development.</p>
-    </li>
-    <li>
-      <h4><em>v4-2-stable</em></h4>
-      <p>This is the current branch for 4.2.x maintenance releases.</p>
-    </li>
-    <li>
-      <h4><em>v4-3-test</em></h4>
-      <p>This is the current branch for 4.3.x development.</p>
-    </li>
-    <li>
-      <h4><em>v4-3-stable</em></h4>
-      <p>This is the current branch for 4.3.x production releases.</p>
-    </li>
-  </ul>
 
 <br />
 <h3>TODO List</h3>
diff --git a/docs/SambaIntro.html b/docs/SambaIntro.html
index 734791a..9e085d0 100755
--- a/docs/SambaIntro.html
+++ b/docs/SambaIntro.html
@@ -368,7 +368,7 @@ available.  SGI now offers commercial support for Samba as do several
 other providers, many of which are listed on the Samba web site (see
 <CODE>http://samba.org/</CODE>).  Traditional Internet support is, of
 course, still available via the <CODE>comp.protocols.smb</CODE> newsgroup
-and the <CODE>samba at samba.org</CODE> mailing list.
+and the <CODE>samba at lists.samba.org</CODE> mailing list.
 
 <P>The Samba Team continues to work on new goodies.  Current interests
 include NT ACLs (<I><B>A</B>ccess <B>C</B>ontrol <B>L</B>ists</I>),


-- 
Samba Website Repository

