Merge branch 'jc/denoise-rm-to-resolve' into maint

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index d67a35ad5d99baa2399db317e71fc1253f8c4ef5..1169ff6c8eb87e6e372110a89f31273879bc862f 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -586,11 +586,14 @@ Writing Documentation:
  or commands:
 
  Literal examples (e.g. use of command-line options, command names,
- branch names, configuration and environment variables) must be
- typeset in monospace (i.e. wrapped with backticks):
+ branch names, URLs, pathnames (files and directories), configuration and
+ environment variables) must be typeset in monospace (i.e. wrapped with
+ backticks):
    `--pretty=oneline`
    `git rev-list`
    `remote.pushDefault`
+   `http://git.example.com`
+   `.git/config`
    `GIT_DIR`
    `HEAD`