branch: elpa/git-commit
commit 0704a84c840752dd983aca8d9d83f1f2787d1049
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Fix typos
---
Documentation/magit.org | 8 ++++----
Documentation/magit.texi | 8 ++++----
lisp/magit-mode.el | 4 ++--
3 files changed, 10 insertions(+), 10 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 <jo...@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
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index efa1614..bf8f21c 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -226,7 +226,7 @@ Valid values are:
buffer.
For more information see info node `(magit)Transient Arguments
-and Buffer Arguments'."
+and Buffer Variables'."
:package-version '(magit . "3.0.0")
:group 'magit-buffers
:group 'magit-commands
@@ -259,7 +259,7 @@ Valid values are:
buffer.
For more information see info node `(magit)Transient Arguments
-and Buffer Arguments'."
+and Buffer Variables'."
:package-version '(magit . "3.0.0")
:group 'magit-buffers
:group 'magit-commands
