[SCM] Samba Website Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  c06dfdc update intro to devel.samba.org home page
      from  81c231d revamp TODO page to point correctly to the wiki

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


- Log -----------------------------------------------------------------
commit c06dfdc5383497902a60057813c30ca055d0455d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jun 19 12:13:54 2014 +1200

    update intro to devel.samba.org home page

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

Summary of changes:
 devel/index.html    |    4 +---
 docs/FAQ/index.html |    9 +++++----
 2 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/devel/index.html b/devel/index.html
index 68bb8fd..0ff27b1 100755
--- a/devel/index.html
+++ b/devel/index.html
@@ -4,9 +4,7 @@
 
 <h2>Development</h2>
 
-<p>devel.samba.org contains information about the current state of Samba development. It should be of interest to those developing Samba as well as to those following Samba development.</p>
-
-<p>Very often, questions arise concerning future plans for Samba.  For example:  "What functionality will be included in the next stable release?"  "What are the differences between the various  branches?" And also, "How can I learn more, get involved, help, etc?"  The information on this page is provided to help answer those kinds of questions.</p>
+<p>Very often, questions arise concerning  <a href="https://wiki.samba.org/index.php/Roadmap">future plans for Samba</a>.  For example:  "What functionality will be included in the next stable release?"  <a href="https://wiki.samba.org/index.php/Samba_Release_Planning">"What are the differences between the various  branches?"</a> And also, <a href="https://wiki.samba.org/index.php/Contribute">"How can I learn more, get involved, help, etc?"</a>  The information on this page is an introduction to help answer those kinds of questions, but much more can be found in the <a href="https://wiki.samba.org/index.php/Developer_documentation">Developer pages</a> in the <a href="https://wiki.samba.org/index.php">Samba wiki</a>.</p>
 
 <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>
 
diff --git a/docs/FAQ/index.html b/docs/FAQ/index.html
index 7b8aaea..aea51fe 100755
--- a/docs/FAQ/index.html
+++ b/docs/FAQ/index.html
@@ -40,12 +40,12 @@ it's best to subscribe to the <a href="https://lists.samba.org/mailman/listinfo/
 #samba-technical on irc.freenode.net.  The obsessive-compulsive will follow
 both.</p>
 
-<h3>How can I get involved with Samba development?</h3>
+<h3>How can I get involved with <a href="/samba/devel/">Samba development</a>?</h3>
 
 <p>The usual course is to become active on the mailing lists and/or
 IRC first.  Then, when you spot a bug or think of some cool feature you'd
-like to see Samba implement, work up a patch and submit it to the samba-technical
-mailing list.</p>
+like to see Samba implement, work up a patch and follow our <a href="https://wiki.samba.org/index.php/Contribute>contribution guide"</a> on how to submit it to the samba-technical
+mailing list.  Please also see our page on <a href="/samba/devel/copyright-policy.html">contributor copyright</a></p>
 
 <p>The really thorough contributor will also find the corresponding bug
 in <a href="https:bugzilla.samba.org/">Bugzilla</a> and attach the patch there.
@@ -59,7 +59,8 @@ affect on other functionality, then yes, it will likely be included.</p>
 
 <p>If the patch implements a new feature, then larger questions about usefulness 
 and maintainability also have to be addressed.  Generally, though, we try
-to include as much good work as we can.</p>
+to include as much good work as we can, the <a href="https://wiki.samba.org/index.php/Samba_Release_Planning">Release
+Planning</a> Wiki page contains details on what patches can be accepted into what branches.</a>
 
 <h3>Which Samba version should I run?</h3>
 <p>The most recent release is always the recommended version for production use.


-- 
Samba Website Repository