update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / doc / rados / operations / cache-tiering.rst

diff --git a/ceph/doc/rados/operations/cache-tiering.rst b/ceph/doc/rados/operations/cache-tiering.rst
index 46f775571aa0f091cf013947b4584cd680252f99..0e6ff96b378b0f0108319d3715707852ef9b4c33 100644 (file)
--- a/ceph/doc/rados/operations/cache-tiering.rst
+++ b/ceph/doc/rados/operations/cache-tiering.rst
@@ -88,7 +88,7 @@ extreme caution before using this feature.
 
 * *librados object enumeration*: The librados-level object enumeration
   API is not meant to be coherent in the presence of the case.  If
-  your applicatoin is using librados directly and relies on object
+  your application is using librados directly and relies on object
   enumeration, cache tiering will probably not work as expected.
   (This is not a problem for RGW, RBD, or CephFS.)
 
@@ -235,8 +235,8 @@ For example::
 
        ceph osd pool set hot-storage hit_set_type bloom
 
-The ``hit_set_count`` and ``hit_set_period`` define how much time each HitSet
-should cover, and how many such HitSets to store. ::
+The ``hit_set_count`` and ``hit_set_period`` define how many such HitSets to
+store, and how much time each HitSet should cover. ::
 
        ceph osd pool set {cachepool} hit_set_count 12
        ceph osd pool set {cachepool} hit_set_period 14400
@@ -415,14 +415,14 @@ that you do not lose any recent changes to objects in the cache before you
 disable and remove it.
 
 
-#. Change the cache mode to ``forward`` so that new and modified objects will 
+#. Change the cache mode to ``proxy`` so that new and modified objects will 
    flush to the backing storage pool. ::
 
-       ceph osd tier cache-mode {cachepool} forward
+       ceph osd tier cache-mode {cachepool} proxy
 
    For example:: 
 
-       ceph osd tier cache-mode hot-storage forward
+       ceph osd tier cache-mode hot-storage proxy
 
 
 #. Ensure that the cache pool has been flushed. This may take a few minutes::
@@ -455,7 +455,7 @@ disable and remove it.
 
 .. _Create a Pool: ../pools#create-a-pool
 .. _Pools - Set Pool Values: ../pools#set-pool-values
-.. _Placing Different Pools on Different OSDs: ../crush-map/#placing-different-pools-on-different-osds
-.. _Bloom Filter: http://en.wikipedia.org/wiki/Bloom_filter
+.. _Placing Different Pools on Different OSDs: ../crush-map-edits/#placing-different-pools-on-different-osds
+.. _Bloom Filter: https://en.wikipedia.org/wiki/Bloom_filter
 .. _CRUSH Maps: ../crush-map
 .. _Absolute Sizing: #absolute-sizing