From 76a7c2c8078aaaa5f54fad06b5e96bdf37369113 Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Tue, 20 May 2025 05:05:13 +1000 Subject: [PATCH] doc: Revert "Merge pull request #63351 from anthonyeleven/document_HTTP_X_AMZ_DELETE_IF_UNMODIFIED_SINCE" This reverts commit 6a054b06a6e60a9ded51b8be5357232b4177edb1, reversing changes made to ff1d7c9e4efa195939b3d46a570f0d0242d54b97. Signed-off-by: Zac Dover --- doc/rados/configuration/common.rst | 10 ---------- doc/radosgw/nfs.rst | 11 ++++++----- doc/radosgw/s3/objectops.rst | 8 -------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/doc/rados/configuration/common.rst b/doc/rados/configuration/common.rst index 887c476fa87..319fce9ab47 100644 --- a/doc/rados/configuration/common.rst +++ b/doc/rados/configuration/common.rst @@ -188,16 +188,6 @@ 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 e0c1b22ddc7..373765e1005 100644 --- a/doc/radosgw/nfs.rst +++ b/doc/radosgw/nfs.rst @@ -4,10 +4,11 @@ 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 via NFSv4, -alongside the traditional HTTP access protocols (S3 and Swift). +Ceph Object Gateway namespaces can be exported over the file-based +NFSv4 protocols, alongside 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. @@ -18,11 +19,11 @@ is using ``ceph nfs ...`` commands. See :doc:`/mgr/nfs` for more details. librgw ====== -The ``librgw`` library provides a loadable interface to +The librgw.so shared library (Unix) provides a loadable interface to Ceph Object Gateway services, and instantiates a full Ceph Object Gateway instance on initialization. -In turn, ``librgw`` exports ``rgw_file``, a stateful API for file-oriented +In turn, librgw.so 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 6844eebf1a1..ddc5fb910c4 100644 --- a/doc/radosgw/s3/objectops.rst +++ b/doc/radosgw/s3/objectops.rst @@ -88,14 +88,6 @@ 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 | {bucket}/{obj} | Yes | -+--------------------------------------+-------------------------------------------------+------------------------+------------+ Get Object -- 2.39.5