Skip to content

Commit

Permalink
Merge release branch into master
Browse files Browse the repository at this point in the history
  • Loading branch information
lsegal committed Feb 27, 2014
2 parents 8b5e57a + 085119f commit ee53049
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -12,7 +12,7 @@ Release notes can be found at http://aws.amazon.com/releasenotes/SDK/JavaScript
To use the SDK in the browser, simply add the following script tag to your To use the SDK in the browser, simply add the following script tag to your
HTML pages: HTML pages:


<script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc9.min.js"></script> <script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc10.min.js"></script>


### In Node.js ### In Node.js


Expand Down
2 changes: 1 addition & 1 deletion doc-src/guide/browser-examples.md
Expand Up @@ -7,7 +7,7 @@ and authenticated with the correct credentials.


The common preamble code can be summarized as follows: The common preamble code can be summarized as follows:


<script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc9.min.js"></script> <script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc10.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
// See the Configuring section to configure credentials in the SDK // See the Configuring section to configure credentials in the SDK
AWS.config.credentials = ...; AWS.config.credentials = ...;
Expand Down
4 changes: 2 additions & 2 deletions doc-src/guide/browser-intro.md
Expand Up @@ -8,10 +8,10 @@ The quickest way to get started with the SDK is to load it using the hosted
package directly from Amazon Web Services. To do this, simply add the following package directly from Amazon Web Services. To do this, simply add the following
script tag to your HTML pages: script tag to your HTML pages:


<script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc9.min.js"></script> <script src="https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc10.min.js"></script>


You can also download this package by clicking the following link: You can also download this package by clicking the following link:
[aws-sdk-2.0.0-rc9.min.js](https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc9.min.js) [aws-sdk-2.0.0-rc10.min.js](https://sdk.amazonaws.com/js/aws-sdk-2.0.0-rc10.min.js)


Once the SDK is loaded in your page, the module will be available from Once the SDK is loaded in your page, the module will be available from
the global variable `AWS` (or `window.AWS`). the global variable `AWS` (or `window.AWS`).
Expand Down
2 changes: 1 addition & 1 deletion lib/core.js
Expand Up @@ -18,7 +18,7 @@ AWS.util.update(AWS, {
/** /**
* @constant * @constant
*/ */
VERSION: '2.0.0-rc9', VERSION: '2.0.0-rc10',


/** /**
* @api private * @api private
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{ {
"name": "aws-sdk", "name": "aws-sdk",
"description": "AWS SDK for JavaScript", "description": "AWS SDK for JavaScript",
"version": "2.0.0-rc9", "version": "2.0.0-rc10",
"author": { "author": {
"name":"Amazon Web Services", "name":"Amazon Web Services",
"email":"", "email":"",
Expand Down

0 comments on commit ee53049

Please sign in to comment.