From 7ee8d6b10b0749ed37097280ac7147902ae331dc Mon Sep 17 00:00:00 2001
From: xyzether <xyzether@gmail.com>
Date: Fri, 8 Apr 2016 16:01:39 -0600
Subject: [PATCH 1/5] Update documentation. Fix spelling and formatting.

---
 docs/advanced/commands.md         | 14 +++-----------
 docs/advanced/environments.md     | 14 +++++++-------
 docs/getting_started/contracts.md | 12 ++++++------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/docs/advanced/commands.md b/docs/advanced/commands.md
index c101f8e7877..f869a27062a 100644
--- a/docs/advanced/commands.md
+++ b/docs/advanced/commands.md
@@ -6,7 +6,7 @@ $ truffle [command] [options]
 
 # Available Commands
 
-##### build           
+##### build
 
 Build a development version of the app; creates the `./environments/<name>/build` directory.
 
@@ -28,7 +28,7 @@ Run a console with your contract objects instantiated and ready to use (REPL).
 $ truffle console
 ```
 
-Once the console starts you can then use your contracts via the command line like you would in your code.
+Once the console starts, you can then use your contracts via the command line like you would in your code.
 
 Optional parameters:
 
@@ -79,7 +79,7 @@ Optional parameters:
 
 Deploying contracts will save [Pudding](https://github.com/ConsenSys/ether-pudding) class files within your environment's `contracts` directory that correspond to each of your contracts. These class files can be used in Truffle's build process or your own build process to interact with the Ethereum network.
 
-##### dist (deprecated)      
+##### dist (deprecated)
 
 Build a distributable version of the app; creates the `./environments/<name>/dist` directory.
 
@@ -145,14 +145,6 @@ List all available commands and exit. Synonymous with `--help`.
 $ truffle list
 ```
 
-##### resolve
-
-Resolve all dependencies within solidity files and print the result.
-
-```none
-$ truffle resolve ./path/to/contract/file.sol
-```
-
 ##### serve
 
 Serve the built app from `http://localhost:8080`, rebuilding and redeploying changes as needed. Like `truffle watch`, but with the web server component added.
diff --git a/docs/advanced/environments.md b/docs/advanced/environments.md
index b0b5d944373..b27b9406f70 100644
--- a/docs/advanced/environments.md
+++ b/docs/advanced/environments.md
@@ -23,7 +23,7 @@ In this case, Truffle will deploy new versions of your deployable contracts to t
 
 # Environment Configuration
 
-You can override the default project configuration within each of your environments by editing the environment's `config.json` file. This is a JSON file instead of a Javascript file, contrary to `truffle.js`. Future versions of Truffle will convert these files to Javascript files so they can act more like your global project configuration. For now, however, you must specify these overrides via JSON. Consider this example:
+You can override the default project configuration within each of your environments by editing the environment's `config.js` file. This is a Javascript file that overrides the global project configuration specified in `truffle.js`. Consider this example:
 
 **truffle.js**
 ```javascript
@@ -35,12 +35,12 @@ module.exports = {
 }
 ```
 
-**./environments/production/config.json**
+**./environments/production/config.js**
 ```javascript
-{
-  "rpc": {
-    "host": "192.168.1.144" // domain of ethereum client pointing to live network
-    "port": 8673            // custom port
+module.exports = {
+  rpc: {
+    host: "192.168.1.144", // domain of ethereum client pointing to live network
+    port: 8673             // custom port
   }
 }
 ```
@@ -49,7 +49,7 @@ In this example, when running `truffle deploy` Truffle will deploy to an Ethereu
 
 # Build Artifacts
 
