Merge branch 'release/v1.0.0'

dowjones · Jan 31, 2015 · c00c233 · c00c233
2 parents 008b947 + 5b5a00a
commit c00c233
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,7 @@
+#License - ISC
+
+Copyright (c) 2015, Dow Jones & Co
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ fiveby(function (browser) {
     });
 });
 ```
-Add [gulp](http://gulpjs.com/) and some convention to make it even more powerful: [slush-fiveby](https://github.com/dowjones/slush-fiveby)
+Add [gulp](http://gulpjs.com/) and some convention to make it even more powerful: [slush-fiveby](https://github.com/dowjones/slush-fiveby). slush-fiveby is a simple fiveby project generator/example.
 
 ###What's unique about fiveby?
 
@@ -59,6 +59,6 @@ Ok, this tool will allow you to write a bit of javascript that will open any bro
 
 - [node.js](http://nodejs.org/)
 - [mocha cli](http://mochajs.org/)
-- [java](https://www.java.com/en/download/help/download_options.xml)
+- [java](https://www.java.com/en/download/help/download_options.xml) (for selenium)
 
 See [docs folder](/docs) for even more details!
diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "fiveby",
-  "version": "0.9.2",
+  "version": "1.0.0",
   "description": "Package up testing options, levels, apis, and dependencies into one simple lib",
   "scripts": {
     "test": "gulp test"
   },
   "author": "Scott Rahner",
+  "license": "ISC",
   "repository": {
     "type": "git",
     "url": "https://github.dowjones.net/institutional/fiveby.git"

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,4 +1,4 @@
-Version 0.9.2 - *Pending*
+Version 1.0.0
 -----------------
 
 - removed dependency on tesla.lib.cache