Merge branch 'master' of https://github.com/timrwood/moment

README.markdown

@@ -1,18 +1,25 @@
-Moment.js
-=========
+[Moment.js](http://momentjs.com)
+================================
 
 A lightweight javascript date library for parsing, manipulating, and formatting dates.
 
-### Check it out at [momentjs.com](http://momentjs.com).
+### [Check out the website](http://momentjs.com)
+
+### [Read the documentation](http://momentjs.com/docs/)
+
+### [Run the unit tests](http://momentjs.com/test/)
 
-Get it with npm
-===============
 
-    npm install moment
+Upgrading to 1.6.0
+==================
 
-### Read the documentation at [momentjs.com/docs/](http://momentjs.com/docs/).
+There are a few things being deprecated in the 1.6.0 release.
 
-### Run the unit tests at [momentjs.com/test/](http://momentjs.com/test/).
+1. The format tokens `z` and `zz` (timezone abbreviations like EST CST MST etc) will no longer be supported. Due to inconsistent browser support, we are unable to consistently produce this value. See [this issue](https://github.com/timrwood/moment/issues/162) for more background.
+
+2. The method `moment.fn.native` is deprecated in favor of `moment.fn.toDate`. There continue to be issues with Google Closure Compiler throwing errors when using `native`, even in valid instances.
+
+3. The way to customize am/pm strings is being changed. This would only affect you if you created a custom language file. For more information, see [this issue](https://github.com/timrwood/moment/pull/222).
 
 
 Contributing
@@ -45,20 +52,6 @@ When submitting a bugfix, please check if there is an existing bugfix branch. If
 
 The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released.
 
-Thanks to...
-============
-
-The folks over at [date.js](http://code.google.com/p/datejs/).
-
-Everyone who helped with [php.js date](http://phpjs.org/functions/date:380).
-
-[Ryan McGeary](http://ryan.mcgeary.org/) for his work on the [jQuery timeago plugin](http://timeago.yarp.com/).
-
-License
-=======
-
-Moment.js is freely distributable under the terms of the MIT license.
-
 Changelog
 =========
 
@@ -178,4 +171,19 @@ Changed date format from php date format to custom format.
 
 ### 0.1.0
 
-Initial release
+Initial release
+
+License
+=======
+
+Moment.js is freely distributable under the terms of the MIT license.
+
+Copyright (c) 2011-2012 Tim Wood
+
+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.