From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 27 Feb 2013 21:26:59 +0000 (-0800)
Subject: doc: Removed auth entries from general. Part of an auth-specific section now.
X-Git-Tag: v0.59~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f7b2e7481ae41dbfed6773f03cf1cb06c511c30;p=ceph.git

doc: Removed auth entries from general. Part of an auth-specific section now.

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

diff --git a/doc/rados/configuration/general-config-ref.rst b/doc/rados/configuration/general-config-ref.rst
index 4b541b240e4..5e9a183f042 100644
--- a/doc/rados/configuration/general-config-ref.rst
+++ b/doc/rados/configuration/general-config-ref.rst
@@ -2,61 +2,6 @@
  General Config Reference
 ==========================
 
-``auth supported``
-
-.. deprecated:: 0.51
-
-:Description: Indicates the type of authentication used. Currently ``cephx`` 
-              only. If not specified, it defaults to ``none``.
-
-:Type: String
-:Required: No
-:Default: ``none``
-
-    
-``auth cluster required``
-
-.. versionadded:: 0.51
-
-:Description: Enables authentication for the cluster. 
-              Valid setting is ``cephx``.
-
-:Type: String
-:Required: No
-:Default: ``none``
-
-    
-``auth service required``
-
-.. versionadded:: 0.51
-
-:Description: Enables authentication for the service. 
-              Valid setting is ``cephx``.
-
-:Type: String
-:Required: No
-:Default: ``none``
-
-
-
-``auth client required``
-
-.. versionadded:: 0.51
-
-:Description: Enables authentication for the client. 
-              Valid setting is ``cephx``.
-
-:Type: String
-:Required: No
-:Default: ``none``
-
-
-``keyring``
-
-:Description: The path to the cluster's keyring file. 
-:Type: String
-:Required: No
-:Default: ``/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin``
 
 
 ``fsid``