Merge branch 'master' of github.com:koajs/koa

This commit is contained in:
TJ Holowaychuk 2013-09-14 14:48:43 -07:00
commit c5ecbd99ac

View file

@ -1,4 +1,3 @@
## Application ## Application
A Koa application is not a 1-to-1 representation of an HTTP server, A Koa application is not a 1-to-1 representation of an HTTP server,
@ -446,7 +445,7 @@ this.body = 'Redirecting to shopping cart';
to prompt for download. Optionally specify the `filename` of the to prompt for download. Optionally specify the `filename` of the
download. download.
### ctx.accept(types) ### ctx.accepts(types)
Check if the given `type(s)` is acceptable, returning Check if the given `type(s)` is acceptable, returning
the best match when true, otherwise `undefined`, in which the best match when true, otherwise `undefined`, in which