diff --git a/doc/conventions.rst b/doc/conventions.rst
new file mode 100644
index 000000000000..a10795d456b3
--- /dev/null
+++ b/doc/conventions.rst
@@ -0,0 +1,36 @@
+.. SPDX-License-Identifier: CC-BY-2.5
+
+=========================
+Documentation Conventions
+=========================
+
+These conventions apply throughout this manual.
+
+Placeholders
+============
+
+Text enclosed in angle brackets is a placeholder. Replace it, including the
+brackets, with a value of your own:
+
+.. code-block:: console
+
+   $ tail -F tmp/log/cooker/<machine>/console-latest.log
+
+Here, ``<machine>`` stands for the machine you are building for. A
+placeholder is never text to be copied as it stands, and an example
+containing one will not work until every placeholder in it has been
+replaced.
+
+Commands
+========
+
+A command you run at a shell is shown with the ``$`` prompt that runs it.
+The prompt is not part of the command; do not type it:
+
+.. code-block:: console
+
+   $ bitbake -c clean foo
+
+Where a command is shown with its output, the prompt is what separates the
+two: the prompted line is what you type and the rest is what BitBake
+printed.
diff --git a/doc/index.rst b/doc/index.rst
index 9f2a9067d385..0a2bd9ce2ecf 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -27,6 +27,13 @@ BitBake User Manual
    genindex
    releases
 
+.. toctree::
+   :maxdepth: 1
+   :caption: Documentation Conventions
+   :hidden:
+
+   conventions
+
 ----
 
 .. include:: <xhtml1-lat1.txt>