Point to the Org ELPA page for instructions on installing through ELPA

Also some minor rephrasing.

1 files changed, 18 insertions, 16 deletions

diff --git a/doc/org.texi b/doc/org.texi
index bf484b9..5d40708 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -855,29 +855,29 @@ Theory Ltd.}
 @cindex installation
 @cindex XEmacs
 
-@b{Important:} @i{If you are using a version of Org that is part of the Emacs
-distribution, GNU ELPA installed by the package manager or an XEmacs package,
-please skip this section and go directly to @ref{Activation}.  To see what
-version of Org (if any) is part of your Emacs distribution, type @kbd{M-x
-org-version} (if your Emacs distribution does not come with Org, this
-function will not be defined).}
+@b{Important:} @i{If you the version of Org that comes with Emacs or as a
+XEmacs package, please skip this section and go directly to @ref{Activation}.
+If you downloaded Org as an ELPA package, please read the instructions on the
+@uref{http://orgmode.org/elpa/, Org ELPA page}.  To see what version of Org
+(if any) is part of your Emacs distribution, type @kbd{M-x org-version} (if
+your Emacs distribution does not come with Org, this function will not be
+defined).}
 
 Installation of Org mode uses a build system, which is described in more
 detail on @uref{http://orgmode.org/worg/dev/org-build-system.html, Worg}.
 
 If you have downloaded Org from the Web as a distribution @file{.zip} or
-@file{.tar.gz} archive, you must take the following steps to install it:
+@file{.tar.gz} archive, take the following steps to install it:
 
 @itemize @bullet
 @item Unpack the distribution archive.
 @item Change into (@code{cd}) the Org directory.
 @item Run @code{make help config}
 and then check and edit the file @file{local.mk} if the default configuration
-does not match your system.  You must set the name of the Emacs binary
-(likely either @file{emacs} or @file{xemacs}), and the paths to the
-directories where local Lisp and Info files will be installed.  If the Emacs
-binary is not in your path, you must give the full path to the executable.
-Avoid spaces in any path names.
+does not match your system.  Set the name of the Emacs binary (likely either
+@file{emacs} or @file{xemacs}), and the paths to the directories where local
+Lisp and Info files will be installed.  If the Emacs binary is not in your
+path, give the full path to the executable.  Avoid spaces in any path names.
 @item Run @code{make config}
 again to check the configuration.
 @item Optionally run @code{make test}
@@ -979,6 +979,7 @@ Do not forget to activate Org as described in the following section.
 @section Activation
 @cindex activation
 @cindex autoload
+@cindex ELPA
 @cindex global key bindings
 @cindex key bindings, global
 @findex org-agenda
@@ -987,8 +988,8 @@ Do not forget to activate Org as described in the following section.
 @findex org-iswitchb
 
 Since Emacs 22.2, files with the @file{.org} extension use Org mode by
-default.  If you are using an earlier version of Emacs, add this line to
-your @file{.emacs} file:
+default.  If you are using an earlier version of Emacs, add this line to your
+@file{.emacs} file:
 
 @lisp
 (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
@@ -1077,8 +1078,9 @@ $ emacs -Q -l /path/to/minimal-org.el
 @end example
 
 However if you are using Org mode as distributed with Emacs, a minimal setup
-is not necessary.  In that case it is sufficient to start Emacs as @code{emacs
--Q}.  The @code{minimal-org.el} setup file can have contents as shown below.
+is not necessary.  In that case it is sufficient to start Emacs as
+@code{emacs -Q}.  The @code{minimal-org.el} setup file can have contents as
+shown below.
 
 @example
 ;;; Minimal setup to load latest `org-mode'