Browse Source

Semi-Merge commit '1070ec6' into cg_merges_20130606b

Conflicts:
	README
Luke Dashjr 12 years ago
parent
commit
66ba63f2f6
1 changed files with 3 additions and 4 deletions
  1. 3 4
      README

+ 3 - 4
README

@@ -169,7 +169,7 @@ Options for both config file and command line:
 --compact           Use compact display without per device statistics
 --debug|-D          Enable debug output
 --debuglog          Enable debug logging
---device|-d <arg>   Select device to use, (Use repeat -d for multiple devices, default: all)
+--device|-d <arg>   Select device to use, one value, range and/or comma separated (e.g. 0-2,4) default: all
 --disable-rejecting Automatically disable pools that continually reject shares
 --expiry|-E <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (w/o longpoll active) (default: 120)
 --expiry-lp <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (with longpoll active) (default: 3600)
@@ -249,6 +249,7 @@ GPU only options:
 --vectors|-v <arg>  Override detected optimal vector (1, 2 or 4) - one value or comma separated list
 --worksize|-w <arg> Override detected optimal worksize - one value or comma separated list
 
+See README.GPU for more information regarding GPU mining.
 
 scrypt only options:
 
@@ -258,7 +259,6 @@ scrypt only options:
 
 See README.scrypt for more information regarding (non-bitcoin) scrypt mining.
 
-
 ASIC/FPGA mining boards (BitForce, Icarus, ModMiner, X6500, ZTEX) only options:
 
 --scan-serial|-S <arg> Serial port to probe for mining devices
@@ -294,8 +294,7 @@ programmed every power cycle, including first use. To use these devices, you
 must download the BFGMiner source archive (bfgminer-x.y.z.zip) and copy the
 "bitstreams" directory into your BFGMiner application directory.
 
-For other FPGA details see the README.FPGA
-
+See README.ASIC and README.FPGA for more information regarding these.
 
 CPU only options (not included in binaries):