TIL: it helps if you save before commit/push

Docs/Configuration.md

@@ -31,6 +31,14 @@ or:
 
     string configString = options.ToString();
 
+A common usage is to store the *basic* details in a string, and then apply specific details at runtime:
+
+    string configString = GetRedisConfiguration();
+    var options = ConfigurationOptions.Parse(configString);
+    options.ClientName = GetAppName(); // only known at runtime
+    options.AllowAdmin = true;
+    conn = ConnectionMultiplexer.Connect(options);
+
 Configuration Options
 ---
 
@@ -47,4 +55,66 @@ The `ConfigurationOptions` object has a wide range of properties, all of which a
 Automatic and Manual Configuration
 ---
 
-In many common scenarios, StackExchange.Redis will automatically configure a lot of settings, including the server type and version, connection timeouts, and master/slave relationships. Sometimes, though, the commands for this have been disabled.
\ No newline at end of file
+In many common scenarios, StackExchange.Redis will automatically configure a lot of settings, including the server type and version, connection timeouts, and master/slave relationships. Sometimes, though, the commands for this have been disabled on the redis server. In this case, it is useful to provide more information:
+
+    ConfigurationOptions config = new ConfigurationOptions
+    {
+        EndPoints =
+        {
+            { "redis0", 6379 },
+            { "redis1", 6380 }
+        },
+        CommandMap = CommandMap.Create(new HashSet<string>
+        { // EXCLUDE a few commands
+            "INFO", "CONFIG", "CLUSTER",
+            "PING", "ECHO", "CLIENT"
+        }, available: false),
+        KeepAlive = 180,
+        DefaultVersion = new Version(2, 8, 8),
+        Password = "changeme"
+    };
+
+Which is equivalent to the command string:
+
+    redis0:6379,redis1:6380,keepAlive=180,version=2.8.8,$CLIENT=,$CLUSTER=,$CONFIG=,$ECHO=,$INFO=,$PING=
+
+Renaming Commands
+---
+
+A slightly unusual feature of redis is that you can disable and/or rename individual commands. As per the previous example, this is done via the `CommandMap`, but instead of passing a `HashSet<string>` to `Create()` (to indicate the available or unavailable commands), you pass a `Dictionary<string,string>`. All commands not mentioned in the dictionary are assumed to be enabled and not renamed. A `null` or blank value records that the command is disabled. For example:
+
+    var commands = new Dictionary<string,string> {
+         { "info", null }, // disabled
+         { "select", "use" }, // renamed to SQL equivalent for some reason
+    };
+    var options = new ConfigurationOptions {
+        // ...
+        CommandMap = CommandMap.Create(commands),
+        // ...
+    }
+
+The above is equivalent to (in the connection string):
+
+    $INFO=,$SELECT=use
+
+Twemproxy
+---
+
+[Twemproxy](https://github.com/twitter/twemproxy) is a tool that allows multiple redis instances to be used as though it were a single server, with inbuilt sharding and fault tolerance (much like redis cluster, but implemented separately). The feature-set available to Twemproxy is reduced. To avoid having to configure this manually, the `Proxy` option can be used:
+
+    var options = new ConfigurationOptions
+    {
+        EndPoints = { "my-server" },
+        Proxy = Proxy.Twemproxy
+    };
+
+Tiebreakers and Configuration Change Announcements
+---
+
+Normally StackExchange.Redis will resolve master/slave nodes automatically. However, if you are not using a management tool such as redis-sentinel or redis cluster, there is a chance that occasionally you will get multiple master nodes (for example, while resetting a node for maintenance it may reappear on the network as a master). To help with this, StackExchange.Redis can use the notion of a *tie-breaker* - which is only used when multiple masters are detected (not including redis cluster, where multiple masters are *expected*). For compatibility with BookSleeve, this defaults to the key named `"__Booksleeve_TieBreak"` (always in database 0). This is used as a crude voting mechanism to help determine the *preferred* master, so that work is routed correctly.
+
+Likewise, when the configuration is changed (especially the master/slave configuration), it will be important for connected instances to make themselves aware of the new situation (via `INFO`, `CONFIG`, etc - where available). StackExchange.Redis does this by automatically subscribing to a pub/sub channel upon which such notifications may be sent. For similar reasons, this defaults to `"__Booksleeve_MasterChanged"`.
+
+Both options can be customized or disabled (set to `""`), via the `.ConfigurationChannel` and `.TieBreaker` configuration properties.
+
+These settings are also used by the `IServer.MakeMaster()` method, which can set the tie-breaker in the database and broadcast the configuration change message. The configuration message can also be used separately to master/slave changes simply to request all nodes to refresh their configurations, via the `ConnectionMultiplexer.PublishReconfigure` method.
\ No newline at end of file

README.md

@@ -27,6 +27,7 @@ Documentation
 ---
 
 - [Basic Usage](https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/Basics.md) - getting started and basic usage
+- [Configuration](https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/Configuration.md) - options available when connecting to redis
 - [Pipelines and Multiplexers](https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/PipelinesMultiplexers.md) - what is a multiplexer?
 - [Keys, Values and Channels](https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/KeysValues.md) - discusses the data-types used on the API
 - [Transactions](https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/Transactions.md) - how atomic transactions work in redis