[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  55ce5ac Announce Samba 4.2.0rc2.
      from  9367762 Added Ralph Boehme to team member list

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


- Log -----------------------------------------------------------------
commit 55ce5aca24cd6029b90f3c716816a8e19f9c460b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Oct 15 10:45:43 2014 +0200

    Announce Samba 4.2.0rc2.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

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

Summary of changes:
 generated_news/latest_10_bodies.html    |   23 ++++++++++++-----------
 generated_news/latest_10_headlines.html |    4 ++--
 generated_news/latest_2_bodies.html     |   23 +++++++++++------------
 3 files changed, 25 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html
index c6188f2..53479d8 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,15 @@
+	<h5><a name="4.2.0rc2">15 October 2014</a></h5>
+	<p class="headline">Samba 4.2.0rc2 Available for Download</p>
+	<p>This is the second release candidate of the upcoming Samba 4.2 release
+	series.</p>
+
+<p>The uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+<a href="https://download.samba.org/pub/samba/rc/samba-4.2.0rc2.tar.gz">downloaded
+now</a>. See <a href="https://download.samba.org/pub/samba/rc/WHATSNEW-4.2.0rc2.txt">
+the release notes for more info</a>.</p>
+
+
 	<h5><a name="4.2.0rc1">01 October 2014</a></h5>
 	<p class="headline">Samba 4.2.0rc1 Available for Download</p>
 	<p>This is the first release candidate of the upcoming Samba 4.2 release
@@ -126,14 +138,3 @@ now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-4.0.17-4.0.18.diffs
 patch against Samba 4.0.17</a> is also available. See
 <a href="http://samba.org/samba/history/samba-4.0.18.html"> the release notes
  for more info</a>.</p>
-
-
-	<h5><a name="sambaxp2014">05 May 2014</a></h5>
-	<p class="headline">SambaXP 2014: conference schedule is online!</p>
-
-<p>From May 13th to 16th 2014 developers and users will meet again in
-Goettingen, Germany at the 13th international SAMBA conference, the
-"samba eXPerience 2014".</p>
-<p>The conference schedule is online now.
-Please find all necessary information at the
-<a href="http://sambaXP.org">conference website</a>.</p>
diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html
index e96b354..196177e 100644
--- a/generated_news/latest_10_headlines.html
+++ b/generated_news/latest_10_headlines.html
@@ -1,4 +1,6 @@
 <ul>
+	<li> 15 October 2014 <a href="#4.2.0rc2">Samba 4.2.0rc2 Available for Download</a></li>
+
 	<li> 01 October 2014 <a href="#4.2.0rc1">Samba 4.2.0rc1 Available for Download</a></li>
 
 	<li> 15 September 2014 <a href="#4.0.22">Samba 4.0.22 Available for Download</a></li>
@@ -19,6 +21,4 @@
 	<li> 03 June 2014 <a href="#4.1.8">Samba 4.1.8 Available for Download</a></li>
 
 	<li> 27 May 2014 <a href="#4.0.18">Samba 4.0.18 Available for Download</a></li>
-
-	<li> 05 May 2014<a href="#sambaxp2014">SambaXP 2014: conference schedule is online!</a></li>
 </ul>
diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html
index e169190..7ced388 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,14 @@
+	<h5><a name="4.2.0rc2">15 October 2014</a></h5>
+	<p class="headline">Samba 4.2.0rc2 Available for Download</p>
+	<p>This is the second release candidate of the upcoming Samba 4.2 release
+	series.</p>
+
+<p>The uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+<a href="https://download.samba.org/pub/samba/rc/samba-4.2.0rc2.tar.gz">downloaded
+now</a>. See <a href="https://download.samba.org/pub/samba/rc/WHATSNEW-4.2.0rc2.txt">
+the release notes for more info</a>.</p>
+
 	<h5><a name="4.2.0rc1">01 October 2014</a></h5>
 	<p class="headline">Samba 4.2.0rc1 Available for Download</p>
 	<p>This is the first release candidate of the upcoming Samba 4.2 release
@@ -8,15 +19,3 @@ using GnuPG (ID 6568B7EA).  The source code can be
 <a href="https://download.samba.org/pub/samba/rc/samba-4.2.0rc1.tar.gz">downloaded
 now</a>. See <a href="https://download.samba.org/pub/samba/rc/WHATSNEW-4.2.0rc1.txt">
 the release notes for more info</a>.</p>
-
-	<h5><a name="4.0.22">15 September 2014</a></h5>
-	<p class="headline">Samba 4.0.22 Available for Download</p>
-	<p>This is the latest stable release of the Samba 4.0 series.</p>
-
-<p>The uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-<a href="http://samba.org/samba/ftp/stable/samba-4.0.22.tar.gz">downloaded
-now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-4.0.21-4.0.22.diffs.gz">
-patch against Samba 4.0.21</a> is also available. See
-<a href="http://samba.org/samba/history/samba-4.0.22.html"> the release notes
- for more info</a>.</p>


-- 
Samba Website Repository