summaryrefslogtreecommitdiff
path: root/couchjs/c_src/help.h
diff options
context:
space:
mode:
authorRobert Newson <robert.newson@cloudant.com>2011-10-31 18:36:54 +0000
committerRobert Newson <robert.newson@cloudant.com>2011-10-31 18:54:51 +0000
commit8bbd833f866c8dfdaaf06f3dc5a5ca06030504e8 (patch)
treec5da36c09f33c689a70d99480327140362031d8e /couchjs/c_src/help.h
parenta6352493651f6f8e3430269555421b5599a77809 (diff)
parentaf7a6ae52890c6c158615068f2a48d40c52ec538 (diff)
Merge commit '1.1.1' into 0.4.x
Conflicts: acinclude.m4.in configure.ac couchjs/c_src/http.c src/erlang-oauth/Makefile.am src/erlang-oauth/oauth.app.in src/erlang-oauth/oauth_hmac_sha1.erl src/erlang-oauth/oauth_http.erl src/erlang-oauth/oauth_plaintext.erl src/etap/etap_web.erl
Diffstat (limited to 'couchjs/c_src/help.h')
-rw-r--r--couchjs/c_src/help.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/couchjs/c_src/help.h b/couchjs/c_src/help.h
index 84c83c06..c42c9f59 100644
--- a/couchjs/c_src/help.h
+++ b/couchjs/c_src/help.h
@@ -51,7 +51,7 @@ static const char USAGE_TEMPLATE[] =
" -H enable %s cURL bindings (only avaiable\n"
" if package was built with cURL available)\n"
" -S SIZE specify that the interpreter should set the\n"
- " the stack quota for JS contexts to SIZE bytes\n"
+ " stack quota for JS contexts to SIZE bytes\n"
"\n"
"Report bugs at <%s>.\n";