Skip to content

Commit

Permalink
Clarify license and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Apr 24, 2012
1 parent 42e105c commit 14d45e6
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
27 changes: 27 additions & 0 deletions LICENSE
@@ -0,0 +1,27 @@
Original "Negotiator" program Copyright Federico Romero
Port to JavaScript Copyright Isaac Z. Schlueter

All rights reserved.

MIT License

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.
6 changes: 4 additions & 2 deletions readme.md
Expand Up @@ -2,6 +2,8 @@

An HTTP content negotiator for node.js written in javascript.

This is a port to JavaScript of <https://github.com/federomero/negotiator>.

# Accept Negotiation

Negotiator = require('negotiator')
Expand Down Expand Up @@ -30,7 +32,7 @@ You can check a working example at `examples/accept.js`.

Returns an array of preferred media types ordered by priority from a list of available media types.

`preferredMediaTyp(availableMediaType)`:
`preferredMediaType(availableMediaType)`:

Returns the top preferred media type from a list of available media types.

Expand Down Expand Up @@ -67,7 +69,7 @@ Returns the top preferred language from a list of available languages.

# Accept-Charset Negotiation

Negotiator = require('negotiator').Negotiator
Negotiator = require('negotiator')

availableCharsets = ['utf-8', 'iso-8859-1', 'iso-8859-5']

Expand Down

0 comments on commit 14d45e6

Please sign in to comment.