Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-04-17 13:38:41 +02:00
commit a2b69cc4d7
1 changed files with 5 additions and 1 deletions

View File

@ -863,7 +863,11 @@ We @b{strongly recommend} to stick to a single installation method.
Recent Emacs distributions include a packaging system which lets you install
Elisp libraries. You can install Org with @kbd{M-x package-install RET org}.
You need to do this in a session where no @code{.org} file has been visited.
@noindent @b{Important}: you need to do this in a session where no @code{.org} file has
been visited, i.e. where no Org built-in function have been loaded.
Otherwise autoload Org functions will mess up the installation.
Then, to make sure your Org configuration is taken into account, initialize
the package system with @code{(package-initialize)} in your @file{.emacs}
before setting any Org option. If you want to use Org's package repository,