doc/rados/configuration: fix some 'mon addr' references

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/rados/configuration/common.rst b/doc/rados/configuration/common.rst
index 4305551fde3096401b964aa3fa93772da77a6a48..1cf9bf8d5e512d35c0508c54a229b2fea9e7981c 100644 (file)
--- a/doc/rados/configuration/common.rst
+++ b/doc/rados/configuration/common.rst
@@ -54,13 +54,7 @@ Monitors in the quorum.
 .. note:: You may deploy Ceph with a single monitor, but if the instance fails,
               the lack of other monitors may interrupt data service availability.
 
-Ceph Monitors typically listen on port ``6789``. For example:
-
-.. code-block:: ini
-
-       [mon.a]
-       host = hostName
-       mon addr = 150.140.130.120:6789
+Ceph Monitors normally listen on port ``3300`` for the new v2 protocol, and ``6789`` for the old v1 protocol.
 
 By default, Ceph expects that you will store a monitor's data under the
 following path::

diff --git a/doc/rados/configuration/mon-config-ref.rst b/doc/rados/configuration/mon-config-ref.rst
index 12455df52c58502daeb395b89278eee1173cbea2..039d8444c0c75aa069a7c2bfff6181938ba038f7 100644 (file)
--- a/doc/rados/configuration/mon-config-ref.rst
+++ b/doc/rados/configuration/mon-config-ref.rst
@@ -212,10 +212,8 @@ these under ``[mon]`` or under the entry for a specific monitor.
 
 .. code-block:: ini
 
-       [mon]
-               mon host = hostname1,hostname2,hostname3
-               mon addr = 10.0.0.10:6789,10.0.0.11:6789,10.0.0.12:6789
-
+       [global]
+               mon host = 10.0.0.2,10.0.0.3,10.0.0.4
 
 .. code-block:: ini