[SCM] Samba Website Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  a3df827 Announce SambaXP 2014
      from  95ca551 Announce Samba 4.1.7.

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


- Log -----------------------------------------------------------------
commit a3df8277bddcaf74efc3ddd70ff2c4a86a2a56e5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 5 12:28:48 2014 +0200

    Announce SambaXP 2014
    
    metze

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

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


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html
index b7692de..92273cc 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,13 @@
+	<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>
+
 	<h5><a name="4.1.7">17 April 2014</a></h5>
 	<p class="headline">Samba 4.1.7 Available for Download</p>
 	<p>This is the latest stable release of the Samba 4.1 series.</p>
@@ -133,16 +143,3 @@ patch against Samba 4.0.13</a> is also available. See
 	<li><a href="http://samba.org/samba/ftp/stable/samba-3.6.22.tar.gz">download
 	Samba 3.6.22</a>.</li>
 	</p>
-
-
-	<h5><a name="3.6.21">29 November 2013</a></h5>
-	<p class="headline">Samba 3.6.21 Available for Download</p>
-	<p>This is the latest stable release of the Samba 3.6 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-3.6.21.tar.gz">downloaded
-now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-3.6.20-3.6.21.diffs.gz">
-patch against Samba 3.6.20</a> is also available. See
-<a href="http://samba.org/samba/history/samba-3.6.21.html"> the release notes
- for more info</a>.</p>
diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html
index c89f8ad..9764405 100644
--- a/generated_news/latest_10_headlines.html
+++ b/generated_news/latest_10_headlines.html
@@ -1,4 +1,6 @@
 <ul>
+	<li> 05 May 2014<a href="#sambaxp2014">SambaXP 2014: conference schedule is online!</a></li>
+
 	<li> 17 April 2014 <a href="#4.1.7">Samba 4.1.7 Available for Download</a></li>
 
 	<li> 15 April 2014 <a href="#4.0.17">Samba 4.0.17 Available for Download</a></li>
@@ -20,6 +22,4 @@
 	<li> 09 December 2013 <a href="#4.1.3">Samba 4.1.3, 4.0.13
 	and 3.6.22 Security Releases Available for Download (CVE-2013-4408 and
 	CVE-2012-6150)</a></li>
-
-	<li> 29 November 2013 <a href="#3.6.21">Samba 3.6.21 Available for Download</a></li>
 </ul>
diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html
index c665684..6e855e8 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,13 @@
+	<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>
+
 	<h5><a name="4.1.7">17 April 2014</a></h5>
 	<p class="headline">Samba 4.1.7 Available for Download</p>
 	<p>This is the latest stable release of the Samba 4.1 series.</p>
@@ -10,15 +20,3 @@ patch against Samba 4.1.6</a> is also available. See
 <a href="http://samba.org/samba/history/samba-4.1.7.html"> the release notes
  for more info</a>.</p>
 
-
-	<h5><a name="4.0.17">15 April 2014</a></h5>
-	<p class="headline">Samba 4.0.17 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.17.tar.gz">downloaded
-now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-4.0.16-4.0.17.diffs.gz">
-patch against Samba 4.0.16</a> is also available. See
-<a href="http://samba.org/samba/history/samba-4.0.17.html"> the release notes
- for more info</a>.</p>


-- 
Samba Website Repository