couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/2] couchdb-www git commit: init
Date Fri, 13 Feb 2015 12:11:31 GMT
init


Project: http://git-wip-us.apache.org/repos/asf/couchdb-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-www/commit/e12cd94e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-www/tree/e12cd94e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-www/diff/e12cd94e

Branch: refs/heads/asf-site
Commit: e12cd94ec9278aede63273546da51911a3ffd27e
Parents: 
Author: Jan Lehnardt <jan@apache.org>
Authored: Fri Feb 13 13:01:54 2015 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Fri Feb 13 13:01:54 2015 +0100

----------------------------------------------------------------------
 .htaccess                        |   8 +
 LICENSE                          | 202 ++++++++
 Makefile                         |   4 +
 NOTICE                           |   5 +
 Phillip                          |   0
 README.md                        |  25 +
 bylaws.html                      | 515 ++++++++++++++++++++
 conduct.html                     |  99 ++++
 couchdb-doap.rdf                 |  42 ++
 developer-preview/.DS_Store      | Bin 0 -> 6148 bytes
 developer-preview/2.0/index.html | 171 +++++++
 favicon.ico                      | Bin 0 -> 3758 bytes
 google4a670cce736e6c03.html      |   1 +
 image/conf.png                   | Bin 0 -> 97873 bytes
 image/couch.png                  | Bin 0 -> 7941 bytes
 image/linen.jpg                  | Bin 0 -> 17601 bytes
 image/logo.png                   | Bin 0 -> 1498 bytes
 image/shadow.png                 | Bin 0 -> 942 bytes
 image/sprite.png                 | Bin 0 -> 32312 bytes
 image/sprite2x.png               | Bin 0 -> 33646 bytes
 index.html                       | 390 +++++++++++++++
 script/doc.js                    |  51 ++
 script/smooth.js                 | 131 +++++
 style/doc.css                    |  30 ++
 style/master.css                 | 815 +++++++++++++++++++++++++++++++
 style/master.less                | 869 ++++++++++++++++++++++++++++++++++
 26 files changed, 3358 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..f2cda43
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,8 @@
+RedirectMatch /community http://couchdb.apache.org/
+RedirectMatch /docs http://couchdb.apache.org/
+RedirectMatch /downloads http://couchdb.apache.org/
+RedirectMatch /notice http://couchdb.apache.org/
+RedirectMatch /roadmap http://couchdb.apache.org/
+RedirectMatch /screenshots http://couchdb.apache.org/
+RedirectMatch /search http://couchdb.apache.org/
+RedirectMatch /security http://couchdb.apache.org/

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f6cd2bc
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                Apache License
+                          Version 2.0, January 2004
+                       http://www.apache.org/licenses/
+
+  TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+  1. Definitions.
+
+     "License" shall mean the terms and conditions for use, reproduction,
+     and distribution as defined by Sections 1 through 9 of this document.
+
+     "Licensor" shall mean the copyright owner or entity authorized by
+     the copyright owner that is granting the License.
+
+     "Legal Entity" shall mean the union of the acting entity and all
+     other entities that control, are controlled by, or are under common
+     control with that entity. For the purposes of this definition,
+     "control" means (i) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (ii) ownership of fifty percent (50%) or more of the
+     outstanding shares, or (iii) beneficial ownership of such entity.
+
+     "You" (or "Your") shall mean an individual or Legal Entity
+     exercising permissions granted by this License.
+
+     "Source" form shall mean the preferred form for making modifications,
+     including but not limited to software source code, documentation
+     source, and configuration files.
+
+     "Object" form shall mean any form resulting from mechanical
+     transformation or translation of a Source form, including but
+     not limited to compiled object code, generated documentation,
+     and conversions to other media types.
+
+     "Work" shall mean the work of authorship, whether in Source or
+     Object form, made available under the License, as indicated by a
+     copyright notice that is included in or attached to the work
+     (an example is provided in the Appendix below).
+
+     "Derivative Works" shall mean any work, whether in Source or Object
+     form, that is based on (or derived from) the Work and for which the
+     editorial revisions, annotations, elaborations, or other modifications
+     represent, as a whole, an original work of authorship. For the purposes
+     of this License, Derivative Works shall not include works that remain
+     separable from, or merely link (or bind by name) to the interfaces of,
+     the Work and Derivative Works thereof.
+
+     "Contribution" shall mean any work of authorship, including
+     the original version of the Work and any modifications or additions
+     to that Work or Derivative Works thereof, that is intentionally
+     submitted to Licensor for inclusion in the Work by the copyright owner
+     or by an individual or Legal Entity authorized to submit on behalf of
+     the copyright owner. For the purposes of this definition, "submitted"
+     means any form of electronic, verbal, or written communication sent
+     to the Licensor or its representatives, including but not limited to
+     communication on electronic mailing lists, source code control systems,
+     and issue tracking systems that are managed by, or on behalf of, the
+     Licensor for the purpose of discussing and improving the Work, but
+     excluding communication that is conspicuously marked or otherwise
+     designated in writing by the copyright owner as "Not a Contribution."
+
+     "Contributor" shall mean Licensor and any individual or Legal Entity
+     on behalf of whom a Contribution has been received by Licensor and
+     subsequently incorporated within the Work.
+
+  2. Grant of Copyright License. Subject to the terms and conditions of
+     this License, each Contributor hereby grants to You a perpetual,
+     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+     copyright license to reproduce, prepare Derivative Works of,
+     publicly display, publicly perform, sublicense, and distribute the
+     Work and such Derivative Works in Source or Object form.
+
+  3. Grant of Patent License. Subject to the terms and conditions of
+     this License, each Contributor hereby grants to You a perpetual,
+     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+     (except as stated in this section) patent license to make, have made,
+     use, offer to sell, sell, import, and otherwise transfer the Work,
+     where such license applies only to those patent claims licensable
+     by such Contributor that are necessarily infringed by their
+     Contribution(s) alone or by combination of their Contribution(s)
+     with the Work to which such Contribution(s) was submitted. If You
+     institute patent litigation against any entity (including a
+     cross-claim or counterclaim in a lawsuit) alleging that the Work
+     or a Contribution incorporated within the Work constitutes direct
+     or contributory patent infringement, then any patent licenses
+     granted to You under this License for that Work shall terminate
+     as of the date such litigation is filed.
+
+  4. Redistribution. You may reproduce and distribute copies of the
+     Work or Derivative Works thereof in any medium, with or without
+     modifications, and in Source or Object form, provided that You
+     meet the following conditions:
+
+     (a) You must give any other recipients of the Work or
+         Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices
+         stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works
+         that You distribute, all copyright, patent, trademark, and
+         attribution notices from the Source form of the Work,
+         excluding those notices that do not pertain to any part of
+         the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its
+         distribution, then any Derivative Works that You distribute must
+         include a readable copy of the attribution notices contained
+         within such NOTICE file, excluding those notices that do not
+         pertain to any part of the Derivative Works, in at least one
+         of the following places: within a NOTICE text file distributed
+         as part of the Derivative Works; within the Source form or
+         documentation, if provided along with the Derivative Works; or,
+         within a display generated by the Derivative Works, if and
+         wherever such third-party notices normally appear. The contents
+         of the NOTICE file are for informational purposes only and
+         do not modify the License. You may add Your own attribution
+         notices within Derivative Works that You distribute, alongside
+         or as an addendum to the NOTICE text from the Work, provided
+         that such additional attribution notices cannot be construed
+         as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and
+     may provide additional or different license terms and conditions
+     for use, reproduction, or distribution of Your modifications, or
+     for any such Derivative Works as a whole, provided Your use,
+     reproduction, and distribution of the Work otherwise complies with
+     the conditions stated in this License.
+
+  5. Submission of Contributions. Unless You explicitly state otherwise,
+     any Contribution intentionally submitted for inclusion in the Work
+     by You to the Licensor shall be under the terms and conditions of
+     this License, without any additional terms or conditions.
+     Notwithstanding the above, nothing herein shall supersede or modify
+     the terms of any separate license agreement you may have executed
+     with Licensor regarding such Contributions.
+
+  6. Trademarks. This License does not grant permission to use the trade
+     names, trademarks, service marks, or product names of the Licensor,
+     except as required for reasonable and customary use in describing the
+     origin of the Work and reproducing the content of the NOTICE file.
+
+  7. Disclaimer of Warranty. Unless required by applicable law or
+     agreed to in writing, Licensor provides the Work (and each
+     Contributor provides its Contributions) on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied, including, without limitation, any warranties or conditions
+     of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+     PARTICULAR PURPOSE. You are solely responsible for determining the
+     appropriateness of using or redistributing the Work and assume any
+     risks associated with Your exercise of permissions under this License.
+
+  8. Limitation of Liability. In no event and under no legal theory,
+     whether in tort (including negligence), contract, or otherwise,
+     unless required by applicable law (such as deliberate and grossly
+     negligent acts) or agreed to in writing, shall any Contributor be
+     liable to You for damages, including any direct, indirect, special,
+     incidental, or consequential damages of any character arising as a
+     result of this License or out of the use or inability to use the
+     Work (including but not limited to damages for loss of goodwill,
+     work stoppage, computer failure or malfunction, or any and all
+     other commercial damages or losses), even if such Contributor
+     has been advised of the possibility of such damages.
+
+  9. Accepting Warranty or Additional Liability. While redistributing
+     the Work or Derivative Works thereof, You may choose to offer,
+     and charge a fee for, acceptance of support, warranty, indemnity,
+     or other liability obligations and/or rights consistent with this
+     License. However, in accepting such obligations, You may act only
+     on Your own behalf and on Your sole responsibility, not on behalf
+     of any other Contributor, and only if You agree to indemnify,
+     defend, and hold each Contributor harmless for any liability
+     incurred by, or claims asserted against, such Contributor by reason
+     of your accepting any such warranty or additional liability.
+
+  END OF TERMS AND CONDITIONS
+
+  APPENDIX: How to apply the Apache License to your work.
+
+     To apply the Apache License to your work, attach the following
+     boilerplate notice, with the fields enclosed by brackets "[]"
+     replaced with your own identifying information. (Don't include
+     the brackets!)  The text should be enclosed in the appropriate
+     comment syntax for the file format. We also recommend that a
+     file or class name and description of purpose be included on the
+     same "printed page" as the copyright notice for easier
+     identification within third-party archives.
+
+  Copyright [yyyy] [name of copyright owner]
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c1cb128
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+all: style/master.css
+
+style/master.css: style/master.less
+	lessc $< > $@

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..7613682
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache CouchDB Site
+Copyright 2014 The Apache Software Foundation
+
+This site was developed at
+The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/Phillip
----------------------------------------------------------------------
diff --git a/Phillip b/Phillip
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..bd7b393
--- /dev/null
+++ b/README.md
@@ -0,0 +1,25 @@
+Apache CouchDB Site
+===================
+
+This directory contains the CouchDB website, the source files it is generated
+from, and the scripts to regenerate the site.
+
+Dependencies
+------------
+
+- LessCSS
+
+Updating the Site
+-----------------
+
+Run:
+
+    make
+
+The site should now be updated.
+
+Publishing the Site
+-------------------
+
+The site will be published automatically to http://couchdb.apache.org after 
+you have committed your changes to the svn repository.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/bylaws.html
----------------------------------------------------------------------
diff --git a/bylaws.html b/bylaws.html
new file mode 100644
index 0000000..dde2319
--- /dev/null
+++ b/bylaws.html
@@ -0,0 +1,515 @@
+<title>CouchDB Bylaws</title>
+
+<meta charset="utf-8">
+
+<link rel="stylesheet" href="style/doc.css">
+
+<script src="script/doc.js"></script>
+
+<h1>CouchDB Bylaws</h1>
+
+<p><em>This document was officially adopted by the CouchDB PMC as of 31 July 2014.</em>
+
+<h2>Table of Contents</h2>
+
+<div class="toc"></div>
+
+<h2 id="intro">1. Introduction</h2>
+
+<p>This document defines the bylaws under which the Apache CouchDB project operates. It defines the <a href="#roles">roles and responsibilities</a> within the project, who may vote, how <a href="#voting">voting</a> works, how conflicts are resolved, and voting rules for specific <a href="#types">decision types</a>.
+
+<p>This document is written for anyone who wishes to participate in the project. <strong>If this is your first time through this document, read this introduction, then read all the bolded text for a summary of the bylaws.</strong> Then, as you need more detail, read past the bolded text for an expanded explanation.
+
+<p>CouchDB is a project of the <em>Apache Software Foundation</em> (ASF). Apache CouchDB, CouchDB, and the CouchDB logo are trademarks of the ASF. The project resources are licensed to the public under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License 2.0</a>. Releases are made in the form of official signed source code archives. The <a href="https://www.apache.org/foundation/faq.html">ASF FAQ</a> explains the operation and background of the Foundation.
+
+<p>CouchDB operates under a set of common principles known collectively as <a href="https://www.apache.org/foundation/how-it-works.html">the Apache Way</a>:
+
+  <ul>
+    <li>Collaborative software development
+    <li>Commercial-friendly standard license
+    <li>Consistently high quality software
+    <li>Respectful, honest, technical-based interaction
+    <li>Faithful implementation of standards
+    <li>Security as a mandatory feature
+  </ul>
+
+<p>We value the community more than the code. A strong and healthy community should be a fun and rewarding place for everyone involved. Code, and everything else that goes with that code, will be produced by a healthy community over time.
+
+<p>The direction of the project and the decisions we make are up to you. If you are participating on <a href="https://mail-archives.apache.org/mod_mbox/#couchdb">the mailing lists</a> you have the right to make decisions. All decisions about the project are taken on the mailing lists. There are no lead developers, nor is there any one person in charge.
+
+<p>Anyone can subscribe to the public mailing lists, and in fact, you are encouraged to do so. The development mailing list is not just for developers, for instance. It is for anyone who is interested in the development of the project. Everybody's voice is welcome.
+
+<p>Finally, use of these bylaws to enforce the letter of any rule and not its spirit (also known as "<a href="https://en.wikipedia.org/wiki/Rules_lawyer">rule lawyering</a>") is not acceptable behaviour.
+
+<h2 id="roles">2. Roles and Responsibilities</h2>
+
+<p><strong>The ASF <a href="https://www.apache.org/foundation/how-it-works.html#roles">defines a set of roles</a> with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections.</strong>
+
+<p>Your role is bestowed on you by your peers in recognition of your past contributions to the project and your position of trust within the community. It is not tied to your job, your current employer, or your current activity level. We are interested in you as an individual and we understand that your interactions with the project may change over time.
+
+<p>Roles are never rescinded because of inactivity, unless that inactivity is causing a problem for the project. Fortunately, our decision making process means that inactivity is very rarely a problem. Roles will be rescinded if the <a href="#pmc">Project Management Committee</a> (or <a href="#pmc">PMC</a>, see 2.4. below) believes the individual is no longer able to responsibly discharge the duty of the role.
+
+<p>We understand that you have many roles in life. We use a hat metaphor to talk about these roles. For instance, you might have your work hat as well as several ASF hats. We expect you to know when to wear the appropriate hat, and to comport yourself in a manner befitting the interests of the Foundation when interacting with the project. Failure to do this is a serious dereliction of duty.
+
+<p>Sometimes it is a good idea to tell people which hat you are wearing. For instance, the PMC Chair might start an informal email by stating they are not wearing the PMC Chair's hat, just to be clear about how the statements ought to be interpreted.
+
+<p>We expect you to act in good faith. This is very important for a community that depends so heavily on trust.
+
+<h3 id="users">2.1. Users</h3>
+
+<p><strong>The most important participants in the project are people who use our software.</strong>
+
+<p>Users can participate by talking about the project, providing feedback, and helping others. This can be done at the ASF or elsewhere, and includes being active on <a href="https://mail-archives.apache.org/mod_mbox/couchdb-user/">the user mailing list</a>, third-party support forums, blogs, and social media. Users who participate in this way automatically become contributors.
+
+  <h3 id="contributors">2.2. Contributors</h3>
+
+<p><strong>A contributor is someone who makes contributions to the community, project, documentation, or code.</strong>
+
+<p>There is no special requirement to become a contributor. If you have a great idea for the project, you can get to work immediately. There is no need to ask permission. Most things can be accomplished by contributors with no special privileges or status on the project. Assistance can be provided if you need access to project resources to get your work done.
+
+<p>A contributor who makes sustained contributions to the project may be invited to become a committer.
+
+<h3 id="committers">2.3. Committers</h3>
+
+<p><strong>A committer is someone who is committed to the project. In return for their commitment, they are given a binding vote in certain project decisions. Committers are hence responsible for the ongoing health of the project and the community.</strong>
+
+<p>We recognise commitment in many different areas. These include, but are not limited to:
+
+  <ul>
+    <li>Community (community management, ticket triage, helping new users, events etc.)
+    <li>Project (blogging, marketing, design, UX, branding, etc)
+    <li>Documentation (documentation, localisation/internationalisation, etc.)
+    <li>Code (new features, bug fixing, quality assurance, release management etc.)
+  </ul>
+
+<p>More details are available in <a href="https://cwiki.apache.org/confluence/display/COUCHDB/Contributor+Guide">the contributor guide</a>. If any of these things sound interesting to you, we welcome your help.
+
+<p>The role of committer is mandated at the Foundation level. Unfortunately, the usual definition of that word—being someone who commits code—can mean that non-coders are never given binding votes on a project. We think that's a problem. Contributions come in many shapes and sizes. Indeed, many of those non-code contributions are what the project needs the most.
+
+<p>To make this clear, we have chosen to define a committer as someone who is <em>committed</em>. We mean this in the sense of being loyal to the project and its interests. It is a position of trust, not an expectation of activity level. Anyone who is supportive of the community and the project will be considered as a candidate for being a committer.
+
+<p>As a matter of convenience, committers are also given write access to all of the public project infrastructure, including source control repositories, website, issue tracker, wiki, and blog. Access to social media accounts, and other third-party services, will be granted upon request.
+
+<p>All committers are required to have a signed <em>Individual Contributor License Agreement</em> (ICLA) on file. There is an <a href="http://www.apache.org/dev/committers.html">ASF FAQ</a> which provides more details about the requirements at the Foundation level.
+
+<p>Committers are expected to work cooperatively and to have good social skills. This is more important than any other sort of skill. Our committers make up the bulk of our active community, and as such, we rely on them to help us build and maintain that community.
+
+<p>A committer who makes a sustained contribution to the project may be invited to become a <em>Project Management Committee</em> (PMC) member.
+
+<h3 id="pmc">2.4. Project Management Committee</h3>
+
+<p><strong>The <em>Project Management Committee</em> (PMC) is responsible for the management of the project.</strong>
+
+<p>At the most basic level, the role of the PMC is oversight. The PMC must ensure that all relevant bylaws , policies, and procedures  are adhered to. These exist at the Foundation-level and the project-level. See the <a href="https://cwiki.apache.org/confluence/display/COUCHDB/Project+affairs">project affairs</a> page for more information.
+
+<p>Beyond this requirement, the primary goal of the PMC is to invest in the long term wellbeing of the community. For this reason, one of the most basic tasks of the PMC is the recruitment and management of project contributors. We believe that the size, diversity, and health of the community is essential for the quality, stability, and robustness of project and its social structures.
+
+<p>Activities of the PMC include, but are not limited to:
+
+  <ul>
+    <li>Project governance
+    <li>Community management
+    <li>Release management
+    <li>Complying with legal guidelines
+    <li>Managing confidentially-reported security issues
+    <li>Branding and events coordination
+    <li>Press and analyst relations
+  </ul>
+
+<p>PMC members are held to a much higher standard than regular community members. This includes strict hat wearing, equitable decision making, and exemplary conduct. People look to PMC members for cues about how to behave. It is important that all PMC members understand the responsibility that they bear, and that they are individually committed to improving themselves and the project.
+
+<p>While security issues and release management are the responsibility of the PMC, the PMC typically delegates this to committers.
+
+<h3 id="chair">2.5. Chair</h3>
+
+<p><strong>The project Chair is a PMC member responsible for Foundation level administrative tasks.</strong> It is not a technical leadership position, meaning the Chair has no special say in ordinary project decisions. But we do think of it as a cultural leadership position. Accordingly, position on cultural issues is something to consider when electing a Chair.
+
+<p>The Chair is elected by the PMC but appointed by the ASF Board via a Board resolution. The Chair is an officer of the Apache Software Foundation (with an official title of <em>Vice President, Apache CouchDB</em>) and has primary responsibility to the Board for the management of the project. The Chair is the eyes and ears of the Board, and reports quarterly on developments within the project.
+
+<p>The chair has primary responsibility to the Board, and has the power to establish rules and procedures for the day to day management of the communities for which the PMC is responsible, including the composition of the PMC itself.
+
+<p>Remember that, as in any meeting, the Chair is a facilitator and their role within the PMC is to ensure that everyone has a chance to be heard and to enable meetings to flow smoothly.
+
+<p>If the current Chair resigns, or the term of the Chair expires, the PMC will hold a Chair election.
+
+<p>The Chair has a 12 month term. The intention of this term is to allow for a rotation of the role amongst the PMC members. This does not prohibit the PMC from selecting the same Chair to serve consecutive terms.
+
+<h3 id="board">2.6. Board of Directors</h3>
+
+<p><strong>The Chair is responsible for the project to the Board of Directors (the Board) of the ASF.</strong> The Board is the nine-person legal governing body of the ASF, elected by the <a href="http://apache.org/foundation/members.html">members</a> of the Foundation. The Board provides the oversight of the Foundation's activities and operation, and has the responsibility of applying and enforcing the <a href="http://apache.org/foundation/bylaws.html">ASF's bylaws</a>.
+
+<h2 id="decisions">3. Decision Making</h2>
+
+<p>This section explains our approach to decision making and the formal structures we have in place to make this as easy as possible.
+
+<p><strong>In descending order of preference, we prefer that decisions are made via:</strong>
+
+  <ul>
+    <li><strong><a href="#lazy">Lazy consensus</a> or <a href="#rtc">RTC</a></strong>
+    <li><strong><a href="#discussions">Discussion-led consensus gathering</a></strong>
+    <li><strong><a href="#voting">Formal voting</a></strong>
+  </ul>
+
+<p>Our goal is to build a community of trust, reduce mailing list traffic, and deal with disagreements swiftly when they occur.
+
+<p>All decision making must happen on <a href="https://mail-archives.apache.org/mod_mbox/#couchdb">the mailing lists</a>. Any discussion that takes place away from the lists (for example on IRC or in person) must be brought to the lists before anything can be decided. We have a saying: if it's not on the lists, it didn't happen. We take this approach so that the greatest amount of people have a chance to participate.
+
+<p>Decisions should be made on the mailing list associated with the decision. For example, marketing decisions happen on <a href="https://mail-archives.apache.org/mod_mbox/couchdb-marketing/">the marketing list</a>. By default, anything without a specific list should be done in public on the main development list. Anything that needs to be private will be done on the private list.
+
+<p>Our decision making processes are designed to reduce blockages. It is understood that people come and go as time permits. It is not practical to hear from everybody on every decision. Sometimes, this means a decision will be taken while you are away from the project. It is reasonable to bring such decisions up for discussion again, but this should be kept to a minimum.
+
+<h3 id="lazy">3.1. Lazy Consensus</h3>
+
+<p><strong>When you are convinced that you know what the community would like to see happen, you can assume that you already have permission and get on with the work. We call this <a href="http://www.apache.org/foundation/glossary.html#LazyConsensus">lazy consensus</a>.</strong> You don't have to insist that people discuss or approve your plan, and you certainly don't need to call a vote. Just assume your plan is okay unless someone says otherwise. This applies to anything in the list of <a href="#types">decision types</a> in section 3.6. where lazy consensus is allowed.
+
+  <blockquote>
+    "It's easier to ask forgiveness than it is to get permission." — Grace Hopper
+  </blockquote>
+
+<p>Most actions are reversible. As long as you do your work in the open, the community has plenty of opportunities to object. If someone does object, you must be prepared to roll back your work.
+
+<p>Lazy consensus has two effects:
+
+  <ol>
+    <li>People are less likely to object for the sake of it
+    <li>It cuts down on the amount of unnecessary discussion
+  </ol>
+
+<p>For this to work properly, active committers are expected to be paying attention to the project. Objecting a long time after a change has been made may require large amounts of additional work to be thrown away or redone.
+
+<p>Sometimes, you might not be sure what the community would want. If this is the case, you can post a note to the appropriate <a href="https://mail-archives.apache.org/mod_mbox/#couchdb">mailing list</a> with an outline of what you intend to do. If nobody objects after 72 hours, you can safely assume consensus and proceed with your plan.
+
+<p>An important side effect of this policy is that <em>silence is assent</em>. There is no need for discussion, and no need for agreement to be voiced. If you make a proposal to the list and nobody responds, that should be interpreted as implicit support for your idea, and not a lack of interest. This can be hard to get used to, but is an important part of how we do things.
+
+<h3 id="discussion">3.2. Discussion</h3>
+
+<p><strong>If lazy consensus fails (i.e. someone objects) you can start a discussion or you can abandon the proposal.</strong>
+
+<p>Please try to be respectful of people's time and attention. It is a non-renewable resource and the only thing we always need more of.
+
+<p>Proposals should be explained clearly and come with adequate justification. Disagreements should be constructive and ideally come with alternative proposals. The goal is to reach a positive outcome for the project, not convince others of your opinion.
+
+<p>If a proposal is particularly controversial, try making it reversible. Reframe the proposal as an experiment (either at the project level or the feature level) and identify a timeline for evaluation along with unambiguous success and failure criteria. These sorts of proposal are usually much easier to agree on.
+
+<p>If a clear consensus emerges, you can proceed without a vote. Otherwise, you should abandon the proposal or move to a vote.
+
+<p>Voting is a failure mode of discussion. But that doesn't mean you should avoid it. It is a very powerful tool that should be used to terminate a seemingly interminable discussion. Knowing when to end a discussion and call a vote is one of the most useful skills a contributor can master.
+
+<h3 id="voting">3.3. Voting</h3>
+
+<p><strong><a href="https://www.apache.org/foundation/voting.html">Votes</a> are used to indicate approval or disapproval of something.</strong>
+
+<p>We do this by replying with a signed number, usually +1 or -1. Occasionally people choose to vote with larger amounts (eg. +1000) to indicate strong feelings, or in fractional amounts (eg. -0.5) to convey support or disagreement without the full weight of a +1 or -1 vote. For the purpose of tallying, all values will be counted as +1, -1, or nothing.
+
+<p>Here are some example votes, with what they mean, and how they will be counted in the final vote tally:</p>
+
+  <table>
+    <tr>
+      <th>Vote
+      <th>Meaning
+      <th>Counted As
+    </tr>
+    <tr>
+      <td>+1000
+      <td>"Wow, this is great. Let's do it!"
+      <td>+1
+    </tr>
+    <tr>
+      <td>+1
+      <td>"I like this idea."
+      <td>+1
+    </tr>
+    <tr>
+      <td>+0.5
+      <td>"Seems okay, but I'm not entirely convinced."
+      <td>—
+    </tr>
+    <tr>
+      <td>+0
+      <td>"Not convinced, but doesn't seem harmful."
+      <td>—
+    </tr>
+    <tr>
+      <td>-0
+      <td>"Not convinced, and seems harmful."
+      <td>—
+    </tr>
+    <tr>
+      <td>-0.5
+      <td>"Not happy, but won't block this."
+      <td>—
+    </tr>
+    <tr>
+      <td>-1
+      <td>"Not happy, and I want to prevent this from happening."
+      <td>-1
+    </tr>
+    <tr>
+      <td>-1000
+      <td>"Extremely unhappy with this proposal."
+      <td>-1
+    </tr>
+  </table>
+
+<p>There are three types of voting: informal, formal, and vetos. An informal vote is a quick way to get people's feelings on something. A formal vote, on the other hand, requires an approval model and a <a href="#decisions">decision type</a>. More detail on <a href="#approval">approval models</a>, <a href="#rtc">vetos</a>, and <a href="types">decision types</a> is available in sections 3.4, 3.5., and 3.6 respectively.
+
+<p>All formal voting must be done in an email thread with the appropriate <a href="#tags">subject tag</a>. Formal votes may contain multiple items for approval and these should be clearly separated. Formal voting is then carried out by replying to the vote mail. Formal votes are open for a period of at least 72 hours to allow all active voters time to consider the vote. Votes can be held open longer than this at the discretion of the person who initiated the vote.
+
+<p>Votes on <a href="#types">PMC decisions</a> are binding if they are cast by a PMC member. For all other purposes, votes are binding if they are cast by a committer. However, it is important to remember that all participants on a list get a vote. And you are encouraged to vote, even if your vote is not binding. This is a good way to get involved in the project and helps to inform the decision-making process.
+
+<p>You are encouraged to use an informal voting model to take a quick poll or to wrap up a discussion, whether you are a committer yet or not. These votes are informal and can be initiated by anyone. Binding votes are only needed for project-level decision-making.
+
+<h3 id="approval">3.4. Approval Models</h3>
+
+<p><strong>We use three different approval models for formal voting</strong>:
+
+  <ul>
+    <li>RTC (see section 3.5)
+      <ul>
+	<li>Requires one binding +1 vote and no vetos
+      </ul>
+    <li>Lazy majority
+      <ul>
+	<li>Requires three binding +1 votes and more binding +1 votes than binding -1 votes
+      </ul>
+    <li>Lazy 2/3 majority
+      <ul>
+	<li>Requires three binding +1 votes and twice as many binding +1 votes as binding -1 votes
+      </ul>
+  </ul>
+
+<p>RTC is only ever used in the context of a code review or a pull request, and does not require a separate vote thread. Each of the other approval models requires a vote thread.
+
+<p>A -1 vote is never called a veto except when using the RTC approval model. This is because a single -1 vote never has the power to block a vote outside of RTC.
+
+<p>Which approval model to use is dictated by the table in section 3.6. This is project policy, and can be changed by amending this document.
+
+<p>For electing a new Chair, the PMC may opt to use <em>Single Transferable Vote</em> (STV) which comes with its own rules. <a href="http://steve.apache.org/">Apache STeVe</a> was specifically designed to enable this process.
+
+<h3 id="rtc">3.5. RTC and Vetos</h3>
+
+<p>Typically, CouchDB uses the <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">Review-Then-Commit</a> (<em>RTC</em>) model of code collaboration. RTC allows work to proceed on separate feature or bugfix branches, and requires at least one other developer to review and approve the changes before they are committed to a release branch. A release branch is any branch that a release might be prepared from, such as <code>master</code>, <code>1.6.x</code>, and so on. Notifications of these changes are sent to <a href="https://mail-archives.apache.org/mod_mbox/couchdb-commits/">the commits mailing list</a>. It is expected that the rest of the community is regularly reviewing these changes.
+
+<p><strong>Any change made to a release branch is a <em>technical decision</em> of the project. If a committer wants to object to a technical decision, they have the option of casting a -1 vote. We call this a veto.</strong> Vetos can only be made for technical reasons. A -1 vote is not considered a veto in any other context. Vetos should be used sparingly, and only after careful consideration.
+
+<p>All vetoes must be justified and vetoes without justification are null and void. The validity of the justification can be challenged and the outcome is decided with a vote. If the justification is valid, a veto cannot be overruled and stands until withdrawn by the caster. If you disagree with a veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the commit must be reverted in a timely manner.
+
+<p>Here's how a veto might lead to a code revert:
+
+  <ul>
+    <li>Alice commits a change
+    <li>Bob spots the change and realises that it's going to cause a major problem
+    <li>Bob replies to the commit email with a -1 vote and a justification
+    <li>A discussion ensues, leading to consensus
+    <li>Alice reverts the change
+  </ul>
+
+<p>If the discussion did not reach consensus, Alice could challenge the validity of Bob's justification. At that point, the PMC would vote on the issue. If the PMC found that the justification was valid, Alice would have to revert the change or petition Bob to withdraw the veto. If the PMC found the justification invalid, the veto is null and void.
+
+<h3 id="types">3.6. Decision Types</h3>
+
+<p><strong>This section describes the various decision types and the rules that apply to them.</strong></p>
+
+  <table>
+    <tr>
+      <th>Name
+      <th>Description
+      <th>Mailing List
+      <th>Lazy Consensus
+      <th>Approval Model
+      <th>Board approval
+      <th>Binding votes
+      <th>Vetoes
+    </tr>
+    <tr>
+      <td>Technical decision
+      <td>A technical decision is any change made to a release branch.
+      <td><a href="https://mail-archives.apache.org/mod_mbox/couchdb-commits/">Commits list</a>
+      <td>Allowed for trivial changes
+      <td>RTC
+      <td>No
+      <td>Committers
+      <td> Yes
+    </tr>
+    <tr>
+      <td>Non-technical decision
+      <td>
+	A non-technical decision is any other sort of change, or any sort of decision that falls outside of the other decision types. It is a catch-all decision type.
+	<br>
+	<br>
+	Non-technical decisions should normally be made with lazy consensus, or by the entire community using discussion-led consensus-building, and not through formal voting.
+      <td>Whichever mailing list is most appropriate
+      <td>Allowed
+      <td>Lazy majority
+      <td>No
+      <td>Committers
+      <td> No
+    </tr>
+    <tr>
+      <td>Challenge a veto
+      <td>
+	Challenge the validity of a veto.
+	<br>
+	<br>
+	A veto is only valid when it is justified with a sound technical argument.
+      <td><a href="https://mail-archives.apache.org/mod_mbox/couchdb-dev/">Main development list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>No
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>New release
+      <td>
+	Make an official release.
+	<br>
+	<br>
+	Release candidates can be prepared by anyone.
+      <td><a href="https://mail-archives.apache.org/mod_mbox/couchdb-dev/">Main development list</a>
+      <td>No
+      <td>Lazy majority
+      <td>No
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>New committer
+      <td>
+	Elect a new committer.
+	<br>
+	<br>
+	Nominations can be made by anyone by emailing <a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">the private list</a>.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy majority
+      <td>No
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>New PMC member
+      <td>
+	Elect a new PMC member.
+	<br>
+	<br>
+	Nominations can be made by anyone by emailing <a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">the private list</a>.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>Yes
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>Elect Chair
+      <td>Elect a new Chair.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy 2/3 majority or STV
+      <td>Yes
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>Committer removal
+      <td>Remove a person's committer privileges.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>No
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>PMC member removal
+      <td>Remove a person from the PMC.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>Yes
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>Chair removal
+      <td>Remove the Chair.
+      <td><a href="https://mail-search.apache.org/pmc/private-arch/couchdb-private/">Private list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>Yes
+      <td>PMC members
+      <td>No
+    </tr>
+    <tr>
+      <td>Create or amend official document
+      <td>Create or amend any document marked as official.
+      <td><a href="https://mail-archives.apache.org/mod_mbox/couchdb-dev/">Main development list</a>
+      <td>No
+      <td>Lazy 2/3 majority
+      <td>No
+      <td>PMC members
+      <td>No
+    </tr>
+  </table>
+
+<h2 id="other">4. Other Topics</h2>
+
+<h3 id="tags">4.1. Subject Tags</h3>
+
+<p><strong>A subject tag is a string like "[TAG]" that appears at the start of an email subject. We use these to communicate the type of message being sent.</strong>
+
+<p>Here's what an example subject looks like, using multiple tags:
+
+  <blockquote>
+    <code>[VOTE] [REVISED] Official CouchDB bylaws</code>
+  </blockquote>
+
+<p>If a VOTE or PROPOSAL thread is started without the requisite tag, its validity can be challenged. Every other tag is optional.
+
+<p>We have agreed on the following tags, but you are free to coin your own.</p>
+
+  <table>
+    <tr>
+      <th>Subject tag
+      <th>Description
+      <th>Decision making
+      <th>Timeframe
+    </tr>
+    <tr>
+      <td>DISCUSS
+      <td>This is an open discussion with no time limit
+      <td>No
+      <td>NA
+    </tr>
+    <tr>
+      <td>REQUEST
+      <td>This is a request for some action to be taken (prepare release notes, testing, merge, etc)
+      <td>No
+      <td>NA
+    </tr>
+    <tr>
+      <td>PROPOSAL
+      <td>This is a concrete proposal that will default to lazy consensus
+      <td>Yes
+      <td>72 hours
+    </tr>
+    <tr>
+      <td>VOTE
+      <td>This is a formal vote
+      <td>Yes
+      <td>72 hours
+    </tr>
+    <tr>
+      <td>NOTICE
+      <td>This is a notice of action taken, or action about to be taken (i.e. no discussion or consensus needed)
+      <td>No
+      <td>NA
+    </tr>
+    <tr>
+      <td>ANNOUNCE
+      <td>This is a project level announcement
+      <td>No
+      <td>NA
+    </tr>
+  </table>

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/conduct.html
----------------------------------------------------------------------
diff --git a/conduct.html b/conduct.html
new file mode 100644
index 0000000..1f4cd4e
--- /dev/null
+++ b/conduct.html
@@ -0,0 +1,99 @@
+<title>Code of Conduct</title>
+
+<meta charset="utf-8">
+
+<link rel="stylesheet" href="style/doc.css">
+
+<script src="script/doc.js"></script>
+
+<h1>Code of Conduct</h1>
+
+<p><em>This document was officially adopted by the CouchDB PMC as of 11 August 2014.</em>
+
+<h2>Table of Contents</h2>
+
+<div class="toc"></div>
+
+<h2 id="intro">Introduction</h2>
+
+<p>This code of conduct <u>governs how we behave</u> in any forum and whenever we will be judged by our actions. We expect it to be honoured by everyone who participates in the Apache CouchDB community <a href="http://couchdb.apache.org/bylaws.html#roles">formally</a> or informally, or claims any affiliation with the project.
+
+<p>This code of conduct also <u>applies to all spaces</u> managed by the Apache CouchDB project, including IRC, all public and private mailing lists, the issue tracker, the wiki, the blogs, Twitter, and any other forum which the community uses for communication. <em><span style="color: rgb(255,0,0);">TODO: An expanded code of conduct is being drafted for events that involve physical interaction (conferences), based on the</span> <a href="https://www.apache.org/foundation/policies/anti-harassment.html">published ASF anti-harassment policy</a>.</em>
+
+<p>This code <u>is not exhaustive or complete</u>. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.
+
+<h2 id="guidelines">Specific Guidelines</h2>
+
+<p>We strive to:
+
+  <ol>
+
+    <li><p><strong>Be open</strong>. We invite anyone to participate in our community. As per <a href="http://couchdb.apache.org/bylaws.html#decisions">Section 3 of our Project Bylaws</a>, we preferably use public methods of communication for project-related messages, unless discussing something sensitive. This applies to messages for help or CouchDB-related support, too; not only is a public support request much more likely to result in an answer to a question, it also makes sure that any inadvertent mistakes made by people answering will be more easily detected and corrected.</p>
+
+    <li><p><strong>Be <a href="#endnotes">empathetic</a>, welcoming, friendly, and patient</strong>: We work together to resolve conflict, assume good intentions, and do our best to act in an empathetic fashion. We may all experience some frustration from time to time, but we do not allow frustration to turn into a personal attack. A community where people feel uncomfortable or threatened is not a productive one. We should be respectful when dealing with other community members as well as with people outside our community.</p>
+
+    <li><p><strong>Be collaborative.</strong> Our work will be used by other people, and in turn we will depend on the work of others. When we make something for the benefit of the project, we are willing to explain to others how it works, so that they can build on the work to make it even better. Any decision we make will affect users and colleagues, and we take those consequences seriously when making decisions.</p>
+
+    <li><p><p><strong>Be inquisitive</strong>. Nobody knows everything! Asking questions early avoids many problems later, so questions are encouraged, though they may be directed to the appropriate forum. Those who are asked should be responsive and helpful, within the context of our shared goal of improving Apache CouchDB.</p>
+
+    <li><p><strong>Be careful in the words that we choose.</strong> Whether we are participating as professionals or volunteers, we value professionalism in all interactions, and take responsibility for our own speech. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behaviour are not acceptable. This includes, but is not limited to:</p>
+
+      <ul>
+	<li>Violent threats or language directed against another person.
+	<li>Sexist, racist, or otherwise discriminatory jokes and language.
+	<li>Posting sexually explicit or violent material.
+	<li>Posting (or threatening to post) other people's personally identifying information ("doxing").
+	<li>Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history.
+	<li>Personal insults, especially those using racist or sexist terms.
+	<li>Unwelcome sexual attention.
+	<li>Excessive or unnecessary profanity.
+	<li>Repeated harassment of others. In general, if someone asks you to stop, then stop.
+	<li>Advocating for, or encouraging, any of the above behaviour.
+      </ul>
+
+    <li><p><strong>Be concise</strong>. Keep in mind that what you write once will be read by hundreds of persons. Writing a short email means people can understand the conversation as efficiently as possible. Short emails should always strive to be empathetic, welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.</p>
+
+      <p>Try to bring new ideas to a conversation so that each mail adds something unique to the thread, keeping in mind that the rest of the thread still contains the other messages with arguments that have already been made.</p>
+
+      <p>Try to stay on topic, especially in discussions that are already fairly large.</p>
+
+    <li><p><strong>Step down considerately</strong>: Members of every project come and go. When somebody leaves or disengages from the project they should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. In doing so, they should remain respectful of those who continue to participate in the project and should not misrepresent the project's goals or achievements. Likewise, community members should respect any individual's choice to leave the project.</p>
+
+  </ol>
+
+<h2 id="diversity">Diversity Statement</h2>
+
+<p>Apache CouchDB welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about joining. Although we may not be able to satisfy everyone, we will always work to treat everyone well.
+
+<p>No matter how you identify yourself or how others perceive you: we welcome you. Though no list can hope to be comprehensive, we explicitly honour diversity in: age, culture, ethnicity, genotype, gender identity or expression, language, national origin, neurotype, phenotype, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, subculture and technical ability.
+
+<p>Though we welcome people fluent in all languages, Apache CouchDB development is conducted in English.
+
+<p>Standards for behaviour in the Apache CouchDB community are detailed in the Code of Conduct above. We expect participants in our community to meet these standards in all their interactions and to help others to do so as well.
+
+<p>If you want to help encourage a more diverse community, we encourage you to <em><span style="color: rgb(255,0,0);">TODO: join the diversity mailing list at &lt;TBD&gt;</span></em>
+
+<h2 id="reporting">Reporting Guidelines</h2>
+
+<p>While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful.
+
+<p>If you believe someone is violating this code of conduct, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion. Should there be difficulties in dealing with the situation, you may report your compliance issues in confidence to <a href="mailto:private@couchdb.apache.org">private@couchdb.apache.org</a>.
+
+<p>If the violation is in documentation or code, for example inappropriate pronoun usage or word choice within official documentation, we ask that people report these privately to the project at <a href="mailto:private@couchdb.apache.org">private@couchdb.apache.org</a>, and, if they have sufficient ability within the project, to resolve or remove the concerning material, being mindful of the perspective of the person originally reporting the issue.
+
+<h2 id="endnotes">Endnotes</h2>
+
+<p>This Code defines <strong>empathy</strong> as "a vicarious participation in the emotions, ideas, or opinions of others; the ability to imagine oneself in the condition or predicament of another." <strong>Empathetic</strong> is the adjectival form of empathy.
+
+<p>This statement thanks the following, on which it draws for content and inspiration:
+
+  <ul>
+    <li><a href="http://fedoraproject.org/code-of-conduct">Fedora Project Code of Conduct</a>
+    <li><a href="http://speakup.io/coc.html">Speak Up! Code of Conduct</a>
+    <li><a href="https://www.djangoproject.com/conduct/">Django Code of Conduct</a>
+    <li><a href="http://www.debian.org/vote/2014/vote_002">Debian Code of Conduct</a>
+    <li><a href="https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md">Twitter Open Source Code of Conduct</a>
+    <li><a href="https://wiki.mozilla.org/Code_of_Conduct/Draft#Conflicts_of_Interest">Mozilla Code of Conduct/Draft</a>
+    <li><a href="https://www.python.org/community/diversity/">Python Diversity Appendix</a>
+    <li><a href="http://pythonmentors.com/">Python Mentors Home Page</a>
+  </ul>

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/couchdb-doap.rdf
----------------------------------------------------------------------
diff --git a/couchdb-doap.rdf b/couchdb-doap.rdf
new file mode 100644
index 0000000..cfc5416
--- /dev/null
+++ b/couchdb-doap.rdf
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<rdf:RDF xml:lang="en"
+    xmlns="http://usefulinc.com/ns/doap#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:asfext="http://projects.apache.org/ns/asfext#">
+  <Project rdf:about="http://couchdb.apache.org/">
+    <created>2013-11-05</created>
+    <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
+    <name>Apache CouchDB</name>
+    <homepage rdf:resource="http://couchdb.apache.org/" />
+    <asfext:pmc rdf:resource="http://couchdb.apache.org" />
+    <shortdesc>NoSQL document database using HTTP, JSON, and MapReduce</shortdesc>
+    <description>Apache CouchDB is a database that completely embraces the web. Store your data with JSON documents. Access your documents with your web browser, via HTTP. Query, combine, and transform your documents with JavaScript. Apache CouchDB works well with modern web and mobile apps. You can even serve web apps directly out of Apache CouchDB. And you can distribute your data, or your apps, efficiently using Apache CouchDB’s incremental replication. Apache CouchDB supports master-master setups with automatic conflict detection.</description>
+    <bug-database rdf:resource="http://issues.apache.org/jira/browse/COUCHDB"/>
+    <mailing-list rdf:resource="http://couchdb.apache.org/#mailing-lists"/>
+    <download-page rdf:resource="http://couchdb.apache.org/#download"/>
+    <programming-language>JavaScript</programming-language>
+    <programming-language>Erlang</programming-language>
+    <programming-language>C++</programming-language>
+    <programming-language>C</programming-language>
+    <category rdf:resource="http://projects.apache.org/category/database"/>
+    <category rdf:resource="http://projects.apache.org/category/http"/>
+    <category rdf:resource="http://projects.apache.org/category/network-client"/>
+    <category rdf:resource="http://projects.apache.org/category/network-server"/>
+    <category rdf:resource="http://projects.apache.org/category/cloud"/>
+    <category rdf:resource="http://projects.apache.org/category/content"/>
+    <category rdf:resource="http://projects.apache.org/category/big-data"/>
+    <release>
+      <Version>
+        <name>Apache CouchDB 1.6.1</name>
+        <created>2014-09-03</created>
+        <revision>1.6.1</revision>
+      </Version>
+    </release>
+    <repository>
+      <GITRepository>
+        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/couchdb-couch/repo?p=couchdb.git;a=summary"/>
+        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf/couchdb-couch/repo?p=couchdb.git;a=summary"/>
+      </GITRepository>
+    </repository>
+  </Project>
+</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/developer-preview/.DS_Store
----------------------------------------------------------------------
diff --git a/developer-preview/.DS_Store b/developer-preview/.DS_Store
new file mode 100644
index 0000000..d936b9d
Binary files /dev/null and b/developer-preview/.DS_Store differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/developer-preview/2.0/index.html
----------------------------------------------------------------------
diff --git a/developer-preview/2.0/index.html b/developer-preview/2.0/index.html
new file mode 100644
index 0000000..a8a2313
--- /dev/null
+++ b/developer-preview/2.0/index.html
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+
+<html>
+
+<head>
+
+<meta charset="utf-8">
+
+<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+
+<link rel="canonical" href="http://couchdb.apache.org/"/>
+
+<title>Apache CouchDB</title>
+
+<!--
+
+Thanks to Yohei Shimomae and the Apache Cordova team for the original design.
+
+Thanks to Patrick Hoesly for his original artwork:
+
+    http://www.flickr.com/photos/zooboing/4715048673/
+
+This fabulous linen texture was integrated into the site design.
+
+-->
+
+<link rel="stylesheet" type="text/css" href="../../style/master.css">
+
+<script src="../../script/smooth.js" type="text/javascript"></script>
+
+  <style type="text/css" media="screen">
+  p {
+    line-spacing:1.3em;
+    margin-top: 1.3em;
+    margin-bottom: 1.3em;
+  }
+  ul {
+    margin-left:2em;
+  }
+  </style>
+
+</head>
+
+<body>
+
+  <a class="scroll-point pt-top" id="top"></a>
+
+  <div id="header">
+
+    <div class="wrap">
+
+      <a class="logo" href="/"></a>
+
+      <div class="menu">
+        <a href="#about">About</a>
+        <a href="http://docs.couchdb.org">Docs</a>
+        <a href="#contribute">Contribute</a>
+        <a href="#mailing-lists">Mailing Lists</a>
+        <a href="#download">Download</a>
+        <a href="#more">More&hellip;</a>
+      </div>
+
+      <form class="menu-dropdown">
+        <select onchange="location = this.options[this.selectedIndex].value;">
+          <option value="#about">About</option>
+          <option value="#contribute">Contribute</option>
+          <option value="#mailing-lists">Mailing Lists</option>
+          <option value="#download">Download</option>
+          <option value="#more">More&hellip;</option>
+        </select>
+      </form>
+
+    </div>
+
+    <div class="shadow"></div>
+
+  </div>
+
+  <div class="header-placeholder"></div>
+
+  <a class="scroll-point pt-about" id="about"></a>
+
+  <div class="wrap feature">
+
+    <h2 class="icon icon-about">CouchDB 2.0 Developer Preview</h2>
+
+    <p> This is an early, still in-development version of CouchDB. It is a significant departure from the 1.x series and will be foundation of the 2.0 version and beyond.
+    
+    <p> The target audience of this release are people who use CouchDB today and want to see what the future brings.
+
+    <p> The CouchDB community is requesting feedback on the following areas:
+      <ul>
+        <li>New Features</li>
+        <li>Compatibility with existing software</li>
+        <li>Bug reports</li>
+      </ul>
+
+    <p> Please report your findings to the <a href="http://couchdb.apache.org#mailing-lists" title="Apache CouchDB Developer Mailing list">Developer Maling List</a> or the <a href="https://issues.apache.org/jira/browse/CouchDB">Issue Tracker</a>.
+
+
+      <h2>Installation</h2>
+
+      <p> We are working on pre-built binaries, until then, follow these installation steps.
+
+      <p> <strong>Prerequisites</strong>:
+        <p>
+          <ul>
+            <li>Erlang (R14B or R16B or later)</li>
+            <li>Spidermonkey 1.8.5</li>
+            <li>libicu-dev</li>
+            <li><a href="https://github.com/rebar/rebar">rebar</a></li>
+            <li>Node.js with npm (for Fauxton, the web UI)</li>
+        </ul>
+      </p>
+
+      <p> See the <a href="https://github.com/apache/couchdb/blob/master/INSTALL.Unix">CouchDB Install file</a> and the <a href="https://github.com/apache/couchdb-fauxton/blob/master/readme.md">Fauxton Readme</a> for more detailed instrucitons on how to get the prerequisits set up.
+
+      <p> With this all in place, run the following commands:
+
+<code><pre>
+  git clone https://git-wip-us.apache.org/repos/asf/couchdb.git
+  npm install -g grunt-cli
+  cd couchdb
+  git checkout developer-preview-2.0
+  ./configure
+  make
+  dev/run
+</pre></code>
+
+    <p> The last command starts a three node cluster on the ports 15984, 25984 and 35984. They represent the endpoints in a three node cluster and you can connect to either one of them to access the full cluster.
+
+    <p> To get started, visit Fauxton, the new web UI at <a href="http://127.0.0.1:15984/_utils">http://127.0.0.1:15984/_utils</a>
+
+  </div>
+
+  <div id="footer">
+
+    <p>Copyright &copy; 2014 The Apache Software Foundation &mdash; Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a><br>
+      Apache CouchDB, CouchDB, and the project logo are <a href="http://www.apache.org/foundation/marks/list/">trademarks</a> of The Apache Software Foundation</p>
+
+    <a class="closing" href="#top"></a>
+
+  </div>
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-658988-6']);
+    _gaq.push(['_setDomainName', 'apache.org']);
+    _gaq.push(['_setAllowLinker', true]);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+  <script type="text/javascript" src="https://issues.apache.org/jira/s/1c67ff5e37d44b99a6a3140ab88552c8-T/en_UK1zkmuk/6332/7/1.4.15/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-UK&collectorId=c4088f46"></script>
+  <script>
+    $(document).ready(function () {
+      $('.download-list').on('click', function (e) {
+        if (!$(e.target).attr('href')) {
+          return;
+        }
+        _gaq.push(['_trackEvent', 'Click', 'Download', $(e.target).attr('href')]);
+      });
+    });
+  </script>
+</body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/favicon.ico
----------------------------------------------------------------------
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..64ea433
Binary files /dev/null and b/favicon.ico differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/google4a670cce736e6c03.html
----------------------------------------------------------------------
diff --git a/google4a670cce736e6c03.html b/google4a670cce736e6c03.html
new file mode 100644
index 0000000..11a02e0
--- /dev/null
+++ b/google4a670cce736e6c03.html
@@ -0,0 +1 @@
+google-site-verification: google4a670cce736e6c03.html

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/conf.png
----------------------------------------------------------------------
diff --git a/image/conf.png b/image/conf.png
new file mode 100644
index 0000000..23237d7
Binary files /dev/null and b/image/conf.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/couch.png
----------------------------------------------------------------------
diff --git a/image/couch.png b/image/couch.png
new file mode 100644
index 0000000..196b6f9
Binary files /dev/null and b/image/couch.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/linen.jpg
----------------------------------------------------------------------
diff --git a/image/linen.jpg b/image/linen.jpg
new file mode 100644
index 0000000..d80be96
Binary files /dev/null and b/image/linen.jpg differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/logo.png
----------------------------------------------------------------------
diff --git a/image/logo.png b/image/logo.png
new file mode 100644
index 0000000..c47a629
Binary files /dev/null and b/image/logo.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/shadow.png
----------------------------------------------------------------------
diff --git a/image/shadow.png b/image/shadow.png
new file mode 100644
index 0000000..8c5ba5f
Binary files /dev/null and b/image/shadow.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/sprite.png
----------------------------------------------------------------------
diff --git a/image/sprite.png b/image/sprite.png
new file mode 100644
index 0000000..6947c2d
Binary files /dev/null and b/image/sprite.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/image/sprite2x.png
----------------------------------------------------------------------
diff --git a/image/sprite2x.png b/image/sprite2x.png
new file mode 100644
index 0000000..2cb0de5
Binary files /dev/null and b/image/sprite2x.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-www/blob/e12cd94e/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..ac41120
--- /dev/null
+++ b/index.html
@@ -0,0 +1,390 @@
+<!DOCTYPE html>
+
+<html>
+
+<head>
+
+<meta charset="utf-8">
+
+<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+
+<link rel="canonical" href="http://couchdb.apache.org/"/>
+
+<title>Apache CouchDB</title>
+
+<!--
+
+Thanks to Yohei Shimomae and the Apache Cordova team for the original design.
+
+Thanks to Patrick Hoesly for his original artwork:
+
+    http://www.flickr.com/photos/zooboing/4715048673/
+
+This fabulous linen texture was integrated into the site design.
+
+-->
+
+<link rel="stylesheet" type="text/css" href="style/master.css">
+
+<script src="script/smooth.js" type="text/javascript"></script>
+
+</head>
+
+<body>
+
+  <a class="scroll-point pt-top" id="top"></a>
+
+  <div id="header">
+
+    <div class="wrap">
+
+      <a class="logo" href="#top"></a>
+
+      <div class="menu">
+        <a href="#about">About</a>
+        <a href="http://docs.couchdb.org">Docs</a>
+        <a href="#contribute">Contribute</a>
+        <a href="#mailing-lists">Mailing Lists</a>
+        <a href="#download">Download</a>
+        <a href="#more">More&hellip;</a>
+      </div>
+
+      <form class="menu-dropdown">
+        <select onchange="location = this.options[this.selectedIndex].value;">
+          <option value="#about">About</option>
+          <option value="#contribute">Contribute</option>
+          <option value="#mailing-lists">Mailing Lists</option>
+          <option value="#download">Download</option>
+          <option value="#more">More&hellip;</option>
+        </select>
+      </form>
+
+    </div>
+
+    <div class="shadow"></div>
+
+  </div>
+
+  <div class="header-placeholder"></div>
+
+  <div class="grid leadin">
+
+    <div class="wrap">
+
+      <img src="image/couch.png" alt=""/>
+
+      <ul class="text-block">
+        <li><h1><strong>Apache CouchDB</strong>&trade; is a database</h1></li>
+        <li><h1>that uses <strong>JSON</strong> for documents,</h1></li>
+        <li><h1><strong>JavaScript</strong> for <strong>MapReduce</strong> indexes,</h1></li>
+        <li><h1>and regular <strong>HTTP</strong> for its <strong>API</strong></h1></li>
+      </ul>
+
+      <div class="button-container">
+        <a class="button" href="#download">DOWNLOAD<small class="download-version">Version 1.6.1</small></a>
+      </div>
+
+    </div>
+
+  </div>
+
+  <a class="scroll-point pt-about" id="about"></a>
+
+  <div class="wrap feature">
+
+    <h2 class="icon icon-about">A Database for the Web</h2>
+
+    <p>CouchDB is a database that completely embraces the web. Store your data with JSON documents. Access your documents and query your indexes with your web browser, via HTTP. Index, combine, and transform your documents with JavaScript. CouchDB works well with modern web and mobile apps. You can even serve web apps directly out of CouchDB. And you can distribute your data, or your apps, efficiently using CouchDB’s incremental replication. CouchDB supports master-master setups with automatic conflict detection.
+
+    <p>CouchDB comes with a suite of features, such as on-the-fly document transformation and real-time change notifications, that makes web app development a breeze. It even comes with an easy to use web administration console. You guessed it, served up directly out of CouchDB! We care a lot about <a href="http://en.wikipedia.org/wiki/CAP_theorem">distributed scaling</a>. CouchDB is highly available and partition tolerant, but is also <a href="http://guide.couchdb.org/editions/1/en/consistency.html">eventually consistent</a>. And we care <em>a lot</em> about your data. CouchDB has a fault-tolerant storage engine that puts the safety of your data <em>first</em>.
+
+    <p>See the <a href="http://wiki.apache.org/couchdb/Introduction">introduction</a>, <a href="http://wiki.apache.org/couchdb/Technical%20Overview">technical overview</a>, or one of the <a href="http://wiki.apache.org/couchdb/Basics">guides</a> for more information.
+
+  </div>
+
+  <a class="scroll-point" id="contribute"></a>
+
+  <hr>
+
+  <div class="wrap feature">
+
+    <h2 class="icon icon-contribute">Want to Contribute?</h2>
+
+    <p>CouchDB is an open source project. That means everything, from this website to the core of the database itself, has been contributed by helpful individuals such as yourself. The time and attention of our contributors is our most precious resource, and we always need more of it. <strong>If you have time and attention you&rsquo;d like to donate, we welcome your contributions.</strong> It doesn&rsquo;t matter how familiar you are with CouchDB, or whether you know how to program Erlang. There are plenty of ways to be helpful! Just ask!
+
+    <p><strong>Any activity that enriches the project or the community is welcome.</strong> You do not have to contribute code to be a part of our community. Anyone who shows a commitment (in the sense of being loyal to the project&rsquo;s interests) will be given decision-making authority. <strong>Our primary goal is to build a welcoming, supportive, inclusive, and diverse community.</strong> We abide by a <a href="http://couchdb.apache.org/conduct.html">code of conduct</a> and a set of <a href="http://couchdb.apache.org/bylaws.html">project bylaws</a>.
+
+    <p>Because a healthy community is our most valuable asset, this is a good place to start contributing. Learn how CouchDB is used and why people love it. <strong>Read about it, promote it, and talk about it.</strong> Arrange or attend a <a href="https://cwiki.apache.org/confluence/display/COUCHDB/Meetups">meetup</a>, give a talk, or write about your adventures with CouchDB. If you write a blog post about CouchDB (or find a blog post worth sharing) drop a mail to the <a href="mailto:marketing@couchdb.apache.org">marketing list</a> (or <a href="twitter.com/CouchDB">send a tweet</a>) and we&rsquo;ll include it in the <a href="http://blog.couchdb.org/">weekly news</a>. You could also help out on the <a href="#user-mailing-list">user mailing list</a>, on <a href="irc://irc.freenode.net/couchdb">IRC</a>, or on <a href="http://stackoverflow.com/questions/tagged/couchdb">StackOverflow</a>. Or come join us on the <a href="#developer-mailing-list">developer mailing list</a> and let us know
  how else you&rsquo;d like to help.
+
+    <p><strong>We do content marketing and advocate marketing.</strong> If you want to help out with this, or any other aspect of marketing, join us on the <a href="#mailing-lists">marketing list</a> and announce yourself. <strong>We&rsquo;re looking for contributions to our web administration console, Fauxton. We would appreciate help with web design, development, user experience, and testing.</strong> Check out the <a href="http://s.apache.org/fauxton-issues">list of issues</a> to get started.</strong>
+
+    <p>Why don&rsquo;t you help us triage <a href="http://s.apache.org/Bni">JIRA</a> issues? <strong>Be the first person someone interacts with when they have a problem. This is a great way to help out while learning the project.</strong> Or maybe you&rsquo;d like to help us keep the <a href="http://wiki.apache.org/couchdb/">wiki</a> up-to-date? If you want to help with translations, join us on the <a href="#mailing-lists">localisation list</a> and specify which languages you want to help with. If you&rsquo;re looking for something a little more technical, you could help us with our documentation, QA, packaging, or release efforts. Just drop by on the <a href="#developer-mailing-list">developer list</a> and let us know what you want to do. <strong>There&rsquo;s enough room for any sort of contribution!</strong></p>
+
+    <p><strong>Do you want to contribute code? Great!</strong> There&rsquo;s lots of stuff to work on. <strong>Don&rsquo;t know Erlang? Join the <a href="#erlang-mailing-list">Erlang list</a>, and learn you some Erlang in a friendly environment!</strong> You can use JIRA to find <a href="http://s.apache.org/couchdb-easy-issues2">easy</a>, <a href="http://s.apache.org/couchdb-medium-issues2">medium</a>, and <a href="http://s.apache.org/couchdb-hard-issues2">hard</a> issues to work on. Or, if you&rsquo;d prefer, just open a new issue, and attach your patch. Don&rsquo;t want to use JIRA? <a href="https://github.com/apache?query=couchdb">Fork us on GitHub</a> and send a pull request. Why don&rsquo;t you check out the <a href="https://cwiki.apache.org/confluence/display/COUCHDB/Git+workflow">Git workflow</a> guide?
+
+  </div>
+
+  <a class="scroll-point" id="mailing-lists"></a>
+
+  <hr>
+
+  <div class="wrap">
+    <h2 class="icon icon-mailing-lists">Mailing Lists</h2>
+  </div>
+
+  <div class="grid">
+
+    <div class="wrap">
+
+      <div class="corner"></div>
+
+      <br/>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-announce/"><strong>Mail Search</strong></a>
+        <p>Search all of our mailing lists at once.</p>
+      </div>
+
+      <div class="list mailing-list">
+        <form action="http://markmail.org/search/list:org.apache.couchdb-*">
+          <input id="search-box" type="text" placeholder="Search query&hellip;" name="q" size="50"><button id="search-button"></button>
+        </form>
+      </div>
+
+      <br>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-announce/"><strong>Announcement List</strong></a>
+        <a id="announcement-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:announce-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:announce@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:announce-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>This is a low-traffic list for release announcements and security disclosures.</p>
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-user/"><strong>User List</strong></a>
+        <a id="user-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:user-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:user@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:user-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>This is a general discussion and support forum for all CouchDB users.</p>
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-l10n/"><strong>Localisation List</strong></a>
+        <a id="localisation-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:l10n-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:l10n@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:l10n-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>Do you speak more than one language? Help us to translate CouchDB!</p>
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-replication/"><strong>Replication List</strong></a>
+        <a id="replication-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:replication-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:replication@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:replication-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>A place to discuss CouchDB-compatible replication, and the systems that implement it.</p>
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-marketing/"><strong>Marketing List</strong></a>
+        <a id="marketing-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:marketing-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:marketing@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:marketing-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>A place to co-ordinate on CouchDB marketing activities.</p>
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-dev/"><strong>Developer List</strong></a>
+        <a id="developer-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:dev-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:dev@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:dev-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>This is where people working on CouchDB itself get together and discuss things.</p>
+
+      </div>
+
+      <div class="list-header">
+        <a href="http://mail-archives.apache.org/mod_mbox/couchdb-commits/"><strong>Commits List</strong></a>
+        <a id="commits-mailing-list" class="hash-target">&nbsp;</a>
+	<a href="mailto:commits-subscribe@couchdb.apache.org">Subscribe</a> &middot;
+	<a href="mailto:commits@couchdb.apache.org">Post</a> &middot;
+	<a href="mailto:commits-unsubscribe@couchdb.apache.org">Unsubscribe</a>
+        <p>This is where all source code changes and wiki changes are sent.</p>
+      </div>
+
+    </div>
+
+  </div>
+
+  <a class="scroll-point" id="download"></a>
+
+  <hr>
+
+  <div class="wrap download-pane">
+    <h2 class="icon icon-download">Download CouchDB 1.6.1</h2>
+  </div>
+
+  <div class="grid">
+
+    <div class="wrap">
+
+      <div class="corner"></div>
+
+      <div class="download-list-container">
+
+        <ul class="list download-list">
+          <li>
+            <a href="http://www.apache.org/dyn/closer.cgi?path=/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz" class="type">Source</a>
+            <span class="info">
+              Version 1.6.1 |
+              <a href="http://docs.couchdb.org/en/latest/whatsnew/1.6.html" class="release">Release Notes</a> |
+              <a href="http://www.apache.org/dist/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz.asc">OpenPGP</a> |
+              <a href="http://www.apache.org/dist/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz.md5">MD5</a> |
+              <a href="http://www.apache.org/dist/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz.sha">SHA</a>
+            </span>
+          </li>
+          <li>
+            <a href="http://www.apache.org/dyn/closer.cgi?path=/couchdb/binary/win/1.6.1/setup-couchdb-1.6.1_R16B02.exe" class="type">
+              Windows (x86)
+            </a>
+            <span class="info">
+              Erlang/OTP R16B02 | Version 1.6.1 |
+              <a href="http://docs.couchdb.org/en/latest/whatsnew/1.6.html" class="release">Release Notes</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/win/1.6.1/setup-couchdb-1.6.1_R16B02.exe.asc">OpenPGP</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/win/1.6.1/setup-couchdb-1.6.1_R16B02.exe.md5">MD5</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/win/1.6.1/setup-couchdb-1.6.1_R16B02.exe.sha">SHA</a>
+            </span>
+          </li>
+          <li>
+            <a href="http://www.apache.org/dyn/closer.cgi?path=/couchdb/binary/mac/1.6.1/Apache-CouchDB-1.6.1.zip" class="type">
+              Mac OS X (10.6+)
+            </a>
+            <span class="info">
+              Erlang/OTP R16B01 | Version 1.6.1 |
+              <a href="http://docs.couchdb.org/en/latest/whatsnew/1.6.html" class="release">Release Notes</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/mac/1.6.1/Apache-CouchDB-1.6.1.zip.asc">OpenPGP</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/mac/1.6.1/Apache-CouchDB-1.6.1.zip.md5">MD5</a> |
+              <a href="http://www.apache.org/dist/couchdb/binary/mac/1.6.1/Apache-CouchDB-1.6.1.zip.sha">SHA</a>
+            </span>
+          </li>
+	      <li>
+    		<a href="https://launchpad.net/~couchdb/+archive/stable" class="type">Ubuntu packages</a>
+	    	<span class="info">
+                  Version 1.6.1 |
+                  <a href="http://docs.couchdb.org/en/latest/whatsnew/1.6.html" class="release">Release Notes</a>
+        	</span>
+          </li>
+          <br>
+          <li>
+            <a href="/developer-preview/2.0/" class="type">2.0 Developer Preview</a>
+            <span class="info">Help us test the Future of CouchDB…</span>
+          </li>
+        </ul>
+
+      </div>
+
+    </div>
+
+  </div>
+
+  <a class="scroll-point" id="more"></a>
+
+  <hr>
+
+  <div class="wrap more-pane">
+
+    <h2 class="icon icon-more">More &hellip;</h2>
+
+    <br>
+
+    <ul class="more-header">
+      <li>General</li>
+      <li>Development</li>
+      <li class="last">Apache Software Foundation</li>
+    </ul>
+
+    <div class="clear"></div>
+
+  </div>
+
+  <div class="grid">
+
+    <div class="wrap">
+
+      <div class="list-container">
+
+        <ul class="list more">
+          <li class="corner"></li>
+          <li><a href="http://docs.couchdb.org/en/latest/">Documentation<span></span></a>
+          <li><a href="https://cwiki.apache.org/confluence/display/COUCHDB/Current+Releases">Current Releases<span></span></a></li>
+          <li><a href="http://blog.couchdb.org/">Blog<span></span></a>
+          <li><a href="http://couchdb.apache.org/bylaws.html">Bylaws<span></span></a>
+	  <li><a href="http://couchdb.apache.org/conduct.html">Code of Conduct<span></span></a>
+        </ul>
+
+        <ul class="list more">
+          <li class="corner"></li>
+          <li><a href="http://wiki.apache.org/couchdb/">Wiki<span></span></a></li>
+          <li><a href="https://issues.apache.org/jira/browse/CouchDB">Issue Tracker<span></span></a></li>
+          <li><a href="https://github.com/apache/couchdb/pulls">Pull Requests<span></span></a></li>
+          <li><a href="https://github.com/apache?query=couchdb">Git Mirrors<span></span></a></li>
+        </ul>
+
+        <ul class="list more last">
+          <li class="corner"></li>
+          <li><a href="http://www.apache.org/">About the ASF<span></span></a></li>
+          <li><a href="http://www.apache.org/foundation/thanks.html">Thanks<span></span></a></li>
+          <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor<span></span></a></li>
+          <li><a href="http://www.apache.org/security/">Security<span></span></a></li>
+          <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License<span></span></a></li>
+        </ul>
+
+        <div class="clear"></div>
+
+      </div>
+
+    </div>
+
+  </div>
+
+  <div id="footer">
+
+    <p>Copyright &copy; 2014 The Apache Software Foundation &mdash; Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a><br>
+      Apache CouchDB, CouchDB, and the project logo are <a href="http://www.apache.org/foundation/marks/list/">trademarks</a> of The Apache Software Foundation</p>
+
+    <a class="closing" href="#top"></a>
+
+  </div>
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-658988-6']);
+    _gaq.push(['_setDomainName', 'apache.org']);
+    _gaq.push(['_setAllowLinker', true]);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+  <script type="text/javascript" src="https://issues.apache.org/jira/s/1c67ff5e37d44b99a6a3140ab88552c8-T/en_UK1zkmuk/6332/7/1.4.15/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-UK&collectorId=c4088f46"></script>
+  <script>
+    $(document).ready(function () {
+      $('.download-list').on('click', function (e) {
+        if (!$(e.target).attr('href')) {
+          return;
+        }
+        _gaq.push(['_trackEvent', 'Click', 'Download', $(e.target).attr('href')]);
+      });
+    });
+  </script>
+</body>
+
+</html>


Mime
View raw message