Merge pull request #447 from robszumski/master

Prepare docs to be synced to website

Documentation/configuration.md

@@ -26,7 +26,7 @@ configuration files.
 * `-cert-file` - The cert file of the client.
 * `-key-file` - The key file of the client.
 * `-config` - The path of the etcd config file. Defaults to `/etc/etcd/etcd.conf`.
-* `-cors-origins` - A comma separated white list of origins for cross-origin resource sharing.
+* `-cors` - A comma separated white list of origins for cross-origin resource sharing.
 * `-cpuprofile` - The path to a file to output cpu profile data. Enables cpu profiling when present.
 * `-data-dir` - The directory to store log and snapshot. Defaults to the current working directory.
 * `-max-result-buffer` - The max size of result buffer. Defaults to `1024`.
@@ -52,7 +52,7 @@ addr = "127.0.0.1:4001"
 bind_addr = "127.0.0.1:4001"
 ca_file = ""
 cert_file = ""
-cors_origins = []
+cors = []
 cpu_profile_file = ""
 data_dir = "."
 key_file = ""

Documentation/modules.md

@@ -5,7 +5,7 @@ These modules provide things like dashboards, locks and leader election.
 
 ### Dashboard
 
-An HTML dashboard can be found at `http://127.0.0.1:4001/mod/dashboard/`
+An HTML dashboard can be found at `http://127.0.0.1:4001/mod/dashboard/`. Use the `-cors='*'` flag to allow your browser to request information from the current master as it changes.
 
 ### Lock