release version 2.4.02.4.0

11 files changed, 49 insertions, 32 deletions

diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index 48b6907..9cf3e8c 100644
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/Documentation/RelNotes/2.4.0.txt
@@ -11,10 +11,13 @@ Magit and Git itself deserve to be called porcelains.
 
 For more information about Magit, see http://magit.vc.
 
-Magit v2.4.0 Release Notes (draft)
-==================================
+Magit v2.4.0 Release Notes
+==========================
 
-UNRELEASED.
+Released 18 January 2016 by Jonas Bernoulli.
+
+We are pleased to announce the release of Magit version 2.4.0,
+representing 269 commits by 14 people over 12 weeks.
 
 Changes since v2.3.0
 --------------------
@@ -136,3 +139,18 @@ bug fixes, and other small to medium improvements.
 
 Authors
 -------
+
+   226  Jonas Bernoulli
+    22  Kyle Meyer
+    10  Noam Postavsky
+     1  Carl Lieberman
+     1  Damien Cassou
+     1  David L. Rager
+     1  John Mastro
+     1  Lele Gaifax
+     1  Michael Heerdegen
+     1  Miloš Mošić
+     1  Raimon Grau
+     1  Sylvain Rousseau
+     1  Syohei Yoshida
+     1  Zach Latta
diff --git a/Documentation/magit-popup.org b/Documentation/magit-popup.org
index acb93ac..61aa069 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.3
+#+SUBTITLE: for version 2.4
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/magit-popup.texi b/Documentation/magit-popup.texi
index 22010ec..d6af8ed 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.3
+@subtitle for version 2.4
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/Documentation/magit.org b/Documentation/magit.org
index c0eb57e..05f301e 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.3
+#+SUBTITLE: for version 2.4
 
 #+OPTIONS: H:4 num:3 toc:2
 
@@ -286,7 +286,7 @@ outdated value for ~load-path~.
 should display something like
 
 #+BEGIN_SRC undefined
-  Magit 2.2.0, Git 2.4.2, Emacs 24.5.1
+  Magit 2.4.0, Git 2.7.0, Emacs 24.5.1
 #+END_SRC
 
 Then you might also want to read about options that many users likely
@@ -300,10 +300,7 @@ See [[*How to install the gitman info manual?]].
 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
-and
-https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.2.0.txt
+look at the release notes https://github.com/magit/magit/releases.
 
 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
@@ -5503,11 +5500,11 @@ and [[info:with-editor#Debugging]].
 
 ** I don't understand how branching and pushing work
 
-Please see [[*Branching]] and http://emacsair.me/2016/01/17/magit-2.4
+Please see [[*Branching]] and http://emacsair.me/2016/01/18/magit-2.4
 
 ** I don't like the key binding in v2.4
 
-Please see http://emacsair.me/2016/01/17/restore-old-bindings.
+Please see http://emacsair.me/2016/01/1/restore-old-bindings.
 
 ** I cannot install the pre-requisites for Magit v2
 
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 21d1a56..8a7aac9 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.3
+@subtitle for version 2.4
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -238,7 +238,8 @@ FAQ
 * Magit is slow::
 * I changed several thousand files at once and now Magit is unusable::
 * I am having problems committing::
-* I don't like how branching and pushing works::
+* I don't understand how branching and pushing work::
+* I don't like the key binding in v2.4: I don't like the key binding in v24. 
 * I cannot install the pre-requisites for Magit v2::
 * I am using an Emacs release older than v24.4: I am using an Emacs release older than v244. 
 * I am using a Git release older than v1.9.4: I am using a Git release older than v194. 
@@ -529,7 +530,7 @@ M-x magit-version RET
 should display something like
 
 @example
-Magit 2.2.0, Git 2.4.2, Emacs 24.5.1
+Magit 2.4.0, Git 2.7.0, Emacs 24.5.1
 @end example
 
 Then you might also want to read about options that many users likely
@@ -543,10 +544,7 @@ See @ref{How to install the gitman info manual?,How to install the gitman info m
 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}
-and
-@uref{https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.2.0.txt}
+look at the release notes @uref{https://github.com/magit/magit/releases}.
 
 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}
@@ -7411,7 +7409,8 @@ made it into the manual yet, see @uref{https://github.com/magit/magit/wiki/FAQ}.
 * Magit is slow::
 * I changed several thousand files at once and now Magit is unusable::
 * I am having problems committing::
-* I don't like how branching and pushing works::
+* I don't understand how branching and pushing work::
+* I don't like the key binding in v2.4: I don't like the key binding in v24. 
 * I cannot install the pre-requisites for Magit v2::
 * I am using an Emacs release older than v24.4: I am using an Emacs release older than v244. 
 * I am using a Git release older than v1.9.4: I am using a Git release older than v194. 
@@ -7450,12 +7449,15 @@ That likely means that Magit is having problems finding an appropriate
 emacsclient executable.  See @ref{Configuring With-Editor,,,with-editor,}
 and @ref{Debugging,,,with-editor,}.
 
-@node I don't like how branching and pushing works
-@section I don't like how branching and pushing works
+@node I don't understand how branching and pushing work
+@section I don't understand how branching and pushing work
 
-In v2.1 the default behavior of the branch and push commands changed,
-which has taken a few users by surprise and left more unsatisfied.
-The next release, v2.4, will try to address these concerns.
+Please see @ref{Branching,Branching} and @uref{http://emacsair.me/2016/01/18/magit-2.4}
+
+@node I don't like the key binding in v24
+@section I don't like the key binding in v2.4
+
+Please see @uref{http://emacsair.me/2016/01/1/restore-old-bindings}.
 
 @node I cannot install the pre-requisites for Magit v2
 @section I cannot install the pre-requisites for Magit v2
diff --git a/Documentation/with-editor.org b/Documentation/with-editor.org
index 667afa0..38a00f9 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.3
+#+SUBTITLE: for version 2.4
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/with-editor.texi b/Documentation/with-editor.texi
index 5030295..dd2e0f2 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.3
+@subtitle for version 2.4
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 8074cfe..a159220 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20151111"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.4.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index 78c5353..f99d294 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -12,7 +12,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
 ;; Keywords: bindings
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit.el b/lisp/magit.el
index d481125..33169a5 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -16,7 +16,7 @@
 ;;	Rémi Vanicat      <vanicat@debian.org>
 ;;	Yann Hodique      <yann.hodique@gmail.com>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20151111") (git-commit "20151111") (magit-popup "20151221"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.4.0") (git-commit "2.4.0") (magit-popup "2.4.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index fac092c..bf7e760 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -8,7 +8,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
 ;; Keywords: tools
 ;; Homepage: https://github.com/magit/magit