Merge branch 'maint'

diff --git a/Documentation/user-manual.conf b/Documentation/user-manual.conf
index 92b01ecf715f216bf79e3f775813d1df66000c7e..339b30919e6cd9791a5cc30b93395a88fb5e9d96 100644 (file)
--- a/Documentation/user-manual.conf
+++ b/Documentation/user-manual.conf
@@ -7,7 +7,7 @@ startsb=[
 endsb=]
 tilde=~
 
-[gitlink-inlinemacro]
+[linkgit-inlinemacro]
 <ulink url="{target}.html">{target}{0?({0})}</ulink>
 
 ifdef::backend-docbook[]