thodg/cgminer

diff --git a/README b/README
index ba58004..b364e0d 100644
--- a/README
+++ b/README
@@ -172,7 +172,7 @@ Options for both config file and command line:
 --userpass|-O <arg> Username:Password pair for bitcoin JSON-RPC server
 Options for command line only:
 --config|-c <arg>   Load a JSON-format configuration file
-See example-cfg.json for an example configuration.
+See example.conf for an example configuration.
 --help|-h           Print this message
 --ndevs|-n          Enumerate number of detected GPUs and exit
 --version|-V        Display version and exit
@@ -181,6 +181,10 @@ See example-cfg.json for an example configuration.
 
 EXECUTIVE SUMMARY ON USAGE:
 
+After saving configuration from the menu, you do not need to give cgminer any
+arguments and it will load your configuration.
+
+
 Single pool, regular desktop:
 
 cgminer -o http://pool:port -u username -p password
@@ -230,10 +234,12 @@ Current pool management strategy: Failover
 S gives you:
 
 [L]ongpoll: On
-[Q]ueue: 0
+[Q]ueue: 1
 [S]cantime: 60
+[E]xpiry: 120
 [R]etries: -1
 [P]ause: 5
+[W]rite config file
 
 
 D gives you:
@@ -484,9 +490,10 @@ make it invalidate the work from each other.
 Q: Can I change the intensity settings individually for each GPU?
 A: Yes, pass a list separated by commas such as -I d,4,9,9
 
-Q: Can I put multiple pools in the json config file?
-A: Not currently, but you can use multiple config files and specify each with
-successive -c. e.g.: cgminer -c cfg1.json -c cfg2.json
+Q: Can I put multiple pools in the config file?
+A: Yes, check the example.conf file. Alternatively, set up everything either on
+the command line or via the menu after startup and choose settings->write
+config file and the file will be loaded one each startup.
 
 Q: The build fails with gcc is unable to build a binary.
 A: Remove the "-march=native" component of your CFLAGS as your version of gcc
diff --git a/example-cfg.json b/example-cfg.json
deleted file mode 100644
index 8bda9db..0000000
--- a/example-cfg.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"_comment1" : "Any long-format command line argument ",
-	"_comment2" : "may be used in this JSON configuration file",
-
-	"url" : "http://127.0.0.1:8332",
-	"user" : "rpcuser",
-	"pass" : "rpcpass",
-
-	"algo" : "sse2_64",
-	"threads" : "4",
-
-	"quiet" : true
-}
diff --git a/example.conf b/example.conf
new file mode 100644
index 0000000..645e72c
--- /dev/null
+++ b/example.conf
@@ -0,0 +1,46 @@
+{
+"pools" : [
+	{
+		"url" : "http://url1:8332",
+		"user" : "user1",
+		"pass" : "pass1"
+	},
+	{
+		"url" : "http://url2:8344",
+		"user" : "user2",
+		"pass" : "pass2"
+	},
+	{
+		"url" : "http://url3:8332",
+		"user" : "user3",
+		"pass" : "pass3"
+	}
+],
+
+"intensity" : "d,9,9,9",
+"gpu-engine" : "0-985,0-950,0-960,0-1000",
+"gpu-fan" : "0-85,0-85,0-85,0-85",
+"gpu-memclock" : "860,825,835,875",
+"gpu-powertune" : "20,20,20,20",
+"gpu-vddc" : "0.000,0.000,0.000,0.000",
+"temp-cutoff" : "95,95,95,95",
+"temp-overheat" : "85,85,85,85",
+"temp-target" : "75,75,75,75",
+
+"algo" : "sse2_64",
+"auto-fan" : true,
+"auto-gpu" : true,
+"expiry" : "120",
+"failover-only" : true,
+"gpu-threads" : "2",
+"log" : "5",
+"queue" : "1",
+"retry-pause" : "5",
+"scan-time" : "60",
+"temp-hysteresis" : "3",
+"worksize" : "0",
+
+"donation" : "0.00",
+"shares" : "0",
+"kernel-path" : "/usr/local/bin"
+}
\ No newline at end of file
diff --git a/main.c b/main.c
index a372db4..3d6a019 100644
--- a/main.c
+++ b/main.c
@@ -1774,7 +1774,7 @@ static struct opt_table opt_cmdline_table[] = {
 	OPT_WITH_ARG("--config|-c",
 		     load_config, NULL, NULL,
 		     "Load a JSON-format configuration file\n"
-		     "See example-cfg.json for an example configuration."),
+		     "See example.conf for an example configuration."),
 	OPT_WITHOUT_ARG("--help|-h",
 			opt_verusage_and_exit, NULL,
 			"Print this message"),