summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-27 09:08:35 +0200
committerBastien Guerry <bzg@altern.org>2012-10-27 09:08:35 +0200
commit4c3527d2e647615cbeddebf13de09b289f215c4a (patch)
tree4b60c5c816b955b37219295de140fde608a95ae6
parent00eaa4dc97daaf608e0ad3a20a4e79317d480a16 (diff)
parent1fe4e9ecc7a4900e4d84a76fd496df0360e2406c (diff)
downloadorg-mode-4c3527d2e647615cbeddebf13de09b289f215c4a.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi
index e35eb1e..3ad98e9 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -881,8 +881,6 @@ 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}
-to build Org mode and then run the full testsuite.
@item Run @code{make install} or @code{sudo make install}
to build and install Org mode on your system.
@end itemize
@@ -905,6 +903,8 @@ Emacs binary is not in your path, you must give the full path to the
executable. Avoid spaces in any path names.
@item Run @code{make config}
to check the configuration.
+@item Optionally run @code{make test}
+to build Org mode and then run the full testsuite.
@item Run @code{make update2} or @code{make up2}
to update the Git repository and build and install Org mode. The latter
invocation runs the complete test suite before installation and installs only