diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2021-08-10 09:59:55 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2021-08-10 09:59:55 +0200 |
| commit | 0704a84c840752dd983aca8d9d83f1f2787d1049 (patch) | |
| tree | 4c65d8b6ef0177bbf8d587946215fff16ee2ea6d /Documentation | |
| parent | 16316ed16d7eac48c045f5ed6a26ad437abbec93 (diff) | |
Fix typos
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/magit.org | 8 | ||||
| -rw-r--r-- | Documentation/magit.texi | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org index ae5ad97..1f510f1 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -8,7 +8,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit: (magit). #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit. -#+SUBTITLE: for version 3.2.1 +#+SUBTITLE: for version 3.2.1 (v3.2.1-11-g16316ed16+1) #+TEXINFO_DEFFN: t #+OPTIONS: H:4 num:3 toc:2 @@ -25,7 +25,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. #+TEXINFO: @noindent -This manual is for Magit version 3.2.1. +This manual is for Magit version 3.2.1 (v3.2.1-11-g16316ed16+1). #+BEGIN_QUOTE Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li> @@ -1364,7 +1364,7 @@ Valid values for both of the above options are: #+TEXINFO: @noindent I am afraid it gets more complicated still: -- The global diff and log arguments are set for each support mode +- The global diff and log arguments are set for each supported mode individually. The diff arguments for example have different values in ~magit-diff-mode~, ~magit-revision-mode~, ~magit-merge-preview-mode~ and ~magit-status-mode~ buffers. Setting or saving the value for one @@ -1373,7 +1373,7 @@ I am afraid it gets more complicated still: - When ~magit-show-commit~ is invoked directly from a log buffer, then the file filter is picked up from that buffer, not from the revision - buffer and or the mode's global diff arguments. + buffer or the mode's global diff arguments. - Even though they are suffixes of the diff prefix ~magit-show-commit~ and ~magit-stash-show~ do not use the diff buffer used by the diff diff --git a/Documentation/magit.texi b/Documentation/magit.texi index 699913a..df73be4 100644 --- a/Documentation/magit.texi +++ b/Documentation/magit.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit User Manual -@subtitle for version 3.2.1 +@subtitle for version 3.2.1 (v3.2.1-11-g16316ed16+1) @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. @noindent -This manual is for Magit version 3.2.1. +This manual is for Magit version 3.2.1 (v3.2.1-11-g16316ed16+1). @quotation Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li> @@ -1891,7 +1891,7 @@ I am afraid it gets more complicated still: @itemize @item -The global diff and log arguments are set for each support mode +The global diff and log arguments are set for each supported mode individually. The diff arguments for example have different values in @code{magit-diff-mode}, @code{magit-revision-mode}, @code{magit-merge-preview-mode} and @code{magit-status-mode} buffers. Setting or saving the value for one @@ -1902,7 +1902,7 @@ is shared. @item When @code{magit-show-commit} is invoked directly from a log buffer, then the file filter is picked up from that buffer, not from the revision -buffer and or the mode's global diff arguments. +buffer or the mode's global diff arguments. @item |
