Sync with master branch.

[ardour-manual-diverged] / STYLE_GUIDE

diff --git a/STYLE_GUIDE b/STYLE_GUIDE
index 7ab923ba19ef51d0a6c51b56c9ca5237cd30acf6..09f7a6c51e43b352f12557d6283bb76f7b038a01 100644 (file)
--- a/STYLE_GUIDE
+++ b/STYLE_GUIDE
@@ -251,6 +251,8 @@ flow. Aside from this exception, they should *always* be wrapped inside of a
 * For ranges of values, use the en-dash: Monday–Friday, 0–11. Note
   again, the en-dash is snugged up to its surrounding elements.
 * Use a non-breaking space (" ") between a number and its unit.
+* Colons (":") always snug up to their text on the left: it is an error to add
+  space between text on the left and the colon.
 
 
 5.2 Language
@@ -259,7 +261,7 @@ flow. Aside from this exception, they should *always* be wrapped inside of a
 * The Ardour manual is written in American English spelling.
 * Use SI units with standard abbreviations. Give imperial units only as
   additional information, if at all.
-* Do not use contractions like "you'll", always write full forms.
+* Do not use contractions like "it'll", always write full forms.
 * Do not over-use "You", write about the program, not the user. Avoid it if at 
   all possible, it makes for tighter and better reading text.
 * Always write out numbers less than 11. E.g., "One or two ..." instead of