Merge branch 'master' into hashfast

API-README

@@ -437,7 +437,7 @@ The list of requests - a (*) means it requires privileged access - and replies:
                                AVA+BTB opt=freq val=256 to 1024 - chip frequency
                                BTB opt=millivolts val=1000 to 1400 - corevoltage
 
- lockstats     none           There is no reply section just the STATUS section
+ lockstats (*) none           There is no reply section just the STATUS section
                               stating the results of the request
                               A warning reply means lock stats are not compiled
                               into cgminer
@@ -497,6 +497,13 @@ miner.php - an example web page to access the API
 Feature Changelog for external applications using the API:
 
 
+API V1.32 (cgminer v3.6.5)
+
+Modified API commands:
+ 'devs' 'gpu' 'pga' and 'asc' - add 'Device Elapsed'
+
+---------
+
 API V1.31 (cgminer v3.6.3)
 
 Added API command:
@@ -1056,8 +1063,8 @@ It will be superceded by myminer.php
 
 ---------
 
-The example.php above also shows how to define more that one rig to
-be shown my miner.php
+The example myminer.php above also shows how to define more that one rig
+to be shown my miner.php
 
 Each rig string is 2 or 3 values seperated by colons ':'
 They are simply an IP address or host name, followed by the
@@ -1630,7 +1637,7 @@ You can only see fields listed in 'group' and 'calc'
 
 A 'calc' is formatted as: 'Field' => 'function'
 The current list of operations available for 'calc' are:
-'sum', 'avg', 'min', 'max', 'lo', 'hi', 'coount', 'any'
+'sum', 'avg', 'min', 'max', 'lo', 'hi', 'count', 'any'
 The first 4 are as expected - the numerical sum, average, minimum or maximum
 'lo' is the first string of the list, sorted ignoring case
 'hi' is the last string of the list, sorted ignoring case
@@ -1648,7 +1655,7 @@ in this case is the average difficulty of each share submitted
 
 THERE IS A SECURITY RISK WITH HOW GEN WORKS
 It simply replaces all the variables with their values and then requests PHP
-the execute the formula - thus if a field value returned from a cgminer API
+to execute the formula - thus if a field value returned from a cgminer API
 request contained PHP code, it could be executed by your web server
 Of course cgminer doesn't do this, but if you do not control the cgminer that
 returns the data in the API calls, someone could modify cgminer to return a