diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-19 12:32:30 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-19 12:32:30 -0700 |
| commit | 233fed8c9778b19cff149d641d83ab0ecebd245f (patch) | |
| tree | 325ab5b36e0650604eb3ae129d008f070434585d | |
| parent | b007b3304c2020aa9f122ec6fef83a909053db3a (diff) | |
| parent | 090e4c4a31a639271bc3b48c11ba5de421923931 (diff) | |
| download | ceph-233fed8c9778b19cff149d641d83ab0ecebd245f.tar.gz | |
Merge pull request #513 from dalgaaf/fix/wip-da-documentation
Fix documentation issues
| -rw-r--r-- | doc/rados/configuration/auth-config-ref.rst | 8 | ||||
| -rw-r--r-- | doc/rados/configuration/filestore-config-ref.rst | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/rados/configuration/auth-config-ref.rst b/doc/rados/configuration/auth-config-ref.rst index f38ad130ca3..c17d477b8fe 100644 --- a/doc/rados/configuration/auth-config-ref.rst +++ b/doc/rados/configuration/auth-config-ref.rst @@ -170,7 +170,7 @@ you can enable/disable signatures for service messages between the client and Ceph, and you can enable/disable signatures for messages between Ceph daemons. -``ceph require signatures`` +``cephx require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between the Ceph Client and the Ceph Storage Cluster, and @@ -181,7 +181,7 @@ Ceph, and you can enable/disable signatures for messages between Ceph daemons. :Default: ``false`` -``cepxh cluster require signatures`` +``cephx cluster require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between Ceph daemons comprising the Ceph Storage Cluster. @@ -191,7 +191,7 @@ Ceph, and you can enable/disable signatures for messages between Ceph daemons. :Default: ``false`` -``cepxh service require signatures`` +``cephx service require signatures`` :Description: If set to ``true``, Ceph requires signatures on all message traffic between Ceph Clients and the Ceph Storage Cluster. @@ -226,4 +226,4 @@ Time to Live .. _Ceph Authentication & Authorization: ../../operations/auth-intro .. _Cephx Guide: ../../operations/authentication .. _Ceph Authentication: ../../operations/auth-intro#ceph-authentication-cephx -.. _Create an Admin Host: ../../deployment/ceph-deploy-admin#create-an-admin-host
\ No newline at end of file +.. _Create an Admin Host: ../../deployment/ceph-deploy-admin#create-an-admin-host diff --git a/doc/rados/configuration/filestore-config-ref.rst b/doc/rados/configuration/filestore-config-ref.rst index e207dfe7880..2e4a5b1a6fb 100644 --- a/doc/rados/configuration/filestore-config-ref.rst +++ b/doc/rados/configuration/filestore-config-ref.rst @@ -100,6 +100,7 @@ performance in some cases. :Required: No :Default: ``false`` +.. deprecated:: v.65 ``filestore flusher max fds`` @@ -108,6 +109,8 @@ performance in some cases. :Required: No :Default: ``512`` +.. deprecated:: v.65 + ``filestore sync flush`` :Description: Enables the synchronization flusher. @@ -115,6 +118,7 @@ performance in some cases. :Required: No :Default: ``false`` +.. deprecated:: v.65 ``filestore fsync flushes journal data`` |