diff --git a/documentation/standards.md b/documentation/standards.md
index 81aff5f193..8d5c4542af 100644
--- a/documentation/standards.md
+++ b/documentation/standards.md
@@ -7,6 +7,21 @@ It is currently a work in progress.
 
 ## Text standards
 
+### Line wrapping
+
+Source code for the documentation shouldn't have lines
+wider than 80 characters. This makes patch lines more
+readable and code easier to quote in e-mail clients.
+
+If you have to include long commands or lines in configuration
+files, provided the syntax makes this possible, split them
+into multiple lines, using the ``\`` character.
+
+Exceptions are granted for file contents which lines
+cannot be split without infringing syntactic rules
+or reducing readability, as well as for command output
+which should be kept unmodified.
+
 ### Project names
 
 Project names should be capitalized in the same
@@ -25,11 +40,23 @@ in lower case:
 
 ### File names
 
-File names should be quoted as in the below example:
+File, tool and command names should be quoted as in
+the below example:
+
+    ``conf/local.conf``
+
+Using `"conf/local/conf"` would be wrong.
+
+### Variables
+
+Every variable should be mentioned with:
 
-     ``conf/local.conf``
+    :term:`VARIABLE`
 
-Using "conf/local/conf" would be wrong.
+This assumes that `VARIABLE` is described either
+in the Yocto Project documentation variable index (`ref-manual/variables.rst`)
+or in the BitBake User Manual
+(`doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst`)
 
 ## ReStructured Text Syntax standards