Skip to content

Commit

Permalink
Merge 8ff26bb into f77da04
Browse files Browse the repository at this point in the history
  • Loading branch information
Braydon Fuller committed Jul 29, 2015
2 parents f77da04 + 8ff26bb commit ba1214d
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -104,7 +104,7 @@ Run all the tests:
gulp test
```

You can also run just the NodeJS tests with `gulp test:node`, just the browser tests with `gulp test:browser`
You can also run just the Node.js tests with `gulp test:node`, just the browser tests with `gulp test:browser`
or create a test coverage report (you can open `coverage/lcov-report/index.html` to visualize it) with `gulp coverage`.

## License
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Expand Up @@ -2,7 +2,7 @@

## Principles

Bitcoin is a powerful new peer-to-peer platform for the next generation of financial technology. The decentralized nature of the Bitcoin network allows for highly resilient bitcoin infrastructure, and the developer community needs reliable, open-source tools to implement bitcoin apps and services. Bitcore provides a reliable API for javascript apps that need to interface with Bitcoin.
Bitcoin is a powerful new peer-to-peer platform for the next generation of financial technology. The decentralized nature of the Bitcoin network allows for highly resilient bitcoin infrastructure, and the developer community needs reliable, open-source tools to implement bitcoin apps and services. Bitcore provides a reliable API for JavaScript apps that need to interface with Bitcoin.

To get started, just `npm install bitcore` or `bower install bitcore`.

Expand Down
2 changes: 1 addition & 1 deletion docs/transaction.md
Expand Up @@ -143,7 +143,7 @@ To remove all outputs, you can use `clearOutputs()`, which preserves change outp

There are a series of methods used for serialization:

* `toObject`: Returns a plain javascript object with no methods and enough information to fully restore the state of this transaction. Using other serialization methods (except for `toJSON`) will cause a some information to be lost.
* `toObject`: Returns a plain JavaScript object with no methods and enough information to fully restore the state of this transaction. Using other serialization methods (except for `toJSON`) will cause a some information to be lost.
* `toJSON`: Returns a string with a JSON-encoded version of the output for `toObject`.
* `toString` or `uncheckedSerialize`: Returns an hexadecimal serialization of the transaction, in the [serialization format for bitcoin](https://bitcoin.org/en/developer-reference#raw-transaction-format).
* `serialize`: Does a series of checks before serializing the transaction
Expand Down
4 changes: 2 additions & 2 deletions lib/block/block.js
Expand Up @@ -62,7 +62,7 @@ Block._fromJSON = function _fromJSON(data) {
};

/**
* @param {Object} - A plain javascript object
* @param {Object} - A plain JavaScript object
* @returns {Object} - An object representing block data
* @private
*/
Expand Down Expand Up @@ -92,7 +92,7 @@ Block.fromJSON = function fromJSON(json) {
};

/**
* @param {Object} - A plain javascript object
* @param {Object} - A plain JavaScript object
* @returns {Block} - An instance of block
*/
Block.fromObject = function fromObject(obj) {
Expand Down
2 changes: 1 addition & 1 deletion lib/block/blockheader.js
Expand Up @@ -93,7 +93,7 @@ BlockHeader.fromJSON = function fromJSON(json) {
};

/**
* @param {Object} - A plain javascript object
* @param {Object} - A plain JavaScript object
* @returns {BlockHeader} - An instance of block header
*/
BlockHeader.fromObject = function fromObject(obj) {
Expand Down
2 changes: 1 addition & 1 deletion lib/errors/spec.js
Expand Up @@ -28,7 +28,7 @@ module.exports = [{
}
}, {
name: 'AbstractMethodInvoked',
message: 'Abstract Method Invokation: {0}'
message: 'Abstract Method Invocation: {0}'
}, {
name: 'InvalidArgumentType',
message: function() {
Expand Down
2 changes: 1 addition & 1 deletion lib/hdpublickey.js
Expand Up @@ -391,7 +391,7 @@ HDPublicKey.prototype.inspect = function() {
};

/**
* Returns a plain javascript object with information to reconstruct a key.
* Returns a plain JavaScript object with information to reconstruct a key.
*
* Fields are: <ul>
* <li> network: 'livenet' or 'testnet'
Expand Down

0 comments on commit ba1214d

Please sign in to comment.