Docs: fix some typos

While working on the previous PR, I found a couple of typos in the
docs. This fixes those.

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
(cherry picked from commit 8b1474ab75bb5563bbdecaf965f8fbb240bd93bf)

diff --git a/docs/source/day-2/upgrade.rst b/docs/source/day-2/upgrade.rst
index 47978321cd0d9d2bd3abc2243120842963fd8ebc..1ec658ccbcc6c01eb0b927164a7f7662b221370f 100644 (file)
--- a/docs/source/day-2/upgrade.rst
+++ b/docs/source/day-2/upgrade.rst
@@ -3,7 +3,7 @@ Upgrading the ceph cluster
 
 ceph-ansible provides a playbook in ``infrastructure-playbooks`` for upgrading a Ceph cluster: ``rolling_update.yml``.
 
-This playbook could be used for both minor upgrade (X.Y to X.Z) or major upgrade (X to Y).
+This playbook could be used for both minor upgrades (X.Y to X.Z) or major upgrades (X to Y).
 
 Before running a major upgrade you need to update the ceph-ansible version first.
 
@@ -14,4 +14,4 @@ example:
    $ ansible-playbook -vv -i hosts infrastructure-playbooks/rolling_update.yml
 
 .. note::
-   This playbook isn't intended to be run with the ``--limit`` ansible option.
\ No newline at end of file
+   This playbook isn't intended to be run with the ``--limit`` ansible option.

diff --git a/docs/source/dev/index.rst b/docs/source/dev/index.rst
index e445a16005c5f4ae724c1bfdcc093f9442f5149b..9cedaf76c2614bc64beded9bb74b8ea284107f22 100644 (file)
--- a/docs/source/dev/index.rst
+++ b/docs/source/dev/index.rst
@@ -83,8 +83,8 @@ If a change should be backported to a ``stable-*`` Git branch:
 - Create a new local branch for your pull request, based on the stable branch:
   ``git checkout --no-track -b my-backported-change origin/stable-3.0``
 - Cherry-pick your change: ``git cherry-pick -x (your-sha1)``
-- Create a new pull request against the ``stable-3.0`` branch.
-- Ensure that your pull requests's title has the prefix "backport:", so it's clear
+- Create a new pull request against the ``stable-4.0`` branch.
+- Ensure that your pull request's title has the prefix "backport:", so it's clear
   to reviewers what this is about.
 - Add a comment in your backport pull request linking to the original (master) pull request.
 

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 6e1b20f0d8d0d07d46531113a34534b1917c49e8..98c95e14f992e8926c1a74b6c08cb1ed79a29275 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -68,7 +68,7 @@ Releases
 ========
 
 The following branches should be used depending on your requirements. The ``stable-*``
-branches have been QE tested and sometimes recieve backport fixes throughout their lifecycle.
+branches have been QE tested and sometimes receive backport fixes throughout their lifecycle.
 The ``master`` branch should be considered experimental and used with caution.
 
 - ``stable-3.0`` Supports for Ceph versions ``jewel`` and ``luminous``. This branch supports Ansible version ``2.4``.
@@ -194,7 +194,7 @@ Configuration
 The configuration for your Ceph cluster will be set by the use of ansible variables that ``ceph-ansible`` provides. All of these options and their default
 values are defined in the ``group_vars/`` directory at the root of the ``ceph-ansible`` project. Ansible will use configuration in a ``group_vars/`` directory
 that is relative to your inventory file or your playbook. Inside of the ``group_vars/`` directory there are many sample Ansible configuration files that relate
-to each of the Ceph daemon groups by their filename. For example, the ``osds.yml.sample`` contains all the default configuation for the OSD daemons. The ``all.yml.sample``
+to each of the Ceph daemon groups by their filename. For example, the ``osds.yml.sample`` contains all the default configuration for the OSD daemons. The ``all.yml.sample``
 file is a special ``group_vars`` file that applies to all hosts in your cluster.
 
 .. note::

diff --git a/docs/source/installation/methods.rst b/docs/source/installation/methods.rst
index d146dce4b6a16aa45e86090b4dd0b3a300f4e440..23bc91d13cf9a39ed341c5c9342a9bb6ff1e1996 100644 (file)
--- a/docs/source/installation/methods.rst
+++ b/docs/source/installation/methods.rst
@@ -8,3 +8,8 @@ ceph-ansible can deploy Ceph either in a non-containerized context (via packages
 
    non-containerized
    containerized
+<<<<<<< HEAD
+=======
+
+The difference here is that you don't have the rbd command on the host when using the containerized deployment so everything related to ceph needs to be executed within a container. So in the case there is software like e.g. Open Nebula which requires that the rbd command is accessible directly on the host (non-containerized) then you have to install the rbd command by yourself on those servers outside of containers (or make sure that this software somehow runs within containers as well and that it can access rbd).
+>>>>>>> 8b1474ab7... Docs: fix some typos

diff --git a/docs/source/installation/non-containerized.rst b/docs/source/installation/non-containerized.rst
index a00d66648269a49f6c6096045cd0030c5677e693..f56bdec2aed9d45cb09c6498da8535ea0a37716b 100644 (file)
--- a/docs/source/installation/non-containerized.rst
+++ b/docs/source/installation/non-containerized.rst
@@ -1,5 +1,5 @@
-Non containerized deployement
-=============================
+Non containerized deployment
+============================
 
 The following are all of the available options for the installing Ceph through different channels.
 
@@ -54,7 +54,7 @@ Custom repository
 ~~~~~~~~~~~~~~~~~
 
 If ``ceph_repository`` is set to ``custom``, packages you will be by default installed from a desired repository.
-This repository is specifie with ``ceph_custom_repo``, e.g: ``ceph_custom_repo: https://server.domain.com/ceph-custom-repo``.
+This repository is specified with ``ceph_custom_repo``, e.g: ``ceph_custom_repo: https://server.domain.com/ceph-custom-repo``.
 
 
 Origin: Distro

diff --git a/docs/source/osds/scenarios.rst b/docs/source/osds/scenarios.rst
index 210b07797efedf24ed9d2d6d006036724fc9d40e..a4deb6ba0e8550b0b28242c0cae8fdee98c8cda6 100644 (file)
--- a/docs/source/osds/scenarios.rst
+++ b/docs/source/osds/scenarios.rst
@@ -17,7 +17,7 @@ At present (starting from stable-4.0), there is only one scenario, which default
 
 So there is no need to configure ``osd_scenario`` anymore, it defaults to ``lvm``.
 
-The ``lvm`` scenario mentionned above support both containerized and non-containerized cluster.
+The ``lvm`` scenario mentioned above support both containerized and non-containerized cluster.
 As a reminder, deploying a containerized cluster can be done by setting ``containerized_deployment``
 to ``True``.
 
@@ -223,4 +223,4 @@ Supported ``lvm_volumes`` configuration settings:
        journal: journal-lv2
        journal_vg: journal-vg2
 
-.. note:: Volume groups and logical volumes must exist.
\ No newline at end of file
+.. note:: Volume groups and logical volumes must exist.