-Except for the `config.json` file located in each environment, every other file within your environment's directory is a build artifact. These artifacts are organized in two ways:
+Except for the `config.js` file located in each environment, every other file within your environment's directory is a build artifact. These artifacts are organized in two ways:
 
 * `build`: Directory of built frontend. When using the [default builder](/getting_started/build), `truffle build` will automatically place build artifacts here.
 * `contracts`: Directory containing compiled contract output. These files have the extension ".sol.js", and are created by [Ether Pudding](https://github.com/ConsenSys/ether-pudding) to be easily integrated into any build process.
diff --git a/docs/getting_started/contracts.md b/docs/getting_started/contracts.md
index 22e656173ec..9678cae458e 100644
--- a/docs/getting_started/contracts.md
+++ b/docs/getting_started/contracts.md
@@ -17,7 +17,7 @@ Transactions fundamentally change the state of the network. A transaction can be
 
 ### Calls
 
-Calls, on the other hand, are very different. Calls can be used to execute code on the network, though no data will be permanently changed. Calls are free to run, and they're defining characteristic is that they read data. When you execute a contract function via a call you will receive the return value immediately. In summary, calls:
+Calls, on the other hand, are very different. Calls can be used to execute code on the network, though no data will be permanently changed. Calls are free to run, and their defining characteristic is that they read data. When you execute a contract function via a call you will receive the return value immediately. In summary, calls:
 
 * Are free (do not cost gas)
 * Do not change the state of the network
@@ -47,8 +47,8 @@ contract MetaCoin {
   	return true;
   }
 
-  function getBalanceInEth(address addr) returns(uint){
-  	return ConvertLib.convert(getBalance(addr),2);
+  function getBalanceInEth(address addr) returns(uint) {
+  	return ConvertLib.convert(getBalance(addr), 2);
   }
 
   function getBalance(address addr) returns(uint) {
@@ -98,7 +98,7 @@ meta.sendCoin(account_two, 10, {from: account_one}).then(function(tx_id) {
   // this callback.
   alert("Transaction successful!")
 }).catch(function(e) {
-  // There was an error! Handle it.  
+  // There was an error! Handle it.
 })
 ```
 
@@ -123,7 +123,7 @@ meta.getBalance.call(account_one, {from: account_one}).then(function(balance) {
   // Let's print the return value.
   console.log(balance.toNumber());
 }).catch(function(e) {
-  // There was an error! Handle it.  
+  // There was an error! Handle it.
 })
 ```
 
@@ -165,7 +165,7 @@ MetaCoin.new().then(function(instance) {
   // If this callback is called, the deployment was successful.
   console.log(instance.address);
 }).catch(function(e) {
-  // There was an error! Handle it.  
+  // There was an error! Handle it.
 });
 ```
 

From abfd440f0b16f8d4066e0b09755cbd463178774d Mon Sep 17 00:00:00 2001
From: Alex Rea <git@area.io>
Date: Fri, 6 May 2016 14:12:25 +0100
Subject: [PATCH 2/5] Bump ether-pudding version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c0b8627bb6..988f29cf809 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "colors": "^1.1.2",
     "cpr": "^0.4.3",
     "deasync": "^0.1.3",
-    "ether-pudding": "2.0.6",
+    "ether-pudding": "^2.0.6",
     "finalhandler": "^0.4.0",
     "graphlib": "^2.0.0",
     "jsmin": "^1.0.1",

From 3e2f061fab5aa479c3a7c795b5064b24021986d4 Mon Sep 17 00:00:00 2001
From: Tim Coulter <tim@Tims-MacBook-Pro.local>
Date: Fri, 6 May 2016 10:31:39 -0700
Subject: [PATCH 3/5] v1.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 988f29cf809..37f24b5db0e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "truffle",
   "namespace": "consensys",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Truffle - Simple development framework for Ethereum",
   "dependencies": {
     "async": "^1.4.2",

From e71ff5ab7d32955fe7b11be6316f35adef0ab8c8 Mon Sep 17 00:00:00 2001
From: Raine Revere <raineorshine@gmail.com>
Date: Fri, 20 May 2016 11:12:19 -0600
Subject: [PATCH 4/5] Update testing.md

You can return the promise directly and not have to deal with the callback. Mocha will wait for the promise to resolve or reject.
---
 docs/getting_started/testing.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started/testing.md b/docs/getting_started/testing.md
index fb1c7df498a..af6bef7f02a 100644
--- a/docs/getting_started/testing.md
+++ b/docs/getting_started/testing.md
@@ -21,14 +21,14 @@ Here's an example test provided for you by `truffle init`. This will tell Truffl
 
 ```javascript
 contract('MetaCoin', function(accounts) {
-  it("should put 10000 MetaCoin in the first account", function(done) {
+  it("should put 10000 MetaCoin in the first account", function() {
     // Get a reference to the deployed MetaCoin contract, as a JS object.
     var meta = MetaCoin.deployed();
 
     // Get the MetaCoin balance of the first account, and assert that it's 10000.
-    meta.getBalance.call(accounts[0]).then(function(balance) {
+    return meta.getBalance.call(accounts[0]).then(function(balance) {
       assert.equal(balance.valueOf(), 10000, "10000 wasn't in the first account");
-    }).then(done).catch(done);
+    });
   });
 });
 ```

From 84fc0d0e6f0297d23b145319f4b140b7ed3fe5de Mon Sep 17 00:00:00 2001
From: Haoyu Yang <FrankMN@users.noreply.github.com>
Date: Sat, 21 May 2016 23:40:30 +0800
Subject: [PATCH 5/5] Update contracts.js

when deployed my project. I got the error "Could not find contract 'MetaCoin' for linking. Check truffle.json." , then I change config file truffle.js updating the file name to my new file which works. Once I was trying to locate the file "truffle.json" while not found. I think if the error could indicate the exact config file name it would be better.
---
 lib/contracts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/contracts.js b/lib/contracts.js
index 11e4af729e7..f2af08577df 100644
--- a/lib/contracts.js
+++ b/lib/contracts.js
@@ -413,7 +413,7 @@ var Contracts = {
           var contract_class = config.contracts.classes[contract_name];
 
           if (contract_class == null) {
-            c(new DeployError("Could not find contract '" + contract_name + "' for deployment. Check truffle.json."));
+            c(new DeployError("Could not find contract '" + contract_name + "' for deployment. Check truffle.js."));
             return;
           }