doc/radosgw/s3: Document delete-if-unmodified-since

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 3381041d190fd48cf9f6d53f679f1737028cccf4)
(cherry picked from commit 7e2bd1595d64c12e1959cc29acfaf906a9027fc6)

diff --git a/doc/rados/configuration/common.rst b/doc/rados/configuration/common.rst
index c397f4e52acce56e80b0065c7de24943ead40c82..b091de77305fe3a824d2091e3ca2f9c1e0cade1d 100644 (file)
--- a/doc/rados/configuration/common.rst
+++ b/doc/rados/configuration/common.rst
@@ -167,6 +167,16 @@ Logging`_.
 Example ceph.conf
 =================
 
+Note that since the Mimic release the Monitors maintain a database of option
+settings: the *central config*.  Node-local ``ceph.conf`` files are still
+supported, but in most cases need only contain the first three lines shown
+below.  Maintaining full ``ceph.conf`` files across cluster nodes can be
+tedious and prone to omission and error, especially when daemons are containerized.
+The below file is provided as a reference example. Clusters running recent
+releases are best managed primary by central config, with a minimal ``ceph.conf``
+file that defines only how to reach the Monitors and thus rarely requires
+modification.
+
 .. literalinclude:: demo-ceph.conf
    :language: ini
 

diff --git a/doc/radosgw/nfs.rst b/doc/radosgw/nfs.rst
index 373765e1005d83260eb9054732fbc313c3322f4c..e0c1b22ddc71ab45adf14993b740141e493dad15 100644 (file)
--- a/doc/radosgw/nfs.rst
+++ b/doc/radosgw/nfs.rst
@@ -4,11 +4,10 @@ NFS
 
 .. versionadded:: Jewel
 
-.. note:: Only the NFSv4 protocol is supported when using a cephadm or rook based deployment.
+.. note:: Only the NFSv4 protocol is supported when using a cephadm or Rook based deployment.
 
-Ceph Object Gateway namespaces can be exported over the file-based
-NFSv4 protocols, alongside traditional HTTP access
-protocols (S3 and Swift).
+Ceph Object Gateway namespaces can be exported via NFSv4,
+alongside the traditional HTTP access protocols (S3 and Swift).
 
 In particular, the Ceph Object Gateway can now be configured to
 provide file-based access when embedded in the NFS-Ganesha NFS server.
@@ -19,11 +18,11 @@ is using ``ceph nfs ...`` commands. See :doc:`/mgr/nfs` for more details.
 librgw
 ======
 
-The librgw.so shared library (Unix) provides a loadable interface to
+The ``librgw`` library provides a loadable interface to
 Ceph Object Gateway services, and instantiates a full Ceph Object Gateway
 instance on initialization.
 
-In turn, librgw.so exports rgw_file, a stateful API for file-oriented
+In turn, ``librgw`` exports ``rgw_file``, a stateful API for file-oriented
 access to RGW buckets and objects.  The API is general, but its design
 is strongly influenced by the File System Abstraction Layer (FSAL) API
 of NFS-Ganesha, for which it has been primarily designed.

diff --git a/doc/radosgw/s3/objectops.rst b/doc/radosgw/s3/objectops.rst
index ddc5fb910c4222f8b8022af9ed5a140ea8f22fc9..5af82eb5a42edef5e823be6e1b2698afe34a8dd6 100644 (file)
--- a/doc/radosgw/s3/objectops.rst
+++ b/doc/radosgw/s3/objectops.rst
@@ -88,6 +88,14 @@ Syntax
 
     DELETE /{bucket}/{object} HTTP/1.1
 
+Request Headers
+~~~~~~~~~~~~~~~
+
++--------------------------------------+-------------------------------------------------+------------------------+------------+
+| Name                                 | Description                                     | Valid Values           | Required   |
++======================================+=================================================+========================+============+
+| **x-amz-delete-if-unmodified-since** | Deletes only if unmodified since the timestamp  | a datetime string      | No         |
++--------------------------------------+-------------------------------------------------+------------------------+------------+
 
 
 Get Object