update release strings in manuals

6 files changed, 26 insertions, 16 deletions

diff --git a/Documentation/magit-popup.org b/Documentation/magit-popup.org
index 84b18ae..9eb8a89 100644
--- a/Documentation/magit-popup.org
+++ b/Documentation/magit-popup.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit-Popup: (magit-popup).
 #+TEXINFO_DIR_DESC: Infix arguments with feedback
-#+SUBTITLE: for version 2.1
+#+SUBTITLE: for version 2.2
 
 #+OPTIONS: H:4 num:3 toc:2
 #+STARTUP: indent
diff --git a/Documentation/magit-popup.texi b/Documentation/magit-popup.texi
index f77e562..33ed35e 100644
--- a/Documentation/magit-popup.texi
+++ b/Documentation/magit-popup.texi
@@ -37,7 +37,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit-Popup User Manual
-@subtitle for version 2.1
+@subtitle for version 2.2
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -434,6 +434,12 @@ argument is used.  See @ref{Customizing existing popups,Customizing existing pop
 The Emacs package used to display man-pages, one of @code{man} or @code{woman}.
 @end defopt
 
+To emphasize the default action by making it bold use this:
+
+@lisp
+(button-type-put 'magit-popup-action-button 'format " %k %D")
+@end lisp
+
 @node Defining prefix and suffix commands
 @chapter Defining prefix and suffix commands
 
diff --git a/Documentation/magit.org b/Documentation/magit.org
index 54ba2d0..eadfee5 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit: (magit).
 #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 2.1
+#+SUBTITLE: for version 2.2
 
 #+OPTIONS: H:4 num:3 toc:2
 #+STARTUP: indent
@@ -142,8 +142,8 @@ latest release.
 
 - Furthermore the old dependencies ~git-commit-mode~ and ~git-rebase-mode~
   have to be removed because they are no longer used by the ~2.1.0~
-  release and get in the way of their successors ~git-commit~ and
-  ~git-rebase~.
+  release and later, and get in the way of their successors ~git-commit~
+  and ~git-rebase~.
 
 So please uninstall the packages ~magit~, ~git-commit-mode~, and
 ~git-rebase-mode~.  Then quit Emacs and start a new instance.  Only then
@@ -287,7 +287,7 @@ outdated value for ~load-path~.
 should display something like
 
 #+BEGIN_SRC undefined
-  Magit 2.1.0, Git 2.4.2, Emacs 24.5.1
+  Magit 2.2.0, Git 2.4.2, Emacs 24.5.1
 #+END_SRC
 
 Then you might also want to read about options that many users likely
@@ -302,7 +302,9 @@ If you are completely new to Magit then see [[*Getting started]].
 
 If you have used an older Magit release before, then you should have a
 look at the release notes
-https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.1.0.txt.
+https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.1.0.txt
+and
+https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.2.0.txt
 
 And last but not least please consider making a donation, to ensure
 that I can keep working on Magit.  See http://magit.vc/donations.html
@@ -4083,7 +4085,7 @@ so in that particular case and that there is nothing that we can
 currently do about it, then comment on the appropriate existing issue
 (see https://github.com/magit/magit/labels/performance), or if
 necessary open a new issue.  Note that "something is slow, I am using
-v2.1" is not helpful, you have to be a bit more specific.  Benchmarks
+v2.2" is not helpful, you have to be a bit more specific.  Benchmarks
 are a start.
 
 * Plumbing
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index ff5cffe..afdbef3 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -40,7 +40,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.1
+@subtitle for version 2.2
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -357,8 +357,8 @@ or even all features belonging to a package.
 @item
 Furthermore the old dependencies @code{git-commit-mode} and @code{git-rebase-mode}
 have to be removed because they are no longer used by the @code{2.1.0}
-release and get in the way of their successors @code{git-commit} and
-@code{git-rebase}.
+release and later, and get in the way of their successors @code{git-commit}
+and @code{git-rebase}.
 @end itemize
 
 So please uninstall the packages @code{magit}, @code{git-commit-mode}, and
@@ -515,7 +515,7 @@ M-x magit-version RET
 should display something like
 
 @example
-Magit 2.1.0, Git 2.4.2, Emacs 24.5.1
+Magit 2.2.0, Git 2.4.2, Emacs 24.5.1
 @end example
 
 Then you might also want to read about options that many users likely
@@ -530,7 +530,9 @@ If you are completely new to Magit then see @ref{Getting started,Getting started
 
 If you have used an older Magit release before, then you should have a
 look at the release notes
-@uref{https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.1.0.txt}.
+@uref{https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.1.0.txt}
+and
+@uref{https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.2.0.txt}
 
 And last but not least please consider making a donation, to ensure
 that I can keep working on Magit.  See @uref{http://magit.vc/donations.html}
@@ -5858,7 +5860,7 @@ so in that particular case and that there is nothing that we can
 currently do about it, then comment on the appropriate existing issue
 (see @uref{https://github.com/magit/magit/labels/performance}), or if
 necessary open a new issue.  Note that "something is slow, I am using
-v2.1" is not helpful, you have to be a bit more specific.  Benchmarks
+v2.2" is not helpful, you have to be a bit more specific.  Benchmarks
 are a start.
 
 @node Plumbing
diff --git a/Documentation/with-editor.org b/Documentation/with-editor.org
index 8bab90b..e77d2d7 100644
--- a/Documentation/with-editor.org
+++ b/Documentation/with-editor.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: With-Editor: (with-editor).
 #+TEXINFO_DIR_DESC: Using the Emacsclient as $EDITOR
-#+SUBTITLE: for version 2.1
+#+SUBTITLE: for version 2.2
 
 #+OPTIONS: H:4 num:3 toc:2
 #+STARTUP: indent
diff --git a/Documentation/with-editor.texi b/Documentation/with-editor.texi
index 58a3c21..f3a4c2d 100644
--- a/Documentation/with-editor.texi
+++ b/Documentation/with-editor.texi
@@ -47,7 +47,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title With-Editor User Manual
-@subtitle for version 2.1
+@subtitle for version 2.2
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll