[elpa] externals/ivy-hydra d951004 336/395: doc: Conflate installation description

[Basil L. Contovounesios]

branch: externals/ivy-hydra
commit d951004c7f3ebf98d55fc5a80a3471ec95b6db05
Author: janEbert <janpublicebert@posteo.net>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    doc: Conflate installation description
    
    Due to commit 782117aa34418ff66ecf763327f1e2aa69f234f9 in the GNU ELPA
    repository (git://git.savannah.gnu.org/emacs/elpa.git), the packages
    are now split in GNU ELPA as well.
    
    We can thus merge the installation instructions together.
    
    Fixes #2624
---
 doc/ivy.org  | 17 ++++++++++-------
 doc/ivy.texi | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/doc/ivy.org b/doc/ivy.org
index 20a5e7e..f9988c3 100644
--- a/doc/ivy.org
+++ b/doc/ivy.org
@@ -148,15 +148,18 @@ version that runs Ivy with fancy faces display.
 :CUSTOM_ID: installing-from-emacs-package-manager
 :END:
 
-~M-x~ =package-install= ~RET~ =ivy= ~RET~
+~M-x~ =package-install= ~RET~ =counsel= ~RET~
 
-Ivy is installed as part of =ivy= package, which is available from two
-different package archives, GNU ELPA and MELPA. For the latest stable
-version, use the GNU ELPA archives using the above M-x command.
+Ivy is installed as part of the =counsel= package, which is available
+from two different package archives, GNU ELPA and MELPA.  For the
+latest stable version, use the GNU ELPA archives.  For current hourly
+builds, use the MELPA archives.
+
+Ivy is split into three packages: =ivy=, =swiper= and =counsel=; by
+installing =counsel=, the other two are brought in as dependencies.
+If you are not interested in the extra functionality provided by
+=swiper= and =counsel=, you can install only =ivy=.
 
-For current hourly builds, use the MELPA archives. In MELPA, Ivy is
-split into three packages: =ivy=, =swiper= and =counsel=; you can simply
-install =counsel= which will bring in the other two as dependencies.
 See the code below for adding MELPA to the list of package archives:
 
 #+begin_src elisp
diff --git a/doc/ivy.texi b/doc/ivy.texi
index 24a1f89..7beabff 100644
--- a/doc/ivy.texi
+++ b/doc/ivy.texi
@@ -214,15 +214,18 @@ version that runs Ivy with fancy faces display.
 @node Installing from Emacs Package Manager
 @section Installing from Emacs Package Manager
 
-@kbd{M-x} @code{package-install} @kbd{RET} @code{ivy} @kbd{RET}
+@kbd{M-x} @code{package-install} @kbd{RET} @code{counsel} @kbd{RET}
 
-Ivy is installed as part of @code{ivy} package, which is available from two
-different package archives, GNU ELPA and MELPA. For the latest stable
-version, use the GNU ELPA archives using the above M-x command.
+Ivy is installed as part of the @code{counsel} package, which is available
+from two different package archives, GNU ELPA and MELPA.  For the
+latest stable version, use the GNU ELPA archives.  For current hourly
+builds, use the MELPA archives.
+
+Ivy is split into three packages: @code{ivy}, @code{swiper} and 
@code{counsel}; by
+installing @code{counsel}, the other two are brought in as dependencies.
+If you are not interested in the extra functionality provided by
+@code{swiper} and @code{counsel}, you can install only @code{ivy}.
 
-For current hourly builds, use the MELPA archives. In MELPA, Ivy is
-split into three packages: @code{ivy}, @code{swiper} and @code{counsel}; you 
can simply
-install @code{counsel} which will bring in the other two as dependencies.
 See the code below for adding MELPA to the list of package archives:
 
 @lisp