doc/releases/nautilus: add msgr2 refs

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

diff --git a/doc/dev/cephx.rst b/doc/dev/cephx.rst
index 1703e3eb4cf76e70b0d2e0fcdef06aabe15e48cb..27e501f99294f097a1fc793e70fb409e871a4832 100644 (file)
--- a/doc/dev/cephx.rst
+++ b/doc/dev/cephx.rst
@@ -60,7 +60,7 @@ Context
 The authentication messages described here are specific to the cephx
 auth implementation.  The messages are transferred by the Messenger
 protocol or by MAuth messages, depending on the version of the
-messenger protocol.  See also :ref:`msgr2`.
+messenger protocol.  See also :ref:`msgr2-protocol`.
 
 An initial (messenger) handshake negotiates an authentication method
 to be used (cephx vs none or krb or whatever) and an assertion of what

diff --git a/doc/dev/msgr2.rst b/doc/dev/msgr2.rst
index 6b4cc5f1283f81cf8c6c3a5a1a80e896fc615d66..7257a7c7fc31b4a3d75d85c5a95c696699875ef0 100644 (file)
--- a/doc/dev/msgr2.rst
+++ b/doc/dev/msgr2.rst
@@ -1,4 +1,4 @@
-.. _msgr2:
+.. _msgr2-protocol:
 
 msgr2 protocol
 ==============

diff --git a/doc/rados/configuration/msgr2.rst b/doc/rados/configuration/msgr2.rst
index 21ef58892412be4b0a9144d5fbddd965fc09d689..cea412e73c6bb9e1ef9a586ad6a784be1c0c3f77 100644 (file)
--- a/doc/rados/configuration/msgr2.rst
+++ b/doc/rados/configuration/msgr2.rst
@@ -1,3 +1,5 @@
+.. _msgr2:
+
 Messenger v2
 ============
 
@@ -216,4 +218,7 @@ the monitors' configuration database) may be helpful.  For example,::
           mon_host = [v2:10.0.0.1:3300/0,v1:10.0.0.1:6789/0]
   # mv /etc/ceph/ceph.conf.new /etc/ceph/ceph.conf
 
+Protocol
+--------
 
+For a detailed description of the v2 wire protocol, see :ref:`msgr2-protocol`.

diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst
index 83c7a4b60a06dda506821f3c61ee89796056bed8..319a929bf4a9c3c2fbc6deffedb6025c79f98073 100644 (file)
--- a/doc/releases/nautilus.rst
+++ b/doc/releases/nautilus.rst
@@ -47,7 +47,7 @@ Major Changes from Mimic
   * The number of placement groups (PGs) per pool can now be decreased
     at any time, and the cluster can automatically tune the PG count
     based on cluster utilization or administrator hints.
-  * The new *v2* wire protocol brings support for encryption on the wire.
+  * The new :ref:`v2 wire protocol <msgr2>` brings support for encryption on the wire.
   * Physical storage devices consumed by OSD and Monitor daemons are
     now tracked by the cluster along with health metrics (i.e.,
     SMART), and the cluster can apply a pre-trained prediction model
@@ -266,7 +266,8 @@ Instructions
 
 #. Verify the cluster is healthy with ``ceph health``.
 
-#. To enable the new v2 network protocol, issue the following command::
+#. To enable the new :ref:`v2 network protocol <msgr2>`, issue the
+   following command::
 
      ceph mon enable-msgr2