[SCM] Samba Website Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Dec 28 08:25:48 MST 2011
The branch, master has been updated
via 27208e3 Add overview page with API documentation.
via 11cb1e2 Remove obsolete roadmap-4.0 document.
via 1cac8e1 Remove references to CVS.
from 11cc645 Apply change proposed by Chris.
http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 27208e38ea592d15ae592dbe2c513c12e201c6d2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 28 16:19:21 2011 +0100
Add overview page with API documentation.
commit 11cb1e2328679f0cc22cd8ff0f58bc7f9634e7bf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 28 16:13:45 2011 +0100
Remove obsolete roadmap-4.0 document.
commit 1cac8e182ce1e571cbe704e79af5bb5d07fa0a02
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 28 16:12:31 2011 +0100
Remove references to CVS.
-----------------------------------------------------------------------
Summary of changes:
devel/API.html | 18 ++++++++++++++++++
devel/index.html | 16 ++++++++--------
devel/roadmap-4.0.html | 9 ---------
3 files changed, 26 insertions(+), 17 deletions(-)
create mode 100644 devel/API.html
delete mode 100644 devel/roadmap-4.0.html
Changeset truncated at 500 lines:
diff --git a/devel/API.html b/devel/API.html
new file mode 100644
index 0000000..4e147e1
--- /dev/null
+++ b/devel/API.html
@@ -0,0 +1,18 @@
+<!--#include virtual="/samba/header.html" -->
+ <title>API Documentation</title>
+<!--#include virtual="/samba/header_wide.html" -->
+
+<h1>API documentation</h1>
+
+<p>Most of this documentation is automatically generated from the
+code on a daily basis. To improve the documentation, update the
+comments in the headers, Python code or doxygen files.</p>
+
+<ul>
+ <li><a href="http://talloc.samba.org/talloc/doc/html/">talloc</a></li>
+ <li><a href="http://tdb.samba.org/">tdb</a></li>
+ <li><a href="http://tevent.samba.org/">tevent</a></li>
+ <li><a href="http://www.samba.org/~jelmer/samba4/pydoctor/">Samba 4 Python modules</a></li>
+</ul>
+
+<!--#include virtual="/samba/footer.html" -->
diff --git a/devel/index.html b/devel/index.html
index 46ecf19..0e25da9 100755
--- a/devel/index.html
+++ b/devel/index.html
@@ -6,18 +6,17 @@
<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 CVS and Subversion code 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 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>
<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 4 April 2004, the Samba Team converted from CVS to Subversion for
-maintaining the Samba source code, and on 10 January 2008 we completed the
-switch 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>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 3.6.0, the 3.5 series has been turned into
@@ -29,7 +28,7 @@ maintenance mode, which means severe bug fixes and security fixes only.</p>
<p>Ongoing future research is being done for Samba 4.0
This work is concurrent with Samba 3.6 maintenance
-and development. An <a href="/samba/ftp/samba4/">alpha release</a> is available.</p>
+and development. <a href="/samba/ftp/samba4/">alpha releases</a> are available.</p>
<br />
<h3>Samba Branches</h3>
@@ -120,6 +119,7 @@ Channel logs are available <a href="http://irclog.samba.org/">here</a>.</p>
<ul>
<li>See the docs at:
<ul>
+ <li>The <a href="/samba/devel/API.html">API documentation</a> available for various Samba libraries.</li>
<li>The
<a href="/samba/docs/man/Samba-Developers-Guide/">Samba
Developer's Guide</a> is available in
diff --git a/devel/roadmap-4.0.html b/devel/roadmap-4.0.html
deleted file mode 100644
index fc873e2..0000000
--- a/devel/roadmap-4.0.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--#include virtual="/samba/header.html" -->
- <title>Samba 4.0 Roadmap</title>
-<!--#include virtual="/samba/header_columns.html" -->
-
-<h2 align="center">Roadmap to Samba 4.0.0</h2>
-
-The roadmap is now maintained <a href="http://wiki.samba.org/index.php/Samba4">on the wiki</a>.
-
-<!--#include virtual="/samba/footer.html" -->
--
Samba Website Repository
More information about the samba-cvs
mailing list