Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler

diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt
index e8475a042ca5866842550545f434a2071b1992a7..d77a45aed678522344d58498f1ee20ca14e0895e 100644 (file)
--- a/Documentation/gitglossary.txt
+++ b/Documentation/gitglossary.txt
@@ -16,10 +16,12 @@ include::glossary-content.txt[]
 
 SEE ALSO
 --------
-linkgit:gittutorial[7], linkgit:gittutorial-2[7],
-linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
+linkgit:gittutorial[7],
+linkgit:gittutorial-2[7],
+linkgit:gitcvs-migration[7],
+link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.