[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  86cee6d Link to the results of the Samba survey.
      from  1c81898 Announce Samba 4.1.18.

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


- Log -----------------------------------------------------------------
commit 86cee6d6de8eefaf9e8bef497ae67bebfdedd08a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu May 21 21:08:12 2015 +0200

    Link to the results of the Samba survey.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

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

Summary of changes:
 generated_news/latest_10_bodies.html | 19 ++++++++-----------
 generated_news/latest_2_bodies.html  | 21 +++++++++------------
 2 files changed, 17 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html
index 3f75ac1..b7dfba2 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,11 @@
+<h5><a name="results_survey2015">21 May 2015</a></h5>
+	<p class="headline">2015 User Survey: The Results</p>
+	<p>What Samba features do you care about most? Do you have problems or
+	ideas to tell the Samba Team? Which parts of the documentation are
+	most important to you?</p>
+	<p>The Samba Team conducted a survey and here are the 
+	<a href="https://www.samba.org/~mmuehlfeld/UserSurvey2015/SummaryReports/Samba_User_Survey_2015_Summary_report_Completed_only_with_comments.pdf">results</a>.</p>
+
 	<h5><a name="4.1.18">12 May 2015</a></h5>
 	<p class="headline">Samba 4.1.18 Available for Download</p>
 	<p>This is the last stable release of the Samba 4.1 series.</p>
@@ -104,14 +112,3 @@ the release notes for more info</a>.</p>
 	<p>The call for papers and early bird registration are open until February
 	28th 2015. Please find all necessary information at the
 	<a href="http://sambaXP.org">conference site</a>.</p>
-
-	<h5><a name="4.2.0rc4">16 January 2015</a></h5>
-	<p class="headline">Samba 4.2.0rc4 Available for Download</p>
-	<p>This is the fourth release candidate of the upcoming Samba 4.2 release
-	series. It includes the fix for CVE-2014-8143 and other bug fixes.</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.0rc4.tar.gz">downloaded
-now</a>. See <a href="https://download.samba.org/pub/samba/rc/WHATSNEW-4.2.0rc4.txt">
-the release notes for more info</a>.</p>
diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html
index 9b79165..f127873 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,12 @@
+<h5><a name="results_survey2015">21 May 2015</a></h5>
+	<p class="headline">2015 User Survey: The Results</p>
+	<p>What Samba features do you care about most? Do you have problems or
+	ideas to tell the Samba Team? Which parts of the documentation are
+	most important to you?</p>
+	<p>The Samba Team conducted a survey and here are the 
+	<a href="https://www.samba.org/~mmuehlfeld/UserSurvey2015/SummaryReports/Samba_User_Survey_2015_Summary_report_Completed_only_with_comments.pdf">results</a>.</p>
+
+
 	<h5><a name="4.1.18">12 May 2015</a></h5>
 	<p class="headline">Samba 4.1.18 Available for Download</p>
 	<p>This is the last stable release of the Samba 4.1 series.</p>
@@ -9,15 +18,3 @@ now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-4.1.17-4.1.18.diffs
 patch against Samba 4.1.17</a> is also available. See
 <a href="http://samba.org/samba/history/samba-4.1.18.html"> the release notes
  for more info</a>.</p>
-
-	<h5><a name="4.0.26">6 May 2015</a></h5>
-	<p class="headline">Samba 4.0.26 Available for Download</p>
-	<p>This is the last 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.26.tar.gz">downloaded
-now</a>. A <a href="http://samba.org/samba/ftp/patches/patch-4.0.25-4.0.26.diffs.gz">
-patch against Samba 4.0.25</a> is also available. See
-<a href="http://samba.org/samba/history/samba-4.0.26.html"> the release notes
- for more info</a>.</p>


-- 
Samba Website Repository