From: Kefu Chai <kchai@redhat.com>
Date: Thu, 20 Jul 2017 05:05:44 +0000 (+0800)
Subject: doc: document "ceph features"
X-Git-Tag: v12.1.2~139^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a6a3413b268355caccd63cab771bfb07431c8a8;p=ceph.git

doc: document "ceph features"

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 78b82ba51d0e..a5f3de0faef9 100644
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -248,6 +248,15 @@ Usage::
 	ceph df {detail}
 
 
+features
+--------
+
+Show the releases and supported features of all connected daemons and clients, along with the numbers of them in each bucket grouped by the corresponding features/releases.
+
+Usage::
+
+    ceph features
+
 fs
 --
 
diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index cb25124000aa..3e32654e5681 100644
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -71,7 +71,7 @@ Major Changes from Kraken
     process IO.
   * There is a `simplified OSD replacement process`_ that is more robust.
   * You can query the supported features and (apparent) releases of
-    all connected daemons and clients with ``ceph features``. FIXME DOCS
+    all connected daemons and clients with ``ceph features``.
   * You can configure the oldest Ceph client version you wish to allow to
     connect to the cluster via ``ceph osd set-require-min-compat-client`` and
     Ceph will prevent you from enabling features that will break compatibility