svn commit: r732420 - /couchdb/trunk/src/couchdb/couch_httpd_view.erl

2009-01-07 Thread jchris 
Author: jchris
Date: Wed Jan  7 10:33:51 2009
New Revision: 732420

URL: http://svn.apache.org/viewvc?rev=732420view=rev
Log:
friendly error message on use of count instead of limit

Modified:
couchdb/trunk/src/couchdb/couch_httpd_view.erl

Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=732420r1=732419r2=732420view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Wed Jan  7 10:33:51 2009
@@ -254,6 +254,8 @@
 Msg = io_lib:format(Bad URL query value, number expected: 
limit=~s, [Value]),
 throw({query_parse_error, Msg})
 end;
+{count, Value} -
+throw({query_parse_error, URL query parameter 'count' has been 
changed to 'limit'.});
 {update, false} -
 Args#view_query_args{update=false};
 {descending, true} -

[Couchdb Wiki] Update of Development by LukeVenediger

2009-01-07 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The following page has been changed by LukeVenediger:
http://wiki.apache.org/couchdb/Development

The comment on the change is:
Adding a page on how non-committers can submit patches

--
* [One laptop per child]
* [Full text search]
* [Running Couchdb in Dev Mode]
+   * [How to contribute for Non-Committers]

svn commit: r732511 - /couchdb/trunk/LICENSE

2009-01-07 Thread jchris 
Author: jchris
Date: Wed Jan  7 13:38:46 2009
New Revision: 732511

URL: http://svn.apache.org/viewvc?rev=732511view=rev
Log:
remove jquery.history.js LICENSE notice

Modified:
couchdb/trunk/LICENSE

Modified: couchdb/trunk/LICENSE
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/LICENSE?rev=732511r1=732510r2=732511view=diff
==
--- couchdb/trunk/LICENSE (original)
+++ couchdb/trunk/LICENSE Wed Jan  7 13:38:46 2009
@@ -262,29 +262,6 @@
   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-For the share/www/script/jquery.history.js component:
-
-  http://www.mikage.to/jquery/jquery_history.html
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  Software), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 For the share/www/script/json2.js component:
 
   Public Domain

svn commit: r732519 - in /couchdb/trunk: NOTICE share/Makefile.am

2009-01-07 Thread jchris 
Author: jchris
Date: Wed Jan  7 13:51:15 2009
New Revision: 732519

URL: http://svn.apache.org/viewvc?rev=732519view=rev
Log:
reverted 732492, part of rolling out the Futon history

Modified:
couchdb/trunk/NOTICE
couchdb/trunk/share/Makefile.am

Modified: couchdb/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/NOTICE?rev=732519r1=732518r2=732519view=diff
==
--- couchdb/trunk/NOTICE (original)
+++ couchdb/trunk/NOTICE Wed Jan  7 13:51:15 2009
@@ -14,10 +14,6 @@
 
Copyright 2008, John Resig
 
- * jQuery history plugin (http://www.mikage.to/jquery/jquery_history.html)
-
-   Copyright 2006, Taku Sano (Mikage Sawatari)
-
  * json2.js (http://www.json.org/)
 
In the public domain

Modified: couchdb/trunk/share/Makefile.am
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=732519r1=732518r2=732519view=diff
==
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Wed Jan  7 13:51:15 2009
@@ -63,7 +63,6 @@
 www/script/jquery.couch.js \
 www/script/jquery.dialog.js \
 www/script/jquery.form.js \
-www/script/jquery.history.js \
 www/script/jquery.resizer.js \
 www/script/jquery.suggest.js \
 www/script/json2.js \