From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 81B5E61FAA for ; Tue, 8 Sep 2020 11:07:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 72B6D132BE for ; Tue, 8 Sep 2020 11:07:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B7917132B3 for ; Tue, 8 Sep 2020 11:07:12 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8393F44985 for ; Tue, 8 Sep 2020 11:07:12 +0200 (CEST) From: Dylan Whyte To: pbs-devel@lists.proxmox.com Date: Tue, 8 Sep 2020 11:07:07 +0200 Message-Id: <20200908090707.11643-1-d.whyte@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH docs] Change "data store" to "datastore" throughout docs X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2020 09:07:13 -0000 Before, there were mixed usages of "data store" and "datastore" throughout the docs. This improves consistency in the docs by using only "datastore" throughout. Signed-off-by: Dylan Whyte --- docs/administration-guide.rst | 14 +++++++------- docs/introduction.rst | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/administration-guide.rst b/docs/administration-guide.rst index e1a67602..ca7541d4 100644 --- a/docs/administration-guide.rst +++ b/docs/administration-guide.rst @@ -261,7 +261,7 @@ Creating a Datastore .. image:: images/screenshots/pbs-gui-datastore-create-general.png :width: 230 :align: right - :alt: Create a data store + :alt: Create a datastore You can create a new datastore from the web GUI, by navigating to **Datastore** in the menu tree and clicking **Create**. Here: @@ -528,15 +528,15 @@ You can monitor the roles of each user using the following command: │ john@pbs │ /datastore/disk1 │ 1 │ DatastoreAdmin │ └──────────┴──────────────────┴───────────┴────────────────┘ -A single user can be assigned multiple permission sets for different data stores. +A single user can be assigned multiple permission sets for different datastores. .. Note:: - Naming convention is important here. For data stores on the host, + Naming convention is important here. For datastores on the host, you must use the convention ``/datastore/{storename}``. For example, to set - permissions for a data store mounted at ``/mnt/backup/disk4/store2``, you would use + permissions for a datastore mounted at ``/mnt/backup/disk4/store2``, you would use ``/datastore/store2`` for the path. For remote stores, use the convention ``/remote/{remote}/{storename}``, where ``{remote}`` signifies the name of the - remote (see `Remote` below) and ``{storename}`` is the name of the data store on + remote (see `Remote` below) and ``{storename}`` is the name of the datastore on the remote. Network Management @@ -700,7 +700,7 @@ Garbage Collection You can monitor and run :ref:`garbage collection ` on the Proxmox Backup Server using the ``garbage-collection`` subcommand of ``proxmox-backup-manager``. You can use the ``start`` subcommand to manually start garbage -collection on an entire data store and the ``status`` subcommand to see +collection on an entire datastore and the ``status`` subcommand to see attributes relating to the :ref:`garbage collection `. @@ -1310,7 +1310,7 @@ Garbage Collection ~~~~~~~~~~~~~~~~~~ The ``prune`` command removes only the backup index files, not the data -from the data store. This task is left to the garbage collection +from the datastore. This task is left to the garbage collection command. It is recommended to carry out garbage collection on a regular basis. The garbage collection works in two phases. In the first phase, all diff --git a/docs/introduction.rst b/docs/introduction.rst index 0b0e3ae3..e2953134 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -22,7 +22,7 @@ Architecture ------------ Proxmox Backup Server uses a `client-server model`_. The server stores the -backup data and provides an API to create and manage data stores. With the +backup data and provides an API to create and manage datastores. With the API, it's also possible to manage disks and other server-side resources. The backup client uses this API to access the backed up data. With the command -- 2.20.1