diff --git a/documentation/dev-manual/hashequivserver.rst b/documentation/dev-manual/hashequivserver.rst
index c866f5001..75b77c30b 100644
--- a/documentation/dev-manual/hashequivserver.rst
+++ b/documentation/dev-manual/hashequivserver.rst
@@ -11,8 +11,8 @@ This document will guide you through the steps required to set up the reference
 Hash Equivalence server provided by the :oe_git:`bitbake-hashserv
 </bitbake/tree/bin/bitbake-hashserv>` script in :term:`BitBake`.

-This guide will explain how to setup a local Hash Equivalence server and does
-not explain how to setup the surrounding infrastructure to secure this server.
+This guide will explain how to set up a local Hash Equivalence server and does
+not explain how to set up the surrounding infrastructure to secure this server.

 Hash Equivalence Server Setup
 =============================
diff --git a/documentation/dev-manual/poky-manual-setup.rst b/documentation/dev-manual/poky-manual-setup.rst
index cade9e2b1..833e1631e 100644
--- a/documentation/dev-manual/poky-manual-setup.rst
+++ b/documentation/dev-manual/poky-manual-setup.rst
@@ -3,14 +3,14 @@
 Setting Up the Poky Reference Distro Manually
 *********************************************

-While the default way to setup the :term:`Poky` reference distro is to use
-``bitbake-setup``, it is also possible to manually setup the environment. This
+While the default way to set up the :term:`Poky` reference distro is to use
+``bitbake-setup``, it is also possible to manually set up the environment. This
 document guides through this setup step-by-step.

 .. note::

    This document will produce a setup similar to what is described in
-   :doc:`/brief-yoctoprojectqs/index`, which shows how to setup :term:`Poky`
+   :doc:`/brief-yoctoprojectqs/index`, which shows how to set up :term:`Poky`
    with ``bitbake-setup``.

 Obtaining The Source Repositories
@@ -41,7 +41,7 @@ Throughout the documentation, we will use ``bitbake-builds`` as the name of the
    $ cd bitbake-builds

 You need to get a copy of the different :term:`layers <Layer>` needed
-to setup the :term:`Poky` reference distribution on your build host. Use the
+to set up the :term:`Poky` reference distribution on your build host. Use the
 following commands:

 .. code-block:: shell
@@ -90,7 +90,7 @@ an entire Linux distribution, including the toolchain, from source.
       page of the Yocto Project Wiki.

 #.  **Initialize the Build Environment:** From your current working directory,
-    setup a build environment with the following command:
+    set up a build environment with the following command:

     .. code-block:: shell

diff --git a/documentation/dev-manual/start.rst b/documentation/dev-manual/start.rst
index 2aa3d5da5..4ea27fceb 100644
--- a/documentation/dev-manual/start.rst
+++ b/documentation/dev-manual/start.rst
@@ -235,7 +235,7 @@ particular working environment and set of practices.
        equivalence feature.

        See the :doc:`/dev-manual/hashequivserver` section of the Yocto Project
-       Development Tasks Manual for details on how to setup a
+       Development Tasks Manual for details on how to set up a
        :ref:`overview-manual/concepts:Hash Equivalence` server.

     -  Set up an Autobuilder and have it populate the sstate cache and
@@ -606,7 +606,7 @@ Initializing the Build Environment
 Initializing the build environment is a common task, as it needs to be done for
 each new instance of the shell where the :term:`Poky` reference distro was set up:

--  If ``bitbake-setup`` was used to setup the :term:`Poky` reference distro, you
+-  If ``bitbake-setup`` was used to set up the :term:`Poky` reference distro, you
    need to source the ``init-build-env`` file of the :term:`bitbake:Setup`
    directory that was created after the :ref:`bitbake:ref-bbsetup-command-init`
    command execution:
@@ -616,7 +616,7 @@ each new instance of the shell where the :term:`Poky` reference distro was set u
       $ source <setup-dir>/build/init-build-env


--  If the :term:`Poky` distro was setup using manual clones of the layers, you
+-  If the :term:`Poky` distro was set up using manual clones of the layers, you
    need to source the ``oe-init-build-env`` script present in the
    :term:`OpenEmbedded-Core (OE-Core)` layer:

@@ -624,7 +624,7 @@ each new instance of the shell where the :term:`Poky` reference distro was set u

       $ source openembedded-core/oe-init-build-env

-This will setup your current shell and change the current working directory to
+This will set up your current shell and change the current working directory to
 the :term:`Build Directory`.

 Where To Go From Here