From 1a42b19f9d9661213ff51560146bf6be1e4d2d26 Mon Sep 17 00:00:00 2001 From: Anthony D'Atri Date: Sun, 18 Aug 2024 11:23:39 -0400 Subject: [PATCH] doc: Harmonize 'mountpoint' Signed-off-by: Anthony D'Atri (cherry picked from commit fda2db5ac7baedc9460cd1d313413c9445518163) --- doc/cephfs/ceph-dokan.rst | 4 ++-- doc/man/8/mount.ceph.rst | 2 +- doc/man/8/mount.fuse.ceph.rst | 2 +- doc/rados/configuration/common.rst | 2 +- doc/radosgw/qat-accel.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/cephfs/ceph-dokan.rst b/doc/cephfs/ceph-dokan.rst index b9fb6c59287b5..4146761869cca 100644 --- a/doc/cephfs/ceph-dokan.rst +++ b/doc/cephfs/ceph-dokan.rst @@ -24,7 +24,7 @@ This will mount the default ceph filesystem using the drive letter ``x``. If ``ceph.conf`` is placed at the default location, which is ``%ProgramData%\ceph\ceph.conf``, then this argument becomes optional. -The ``-l`` argument also allows using an empty folder as a mountpoint +The ``-l`` argument also allows using an empty folder as a mount point instead of a drive letter. The uid and gid used for mounting the filesystem default to 0 and may be @@ -75,7 +75,7 @@ like so:: ceph-dokan.exe unmap -l x -Note that when unmapping Ceph filesystems, the exact same mountpoint argument +Note that when unmapping Ceph filesystems, the exact same mount point argument must be used as when the mapping was created. Limitations diff --git a/doc/man/8/mount.ceph.rst b/doc/man/8/mount.ceph.rst index e45030cd096c4..7ecdeb5e85254 100644 --- a/doc/man/8/mount.ceph.rst +++ b/doc/man/8/mount.ceph.rst @@ -56,7 +56,7 @@ A sub-directory of the file system can be mounted by specifying the (absolute) path to the sub-directory right after "=" in the device part of the mount command. Mount helper application conventions dictate that the first two options are -device to be mounted and the mountpoint for that device. Options must be +device to be mounted and the mount point for that device. Options must be passed only after these fixed arguments. diff --git a/doc/man/8/mount.fuse.ceph.rst b/doc/man/8/mount.fuse.ceph.rst index 6dacd47194749..3d9325088f2c6 100644 --- a/doc/man/8/mount.fuse.ceph.rst +++ b/doc/man/8/mount.fuse.ceph.rst @@ -11,7 +11,7 @@ Synopsis | **mount.fuse.ceph** [-h] [-o OPTIONS [*OPTIONS* ...]] device [*device* ...] - mountpoint [*mountpoint* ...] + mountpoint [*mount point* ...] Description =========== diff --git a/doc/rados/configuration/common.rst b/doc/rados/configuration/common.rst index c397f4e52acce..69072164dd963 100644 --- a/doc/rados/configuration/common.rst +++ b/doc/rados/configuration/common.rst @@ -179,7 +179,7 @@ Naming Clusters (deprecated) Each Ceph cluster has an internal name. This internal name is used as part of configuration, and as part of "log file" names as well as part of directory -names and as part of mountpoint names. This name defaults to "ceph". Previous +names and as part of mount point names. This name defaults to "ceph". Previous releases of Ceph allowed one to specify a custom name instead, for example "ceph2". This option was intended to facilitate the running of multiple logical clusters on the same physical hardware, but in practice it was rarely diff --git a/doc/radosgw/qat-accel.rst b/doc/radosgw/qat-accel.rst index 6c44fcda3f7a3..a5ab188fe429e 100644 --- a/doc/radosgw/qat-accel.rst +++ b/doc/radosgw/qat-accel.rst @@ -40,7 +40,7 @@ The QATlib can be downloaded from `qatlib`_, which is used for the in-tree QAT driver. .. note:: - The out-of-tree QAT driver is gradually being migrated to an intree driver+QATlib. + The out-of-tree QAT driver is gradually being migrated to an in-tree driver+QATlib. 2. The implementation of QAT-based encryption is directly based on the QAT API, which is included the driver package. However, QAT support for compression -- 2.39.5