summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-09-21 11:07:34 +0200
committerBastien Guerry <bzg@altern.org>2012-09-21 11:08:15 +0200
commit5a5abba09f81aa7a2f7dc7d2daceb834b53287e8 (patch)
tree244cbdbd36aedd1e675c4dabaec1d3746d186681
parent6cb676f65a3f93a068b7611eab67382e7776de51 (diff)
downloadorg-mode-5a5abba09f81aa7a2f7dc7d2daceb834b53287e8.tar.gz
org.texi (Activation): Point to the "Conflicts" section
* org.texi (Activation): Point to the "Conflicts" section.
-rw-r--r--doc/org.texi11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 7b78faa..1f0f315 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -989,12 +989,17 @@ Do not forget to activate Org as described in the following section.
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:
+
@lisp
(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
@end lisp
-@noindent Org mode buffers need font-lock to be turned on - this is the
-default in Emacs@footnote{If you don't use font-lock globally, turn it on in
-Org buffer with @code{(add-hook 'org-mode-hook 'turn-on-font-lock)}}.
+
+Org mode buffers need font-lock to be turned on - this is the default in
+Emacs@footnote{If you don't use font-lock globally, turn it on in Org buffer
+with @code{(add-hook 'org-mode-hook 'turn-on-font-lock)}}.
+
+There are compatibility issues between Org mode and some other Elisp
+packages, please take the time to check the list (@pxref{Conflicts}).
The four Org commands @command{org-store-link}, @command{org-capture},
@command{org-agenda}, and @command{org-iswitchb} should be accessible through