You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/08/22 14:05:01 UTC

[1/3] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 3d1cd68

Updated Branches:
  refs/heads/1781-reorganize-and-improve-docs ec270f679 -> 3d1cd682e


Show more content from the main page.


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

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: be9c9c4e4e32d53e2789a991dbfd906fc6984677
Parents: ec270f6
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Aug 21 20:58:05 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Aug 21 20:58:05 2013 +0400

----------------------------------------------------------------------
 share/doc/src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/be9c9c4e/share/doc/src/index.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/index.rst b/share/doc/src/index.rst
index 1262375..047088e 100644
--- a/share/doc/src/index.rst
+++ b/share/doc/src/index.rst
@@ -24,7 +24,7 @@ Contents
 ========
    
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 3
     :numbered:
 
     intro


[2/3] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 3d1cd68

Posted by kx...@apache.org.
Update NOTICE.


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

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: f2cf6176e676894d18c988ec9a770ede35d111dd
Parents: be9c9c4
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Aug 21 22:08:15 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Aug 21 22:08:15 2013 +0400

----------------------------------------------------------------------
 NOTICE | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f2cf6176/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 182c267..e87bf58 100644
--- a/NOTICE
+++ b/NOTICE
@@ -145,3 +145,19 @@ This product also includes the following third-party components:
  * couch_dbupdates
 
    Copyright 2012, Benoît Chesneau <be...@refuge.io>
+
+ * httpdomain.py (https://bitbucket.org/birkenfeld/sphinx-contrib/src/6a3a8ca714cfce957530890d0431d9a7b88c930f/httpdomain/sphinxcontrib/httpdomain.py?at=httpdomain-1.1.9)
+
+   Copyright (c) 2010, Hong Minhee <mi...@dahlia.kr>
+
+ * externals.rst (http://davispj.com/2010/09/26/new-couchdb-externals-api.html)
+
+   Copyright 2008-2010, Paul Joseph Davis <pa...@gmail.com>
+
+ * protocol.rst (http://www.dataprotocols.org/en/latest/couchdb_replication.html)
+
+   Copyright 2011-2013, Benoît Chesneau <be...@refuge.io>
+
+ * views/intro.rst views/nosql.rst views/pagination.rst
+
+   Copyright 2013, Creative Commons Attribution license


[3/3] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 3d1cd68

Posted by kx...@apache.org.
Respect copyright on content from external sources.


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

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: 3d1cd682ee37ed9cf5e77c9d88da01b92139198e
Parents: f2cf617
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Aug 22 16:00:44 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Aug 22 16:00:44 2013 +0400

----------------------------------------------------------------------
 NOTICE                                 | 4 ++++
 share/doc/src/couchapp/views/joins.rst | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3d1cd682/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index e87bf58..fb94ba1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -161,3 +161,7 @@ This product also includes the following third-party components:
  * views/intro.rst views/nosql.rst views/pagination.rst
 
    Copyright 2013, Creative Commons Attribution license
+
+ * share/doc/src/couchapp/views/joins.rst (Using View Collation)
+
+   Copyright 2007, Christopher Lenz <cm...@gmail.com>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/3d1cd682/share/doc/src/couchapp/views/joins.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/couchapp/views/joins.rst b/share/doc/src/couchapp/views/joins.rst
index 3abae9d..3b95427 100644
--- a/share/doc/src/couchapp/views/joins.rst
+++ b/share/doc/src/couchapp/views/joins.rst
@@ -161,6 +161,10 @@ emit a ``"_rev"`` property as well as ``"_id"``.
 Using View Collation
 ====================
 
+:Author: Christopher Lenz
+:Date: 2007-10-05
+:Source: http://www.cmlenz.net/archives/2007/10/couchdb-joins
+
 Just today, there was a discussion on IRC how you'd go about modeling a simple
 blogging system with “post” and “comment” entities, where any blog post might
 have N comments. If you'd be using an SQL database, you'd obviously have two