diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-07-17 16:56:51 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-07-17 16:56:51 +0200 |
| commit | d5d23470a4b6277bcfdc54e6c0dc7c398fb26946 (patch) | |
| tree | 49553cdfe42bbbb6c77f2e9712c3bc810c264cfb /Documentation | |
| parent | 5530756b2d52f2f178b8868749b427c5e5462d16 (diff) | |
magit.org: various fixes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/magit.org | 4 | ||||
| -rw-r--r-- | Documentation/magit.texi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org index fac985c..7d59229 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -3555,7 +3555,7 @@ You should check the values of at least the following variables: - ~magit-diff-auto-show~ - ~magit-diff-highlight-hunk-body~ - ~magit-diff-highlight-indentation~ -- ~magit-diff-highlight-whitespace~ +- ~magit-diff-highlight-trailing~ - ~magit-diff-paint-whitespace~ - ~magit-diff-refine-hunk~ - ~magit-not-reverted-hook~ @@ -4491,7 +4491,7 @@ also affects the diffs displayed inside Magit. ** Emacs 24.5 hangs when loading Magit This is actually triggered by loading Tramp. See -https://debbugs.gnu.org/cgi/bugreport.cgi?bug~20015 for details. You +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20015 for details. You can work around the problem by setting ~tramp-ssh-controlmaster-options~. Changing your DNS server (e.g. to Google's ~8.8.8.8~) may also be sufficient to work around the issue. diff --git a/Documentation/magit.texi b/Documentation/magit.texi index ccb8c9c..9143558 100644 --- a/Documentation/magit.texi +++ b/Documentation/magit.texi @@ -5158,7 +5158,7 @@ You should check the values of at least the following variables: @code{magit-diff-highlight-indentation} @item -@code{magit-diff-highlight-whitespace} +@code{magit-diff-highlight-trailing} @item @code{magit-diff-paint-whitespace} @@ -6231,7 +6231,7 @@ echo "*.gpg filter=gpg diff=gpg" > .gitattributes @section Emacs 24.5 hangs when loading Magit This is actually triggered by loading Tramp. See -@uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug~20015} for details. You +@uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20015} for details. You can work around the problem by setting @code{tramp-ssh-controlmaster-options}. Changing your DNS server (e.g. to Google's @code{8.8.8.8}) may also be sufficient to work around the issue. |