[clouchdb-cvs] CVS clouchdb/public_html

[peddy]

Update of /project/clouchdb/cvsroot/clouchdb/public_html
In directory cl-net:/tmp/cvs-serv22321

Modified Files:
	index.html 
Log Message:
Update doc with get-document conflicts parameter


--- /project/clouchdb/cvsroot/clouchdb/public_html/index.html	2009/07/12 18:59:04	1.6
+++ /project/clouchdb/cvsroot/clouchdb/public_html/index.html	2009/07/15 01:37:25	1.7
@@ -52,23 +52,22 @@
 <h2><a name="news">News</a></h2>
 
 <ul>
-  <li><b>Jun 15, 2008</b> Added function create-ps-view and macro
-    ps-view to support the new CouchDb 8.0 style views (which use
-    map/reduce and emit). This code is checked into source control but
-    not yet in a release. See examples.lisp and test.lisp for usage
-    examples.
-  </li>
-  <li><b>Jun 7, 2008</b> Note: CouchDb's views API has changed in
-   source control, breaking this library. If you want to use CouchDb
-   and this library, you'll have better luck sticking to the 7.2
-   pre-release version of CouchDb.
-  </li>
-  <li><b>Mar 1, 2008</b> Released version 0.0.9 with proper support
-    for complex keys in views. The functions ad-hoc-view and
-    invoke-view's :key, :start-end and :end-key parameters now accept
-    s-exprs in addtion to string
-    values. See <a href="#views-api-reference">Views API</a>
-    documentaion and <a href="#example-3">Example 3</a> for details.
+  <li>
+    <b>July 12, 2009</b> Significant updates with breaking
+    changes. Major changes include:
+    <ul>
+      <li>
+        Support for Attachments. This is the first release with
+        attachment support.
+      </li>
+      <li>
+        Moved all database connection information into database
+        structure.
+      </li>
+      <li>
+        Major documentation updates and a few API simplications.
+      </li>
+    </ul>
   </li>
 </ul>
 
@@ -86,7 +85,7 @@
   <li><a href="http://www.cliki.net/Parenscript/">Parenscript</a></li>
   <li><a href="http://www.cliki.net/LIFT/">LIFT</a> testing framework</li>
   <li>An available <a href="http://couchdb.org">CouchDb</a> server,
-  minimum supported version is 0.7, now tested on 7.3a</li>
+  minimum supported version is 0.9.1</li>
 </ul>
 
 <h3>ASDF Install</h3>
@@ -1267,7 +1266,7 @@
 
 <p>[Function]<br />
 <a name="sym-get-document"><b>get-document</b></a> id &key revision
-revisions revision-info if-missing</p>
+revisions revision-info if-missing conflicts</p>
 <blockquote>
 <p>
   Get document by <b>id</b>. If <b>revision</b> is specified attempts
@@ -1275,7 +1274,8 @@
   non-nil, returns brief revision information for identified
   document. If <b>revision-info</b> is non-nil, returns more detailed
   revision information for document. The revision, revisions, and
-  revision-info parameters are mutually exclusive.
+  revision-info parameters are mutually exclusive. If <b>conflicts</b>
+  is true, return document replication conflicts if they exist.
 </p>
 <p>
   If the specified document is not found in the database this function