remove 1.0 notice, add paragraph about the ASF as per the guidelines http://apache.org/foundation/marks/pmcs#navigation
git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1070446 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/78c76f7f Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/78c76f7f Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/78c76f7f Branch: refs/heads/htdocs Commit: 78c76f7fcea98007685ba39364919afc7b4c1e3e Parents: 646c5f6 Author: Jan Lehnardt <j...@apache.org> Authored: Mon Feb 14 11:21:18 2011 +0000 Committer: Jan Lehnardt <j...@apache.org> Committed: Mon Feb 14 11:21:18 2011 +0000 ---------------------------------------------------------------------- community/committers.html | 24 ++++++++++++------------ community/lists.html | 16 ++++++++-------- index.html | 13 +++++++++---- index.txt | 12 +++++++++--- 4 files changed, 38 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/78c76f7f/community/committers.html ---------------------------------------------------------------------- diff --git a/community/committers.html b/community/committers.html index b3c1cde..461f2b0 100644 --- a/community/committers.html +++ b/community/committers.html @@ -78,66 +78,66 @@ limitations under the License. </div> <div id="content"><h1>Committers</h1> -<p><a href="http://damienkatz.net/">Damien Katz</a>, <a href="mailto:damien@apache.org">damien@apache.org</a></p> +<p><a href="http://damienkatz.net/">Damien Katz</a>, <a href="mailto:damien@apache.org">damien@apache.org</a></p> <p>Original developer and Apache CouchDB PMC Chair.</p> -<p><a href="http://jan.prima.de/">Jan Lehnardt</a>, <a href="mailto:jan@apache.org">jan@apache.org</a></p> +<p><a href="http://jan.prima.de/">Jan Lehnardt</a>, <a href="mailto:jan@apache.org">jan@apache.org</a></p> <p>Worked on the original UNIX port and now works on all ends in CouchDB. He is a freelancing CouchDB consultant and gives presentations around the world.</p> -<p><a href="http://tumbolia.org/nslater">Noah Slater</a>, <a href="mailto:nslater@apache.org">nslater@apache.org</a></p> +<p><a href="http://tumbolia.org/nslater">Noah Slater</a>, <a href="mailto:nslater@apache.org">nslater@apache.org</a></p> <p>Developed and maintains the Autotools build system and application infrastructure. He is CouchDB’s release manager and maintains a number of related packages for Debian GNU/Linux.</p> -<p><a href="http://www.cmlenz.net/">Christopher Lenz</a>, <a href="mailto:cmlenz@apache.org">cmlenz@apache.org</a></p> +<p><a href="http://www.cmlenz.net/">Christopher Lenz</a>, <a href="mailto:cmlenz@apache.org">cmlenz@apache.org</a></p> <p>Developed and maintains Futon, the Web administration console. He works on the JavaScript view engine, SpiderMonkey and MochiWeb integration in addition to an external Python client.</p> -<p><a href="http://jchris.mfdz.com">J. Chris Anderson</a>, <a href="mailto:jchris@apache.org">jchris@apache.org</a></p> +<p><a href="http://jchris.mfdz.com">J. Chris Anderson</a>, <a href="mailto:jchris@apache.org">jchris@apache.org</a></p> <p>Upgraded the Erlang JSON term format. Integrates community patches, particularly related to the HTTP API and the MapReduce system. Gives talks and presentations about CouchDB, with an eye toward recruiting more developers.</p> -<p><a href="http://www.davispj.com/">Paul J. Davis</a>, <a href="mailto:davisp@apache.org">davisp@apache.org</a></p> +<p><a href="http://www.davispj.com/">Paul J. Davis</a>, <a href="mailto:davisp@apache.org">davisp@apache.org</a></p> <p>Developed features for the HTTP API as well as helped with recent upgrades to the MapReduce system. Spends time tracking down various bugs reported in JIRA.</p> -<p>Adam Kocoloski, <a href="mailto:kocolosk@apache.org">kocolosk@apache.org</a></p> +<p>Adam Kocoloski, <a href="mailto:kocolosk@apache.org">kocolosk@apache.org</a></p> <p>Maintains and extends the replicator. Hacks on various other parts of the core database.</p> -<p>Mark Hammond, <a href="mailto:mhammond@apache.org">mhammond@apache.org</a></p> +<p>Mark Hammond, <a href="mailto:mhammond@apache.org">mhammond@apache.org</a></p> <p>Windows support.</p> -<p><a href="http://www.jasondavies.com/">Jason Davies</a>, <a href="mailto:jasondavies@apache.org">jasondavies@apache.org</a></p> +<p><a href="http://www.jasondavies.com/">Jason Davies</a>, <a href="mailto:jasondavies@apache.org">jasondavies@apache.org</a></p> <p>Developed various authentication features including cookie-based authentication and OAuth support.</p> -<p><a href="http://benoitc.im">Benoît Chesneau</a>, <a href="mailto:benoitc@apache.org">benoitc@apache.org</a></p> +<p><a href="http://benoitc.im">Benoît Chesneau</a>, <a href="mailto:benoitc@apache.org">benoitc@apache.org</a></p> <p>Developed the URL rewriter and proxy authentication handlers and provides some patches. He also maintains the couchapp script and some other tools and libraries related to CouchDB.</p> -<p><a href="http://fdmanana.wordpress.com">Filipe Manana</a>, <a href="mailto:fdmanana@apache.org">fdmanana@apache.org</a></p> +<p><a href="http://fdmanana.wordpress.com">Filipe Manana</a>, <a href="mailto:fdmanana@apache.org">fdmanana@apache.org</a></p> <p>Contributes mostly to the replicator, some parts of the core database and the security features.</p> -<p>Robert Newson, <a href="mailto:rnewson@apache.org">rnewson@apache.org</a></p> +<p>Robert Newson, <a href="mailto:rnewson@apache.org">rnewson@apache.org</a></p> <p>Contributes bug fixes and small features.</p> <div id="clear"></div></div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/78c76f7f/community/lists.html ---------------------------------------------------------------------- diff --git a/community/lists.html b/community/lists.html index 42edd95..e5f6229 100644 --- a/community/lists.html +++ b/community/lists.html @@ -94,11 +94,11 @@ discussion of topics related to CouchDB.</p> <ul> <li>To <strong>subscribe</strong>, send an email to -<a href="mailto:user-subscribe@couchdb.apache.org">user-subscribe@couchdb.apache.org</a>.</li> +<a href="mailto:user-subscribe@couchdb.apache.org">user-subscribe@couchdb.apache.org</a>.</li> <li>To <strong>unsubscribe</strong> send empty email to -<a href="mailto:user-unsubscribe@couchdb.apache.org">user-unsubscribe@couchdb.apache.org</a></li> +<a href="mailto:user-unsubscribe@couchdb.apache.org">user-unsubscribe@couchdb.apache.org</a></li> <li>Finally, to post a message to the list use the address -<a href="mailto:user@couchdb.apache.org">user@couchdb.apache.org</a></li> +<a href="mailto:user@couchdb.apache.org">user@couchdb.apache.org</a></li> </ul> <p>The archives for this list can also be <a href="http://mail-archives.apache.org/mod_mbox/couchdb-user/">browsed online</a>.</p> @@ -113,11 +113,11 @@ participate if they are interested following development.</p> <ul> <li>To <strong>subscribe</strong>, send an email to -<a href="mailto:dev-subscribe@couchdb.apache.org">dev-subscribe@couchdb.apache.org</a>.</li> +<a href="mailto:dev-subscribe@couchdb.apache.org">dev-subscribe@couchdb.apache.org</a>.</li> <li>To <strong>unsubscribe</strong> send empty email to -<a href="mailto:dev-unsubscribe@couchdb.apache.org">dev-unsubscribe@couchdb.apache.org</a></li> +<a href="mailto:dev-unsubscribe@couchdb.apache.org">dev-unsubscribe@couchdb.apache.org</a></li> <li>Finally, to post a message to the list use the address -<a href="mailto:dev@couchdb.apache.org">dev@couchdb.apache.org</a></li> +<a href="mailto:dev@couchdb.apache.org">dev@couchdb.apache.org</a></li> </ul> <p>The archives for this list can also be <a href="http://mail-archives.apache.org/mod_mbox/couchdb-dev/">browsed online</a>.</p> @@ -130,9 +130,9 @@ to see and review changes made by others.</p> <ul> <li>To <strong>subscribe</strong>, send an email to -<a href="mailto:commits-subscribe@couchdb.apache.org">commits-subscribe@couchdb.apache.org</a>.</li> +<a href="mailto:commits-subscribe@couchdb.apache.org">commits-subscribe@couchdb.apache.org</a>.</li> <li>To <strong>unsubscribe</strong> send empty email to -<a href="mailto:commits-unsubscribe@couchdb.apache.org">commits-unsubscribe@couchdb.apache.org</a></li> +<a href="mailto:commits-unsubscribe@couchdb.apache.org">commits-unsubscribe@couchdb.apache.org</a></li> </ul> <p>The archives for this list can also be <a href="http://mail-archives.apache.org/mod_mbox/couchdb-commits/">browsed online</a>.</p> http://git-wip-us.apache.org/repos/asf/couchdb/blob/78c76f7f/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index 8424c95..b2ce6c8 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ limitations under the License. <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <title>Apache CouchDB: The CouchDB Project</title> + <title>Apache CouchDB: The Apache CouchDB Project</title> <meta name="description" content="Apache,CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API."> <meta name="keywords" content="CouchDB,database,document,REST,HTTP,JSON,Javascript"> @@ -72,13 +72,11 @@ limitations under the License. <li><a class="" href="security.html"><span>Security</span></a></li> </ul> </div> - <div id="content"><h1>The CouchDB Project</h1> + <div id="content"><h1>The Apache CouchDB Project</h1> <p><img src="img/sketch.png" width="292" height="340" alt="CouchDB Server Components" style="float: right; margin-left: 2em"></p> -<p><strong>Notice:</strong> The 1.0.0 release has a critical bug which can lead to data loss in the default configuration. <a href="notice/1.0.1.html">Click here for information on how to maintain data safety.</a></p> - <p>Apache CouchDB is a document-oriented database that can be queried and indexed in a MapReduce fashion using JavaScript. CouchDB also offers incremental replication with bi-directional conflict detection and resolution.</p> @@ -109,6 +107,13 @@ repository</a> and follow the included build instructions.</p> discussions around the development of CouchDB. If you encounter a problem and have an idea how to fix it, please start by making a patch and filing it with our <a href="community/issues.html">issue tracking system</a>.</p> + +<h2>Apache Project</h2> + +<p>Apache CouchDB is a project of <a href="http://www.apache.org/">the Apache Software +Foundation</a>. Its work is defined by collaborative +consensus based processes, an open, pragmatic software license and a desire to +create high quality software that leads the way in its field.</p> <div id="clear"></div></div> </div></div> <div id="footer"> http://git-wip-us.apache.org/repos/asf/couchdb/blob/78c76f7f/index.txt ---------------------------------------------------------------------- diff --git a/index.txt b/index.txt index a731aa1..4579ea8 100644 --- a/index.txt +++ b/index.txt @@ -1,4 +1,4 @@ -Title: The CouchDB Project +Title: The Apache CouchDB Project Breadcrumb-Title: Home Navigation-Title: Home Sort-Index: 010 @@ -10,8 +10,6 @@ Sort-Index: 010 <img src="img/sketch.png" width="292" height="340" alt="CouchDB Server Components" style="float: right; margin-left: 2em"> -**Notice:** The 1.0.0 release has a critical bug which can lead to data loss in the default configuration. [Click here for information on how to maintain data safety.](notice/1.0.1.html) - Apache CouchDB is a document-oriented database that can be queried and indexed in a MapReduce fashion using JavaScript. CouchDB also offers incremental replication with bi-directional conflict detection and resolution. @@ -48,3 +46,11 @@ Join the [mailing lists](community/lists.html) and participate in the discussions around the development of CouchDB. If you encounter a problem and have an idea how to fix it, please start by making a patch and filing it with our [issue tracking system](community/issues.html). + +Apache Project +-------------- + +Apache CouchDB is a project of [the Apache Software +Foundation](http://www.apache.org/). Its work is defined by collaborative +consensus based processes, an open, pragmatic software license and a desire to +create high quality software that leads the way in its field. \ No newline at end of file