Merge fixes made on the 'master' front

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d87846faa6c3ffad7cba97fe7348ef97e0112899..7e2a6f61f593921450c311b05269a3555baa97ad 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -422,6 +422,8 @@ include::config/submodule.txt[]
 
 include::config/tag.txt[]
 
+include::config/trace2.txt[]
+
 include::config/transfer.txt[]
 
 include::config/uploadarchive.txt[]