diff --git a/source/en/mongoid/docs/installation.haml b/source/en/mongoid/docs/installation.haml
index 3f0c7521..94efdd5b 100644
--- a/source/en/mongoid/docs/installation.haml
+++ b/source/en/mongoid/docs/installation.haml
@@ -154,6 +154,21 @@
# provide the authentication details.
username: user
password: password
+ options:
+ # All of the tunable session/cluster/node options with defaults as of Moped 2.0.2.
+ # These are for advanced users and do not need to be configured for regular usage.
+ # Some are determined by other settings unless overridden here, ie. max_retries is
+ # based on the number of seeds unless configured to some fixed number
+ pool_size: 5
+ pool_timeout: 0.5
+ retry_interval: 1
+ max_retries: 2
+ timeout: 5
+ refresh_interval: 300
+ down_interval: 30
+ ssl: false
+ auto_discover: true
+
# This defines a secondary session at a replica set.
replica_set:
# This configuration is a 3 node replica set.
@@ -168,6 +183,7 @@
read: :secondary
write:
w: :majority
+
# This defines a tertiary session at a Mongos fronted shard.
shard:
# This configuration is a Mongos shard server.
@@ -197,7 +213,7 @@
%p
Mongoid currently supports the following configuration options, either
- provided in the mongoid.yml or programatically (defaults in
+ provided in the mongoid.yml or programmatically (defaults in
parenthesis).
@@ -235,6 +251,47 @@
use_utc(false): Instructs Mongoid to convert all times to
UTC times in all cases.
+
+
+ %h3 Moped/Session Configuration options
+
+ %p
+ Mongoid currently supports the following Moped/session configuration options,
+ either provided in the mongoid.yml or programmatically (defaults in parenthesis).
+
+ %ul.config
+ %li
+ pool_size(5): Determines the connection pool size on a per-node
+ basis. If running Mongoid in a multi-threaded environment, this should equal
+ or exceed the number of threads.
+ %li
+ pool_timeout(0.5): The amount of time in seconds to wait
+ for a connection to become available in the pool when all available connections
+ are checked out. This should most likely remain at the default unless you are
+ severely limited for some reason to a small pool_size and would prefer to
+ have processes wait for a connection to become available. This configuration
+ does not affect any other variables such as connection timeouts etc.
+ %li
+ retry_interval(1): The amount of time in seconds to wait between
+ retries for any failed Mongo operation.
+ %li
+ max_retries(# of seeds): The number of times to retry a failed
+ operation, while waiting retry_interval between retries.
+ %li
+ timeout(5): The amount of time in seconds to wait before timing out a
+ connection or node operation.
+ %li
+ refresh_interval(300): The amount of time in seconds to scan through
+ seeds and nodes, to check for new peers, bad connections etc.
+ %li
+ down_interval(30): The amount of time in seconds that a node would be
+ flagged as down.
+ %li
+ ssl(nil/false): Determines if connections use SSL or not.
+ %li
+ auto_discover(true): Determines if Mongoid/Moped will attempt to
+ discover new nodes from the initial seeds/nodes to add to read/write operations.
+
%p
If you would like to see samples, there is one in the