diff --git a/content/applications/inventory_and_mrp/inventory/management/warehouses.rst b/content/applications/inventory_and_mrp/inventory/management/warehouses.rst
index 12cf08f03..7abd11e31 100644
--- a/content/applications/inventory_and_mrp/inventory/management/warehouses.rst
+++ b/content/applications/inventory_and_mrp/inventory/management/warehouses.rst
@@ -12,3 +12,4 @@ Warehouses
    warehouses/warehouse_replenishment_transfer
    warehouses/warehouses_locations
    warehouses/create_a_second_warehouse
+   warehouses/use_locations
diff --git a/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations.rst b/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations.rst
new file mode 100644
index 000000000..c73481411
--- /dev/null
+++ b/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations.rst
@@ -0,0 +1,59 @@
+=========
+Locations
+=========
+
+A *location* is a specific space within a warehouse. This can be a shelf, room, aisle, etc. There
+are three types of locations in Odoo:
+
+- *Physical locations* are spaces within a warehouse owned by the user's company. These can be a an
+  area where items are stored like an aisle or shelf, or an area where operations take place, like
+  loading and unloading bays.
+- *Partner locations* are the same as physical locations except that they exist within the warehouse
+  of a customer or vendor.
+- *Virtual locations* are locations that do not exist physically, but where items that are not in
+  inventory can be placed. These can be items that have not yet entered inventory, like products
+  that are on the way to a warehouse, or items that are no longer in inventory due to loss or other
+  factors.
+
+.. important::
+   In order to use locations, the :guilabel:`Storage Locations` setting must be enabled. To do so,
+   navigate to :menuselection:`Inventory --> Configuration --> Settings`, scroll down to the
+   :guilabel:`Warehouse` heading, and enable the :guilabel:`Storage Locations` checkbox.
+
+Create a new location inside a warehouse
+========================================
+
+Starting from the :menuselection:`Inventory` app, select :menuselection:`Configuration --> Locations
+--> Create`. The new location form can then be configured as follows:
+
+- :guilabel:`Location Name`: the name that will be used to reference the location
+- :guilabel:`Parent Location`: the location or warehouse that the new location exists within
+- :guilabel:`Location Type`: choose the category that the location belongs to
+- :guilabel:`Company`: the company that owns the warehouse that the location is inside of
+- :guilabel:`Is a Scrap Location?`: check this box to allow for scrapped/damaged goods to be stored
+  in this location
+- :guilabel:`Is a Return Location?`: check this box to allow products to be returned to this
+  location
+- :guilabel:`Barcode`: the barcode number assigned to the location
+- :guilabel:`Removal Strategy`: the :ref:`strategy <inventory/routes/strategies/removal>` for how
+  items should be taken from inventory
+
+.. image:: use_locations/new-location-form.png
+   :align: center
+   :alt: The form for creating a new location.
+
+Create location hierarchies
+===========================
+
+The *Parent Location* setting on the new location form allows for a location to exist within a
+warehouse or another location. Every location can serve as a parent location, and every parent
+location can have multiple locations within it, allowing for the creation of a virtually infinite
+hierarchical structure.
+
+.. example::
+   Location hierarchy could be organized so that a shelf is located within an aisle, which is
+   located within a room, which is located within the overall warehouse.
+
+To create the location hierarchy in the example above, set the warehouse as the parent of the room,
+the room as the parent of the aisle, and the aisle as the parent of the shelf. This can be adapted
+to a hierarchy of any magnitude.
diff --git a/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations/new-location-form.png b/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations/new-location-form.png
new file mode 100644
index 000000000..52fff3028
Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/management/warehouses/use_locations/new-location-form.png differ
diff --git a/content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst b/content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst
index cc3c1f1ea..949d4a813 100644
--- a/content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst
+++ b/content/applications/inventory_and_mrp/inventory/routes/strategies/removal.rst
@@ -2,8 +2,10 @@
 What is a Removal Strategy (FIFO, LIFO, FEFO, Closest location)?
 ================================================================
 
-Usually, *Removal Strategies* are defined in picking operations to select the best products,
-optimize the distance for the worker, for quality control purposes, or to first move products
+.. _inventory/routes/strategies/removal:
+
+Usually, *Removal Strategies* are defined in picking operations to select the best products to
+optimize the distance for the worker, for quality control purposes, or to first move the products
 with the closest expiration date.
 
 When a product movement needs to be done, Odoo finds available products that can be assigned to