summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-24 11:27:59 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-24 11:27:59 (GMT)
commitaf49713a95f4b8f89794106e6d351bd5e7c0e2c2 (patch)
tree14c4d01c7dac8e1a5e774e3c1ece7e2d328aa114
parent699bb5415b8bafe230d0c89eba8d2032a3434b57 (diff)
parentd11c9acc664e3c8a30117b6107fceded33f0218a (diff)
downloadorg-mode-af49713a95f4b8f89794106e6d351bd5e7c0e2c2.zip
org-mode-af49713a95f4b8f89794106e6d351bd5e7c0e2c2.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 295dfb1..37c7ac5 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -905,17 +905,20 @@ $ git clone git://orgmode.org/org-mode.git
$ make autoloads
@end example
-Note that @code{make autoloads} is mandatory: it defines Org's version and
-Org's autoloaded functions, respectively in @file{org-version.el} and in
+Note that in this case, @code{make autoloads} is mandatory: it defines Org's
+version in @file{org-version.el} and Org's autoloads in
@file{org-loaddefs.el}.
Remember to add the correct load-path as described in the method above.
-You can also compile and install Org from this git repository: check
-@code{make help} to get the list of compilation/installation options.
+You can also compile with @code{make}, generate the documentation with
+@code{make doc}, create a local configuration with @code{make config} and
+install Org with @code{make install}. Please run @code{make help} to get
+the list of compilation/installation options.
For more detailed explanations on Org's build system, please check the Org
-Build System page on @uref{http://orgmode.org/worg/dev/org-build-system.html, Worg}.
+Build System page on @uref{http://orgmode.org/worg/dev/org-build-system.html,
+Worg}.
@node Activation, Feedback, Installation, Introduction
@section Activation