From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 6 Nov 2012 17:13:54 +0000 (-0800)
Subject: doc: fixed some inccorrect syntax.
X-Git-Tag: v0.55~193^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=138262f6831dd29f863da1534c8a718daf7a8ea3;p=ceph.git

doc: fixed some inccorrect syntax.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
---

diff --git a/doc/cluster-ops/authentication.rst b/doc/cluster-ops/authentication.rst
index 43e8c40be7f..bad7b8891e2 100644
--- a/doc/cluster-ops/authentication.rst
+++ b/doc/cluster-ops/authentication.rst
@@ -275,27 +275,29 @@ For example::
 
 Ceph supports the following usage for user name and secret:
 
-``--id``
-
-:Description: A user name consists of a type and an ID (e.g., ``TYPE.ID`` or
-              ``client.admin``, ``client.user1``). The ``id`` argument enables
-              you to specify the ID portion of the user name (e.g., ``admin``, 
-              ``user1``, ``foo``, etc.). You can specify the user with the 
-              ``--id`` and omit the type. For example, to specify user 
-              ``client.foo`` enter the following:: 
+``--id`` | ``--user``
+
+:Description: Ceph identifies users with a type and an ID (e.g., ``TYPE.ID`` or
+              ``client.admin``, ``client.user1``). The ``id``, ``name`` and 
+              ``-n`` options enable you to specify the ID portion of the user 
+              name (e.g., ``admin``, ``user1``, ``foo``, etc.). You can specify 
+              the user with the ``--id`` and omit the type. For example, 
+              to specify user ``client.foo`` enter the following:: 
               
                ceph --id foo --keyring /path/to/keyring health
+               ceph --user foo --keyring /path/to/keyring health
 
 
-``--user`` | ``--name``
+``--name``
 
-:Description: Newer versions of Ceph support ``--name``, ``-n`` and ``--user`` 
-              arguments in addition to ``--id``. However, you must specify the
-              user type (typically ``client``). For example:: 
+:Description: Ceph identifies users with a type and an ID (e.g., ``TYPE.ID`` or
+              ``client.admin``, ``client.user1``). The ``--name`` and ``-n`` 
+              options enables you to specify the fully qualified user name. 
+              You must specify the user type (typically ``client``) with the 
+              user ID. For example:: 
 
                ceph --name client.foo --keyring /path/to/keyring health
                ceph -n client.foo --keyring /path/to/keyring health
-               ceph --user client.foo --keyring /path/to/keyring health
               
 
 
diff --git a/doc/rbd/rbd-ko.rst b/doc/rbd/rbd-ko.rst
index ea2eb9bca6f..393c8559f7b 100644
--- a/doc/rbd/rbd-ko.rst
+++ b/doc/rbd/rbd-ko.rst
@@ -28,13 +28,13 @@ image name, the pool name, and the user name. ::
 
 For example:: 
 
-  sudo rbd map foo --pool rbd myimage --id client.admin
+  sudo rbd map foo --pool rbd myimage --id admin
  
 If you use `cephx`_ authentication, you must also specify a secret.  It may come
 from a keyring or a file containing the secret. ::
 
-  sudo rbd map foo --pool rbd myimage --id client.foo --keyring /path/to/keyring
-  sudo rbd map foo --pool rbd myimage --id client.foo --keyfile /path/to/file
+  sudo rbd map foo --pool rbd myimage --id admin --keyring /path/to/keyring
+  sudo rbd map foo --pool rbd myimage --id admin --keyfile /path/to/file
 
 
 Show Mapped Block Devices