summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-09 11:53:04 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-09 11:53:04 (GMT)
commit81959fc8c0607490eecab8ac540f36070e6722ad (patch)
tree5135f8d4e674d3de7b609c70bc08c068d56e4913
parent94ea6bca087e92feae6d97be6b2c6072c93c0fd8 (diff)
parent31e765a10528b85163857cff8870a4f0f852dab0 (diff)
downloadorg-mode-81959fc8c0607490eecab8ac540f36070e6722ad.zip
org-mode-81959fc8c0607490eecab8ac540f36070e6722ad.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 8b0a59f..c6e5b70 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3445,13 +3445,16 @@ be the description@footnote{If the headline contains a timestamp, it will be
removed from the link and result in a wrong link---you should avoid putting
timestamp in the headline.}.
-@vindex org-link-to-org-use-id
+@vindex org-id-link-to-org-use-id
@cindex property, CUSTOM_ID
@cindex property, ID
If the headline has a @code{CUSTOM_ID} property, a link to this custom ID
will be stored. In addition or alternatively (depending on the value of
-@code{org-link-to-org-use-id}), a globally unique @code{ID} property will be
-created and/or used to construct a link. So using this command in Org
+@code{org-id-link-to-org-use-id}), a globally unique @code{ID} property will
+be created and/or used to construct a link@footnote{The library @code{org-id}
+must first be loaded, either through @code{org-customize} by enabling
+@code{id} in @code{org-modules} , or by adding @code{(require 'org-id)} in
+your @file{.emacs}.}. So using this command in Org
buffers will potentially create two links: a human-readable from the custom
ID, and one that is globally unique and works even if the entry is moved from
file to file. Later, when inserting the link, you need to decide which one