Merge pull request #149 from watson-developer-cloud/master

Update dev with the changes from master

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 sudo: false
 node_js:
-- '0.10'
 - '0.12'
+- 4.2
 - stable
 script:
 - npm test

CONTRIBUTING.md

@@ -34,3 +34,29 @@ Travis will run the integration tests for all services once the changes are merg
 1. Make the test pass.
 1. Commit your changes.
 1. Push to your fork and submit a pull request.
+
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+   have the right to submit it under the open source license
+   indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+   of my knowledge, is covered under an appropriate open source
+   license and I have the right under that license to submit that
+   work with modifications, whether created in whole or in part
+   by me, under the same open source license (unless I am
+   permitted to submit under a different license), as indicated
+   in the file; or
+
+(c) The contribution was provided directly to me by some other
+   person who certified (a), (b) or (c) and I have not modified
+   it.
+
+(d) I understand and agree that this project and the contribution
+   are public and that a record of the contribution (including all
+   personal information I submit with it, including my sign-off) is
+   maintained indefinitely and may be redistributed consistent with
+   this project or the open source license(s) involved.

README.md

@@ -60,12 +60,13 @@ Several breaking changes were introduced with the v1.0.0 release:
     The affected methods are:
     * `recognizeLive()`
     * `observeResult()`
-    * `getRecognizeStatus()`]
+    * `getRecognizeStatus()`
   * The Document Conversion API has been reduced to a single `convert()` method; it no longer offers batch conversion or cloud storage of files.
   * Several deprecated services have been removed:
     * Message Resonance
     * Tone Analyzer v1 (replaced by v2-experimental)
     * Search (replaced by Retrieve and Rank)
+  * Dropped support for node.js v0.10.x (For reference: now officially support the latest 0.12, LTS, and Stable releases of Node.js.)
 
 
 ## Installation

RELEASE.md

@@ -9,9 +9,24 @@ git push origin master
 npm publish
 ```
 
-`npm version *` will update the package.json version field appropriately and create a git commit and tag for the version.  
-`git push --tags` will publish the tag to github., and then immediately.  
-`git push origin master` will publish the changes to package.json.  
+`npm version *` will update the package.json version field appropriately and create a git commit and tag for the version.
+`git push --tags` will publish the tag to github., and then immediately.
+`git push origin master` will publish the changes to package.json.
 `npm publish` will publish the npm package.
 
-The reason for this is that it allows someone to easily view the source code (and readme) for whatever version they happen to have downloaded from npm. This is particularly helpful when github is ahead of npm.
+The reason for this is that it allows someone to easily view the source code (and readme) for whatever version they happen to have downloaded from npm. This is particularly helpful when github is ahead of npm.
+
+
+### Pre-release process
+
+This puts out a beta version that can be downloaded from npm if the specific version is specified but won't be treated as the latest version for users that don't explicitly install the beta:
+
+First version it with the version number that it will be eventually followed by -beta.number after the version number. Then publish with `--tag beta`.
+
+For example, this was the commands for publishing the third beta of v1.0.0:
+```
+npm version 1.0.0-beta.3
+git push origin master
+git push --tags
+npm publish --tag beta
+```

examples/concept_insights.v2.js

@@ -9,7 +9,7 @@ var concept_insights = watson.concept_insights({
 });
 
 var params = {
-  graph: '/graphs/wikipedia/en20120601',
+  graph: '/graphs/wikipedia/en-20120601',
   text: 'IBM Watson won the Jeopardy television show hosted by Alex Trebek'
 };
 

examples/speech_to_text.v1.js

@@ -11,7 +11,7 @@ var speech_to_text = watson.speech_to_text({
 });
 
 var params = {
-  content_type: 'audio/l16; rate=44100',
+  content_type: 'audio/wav',
 };
 
 // create the stream

package.json

@@ -1,6 +1,6 @@
 {
   "name": "watson-developer-cloud",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Client library to use the IBM Watson Services and AlchemyAPI",
   "main": "./lib/index",
   "repository": {
@@ -62,8 +62,8 @@
     "coveralls": "^2.11.4",
     "istanbul": "^0.4.0",
     "jshint": "^2.8.0",
-    "mocha": "^2.3.3",
-    "nock": "^2.15.0",
+    "mocha": "^2.3.4",
+    "nock": "^3.0.0",
     "qs": "^5.2.0"
   },
   "dependencies": {