From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 23 Sep 2007 14:23:33 +0000 (+0000)
Subject: (org-confirm-shell-link-function, org-confirm-elisp-link-function): Doc fixes.
X-Git-Tag: emacs-pretest-23.0.90~10718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c4d5b8abb9b44925f547e733458242f37bb386a;p=emacs.git

(org-confirm-shell-link-function, org-confirm-elisp-link-function): Doc fixes.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff71370c753..bc9f5b5dea7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-23  Richard Stallman  <rms@gnu.org>
+
+	* textmodes/org.el (org-confirm-shell-link-function)
+	(org-confirm-elisp-link-function): Doc fixes.
+
 2007-09-23  Glenn Morris  <rgm@gnu.org>
 
 	* ses.el (ses-calculate-cell): Don't evaluate unsafe formulae.
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 1d60d452ab0..246c9ae4dcb 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -1231,15 +1231,15 @@ if one was given like in <mailto:arthur@galaxy.org::this subject>."
 
 (defcustom org-confirm-shell-link-function 'yes-or-no-p
   "Non-nil means, ask for confirmation before executing shell links.
-Shell links can be dangerous, just think about a link
+Shell links can be dangerous: just think about a link
 
      [[shell:rm -rf ~/*][Google Search]]
 
-This link would show up in your Org-mode document as \"Google Search\"
+This link would show up in your Org-mode document as \"Google Search\",
 but really it would remove your entire home directory.
-Therefore I *definitely* advise against setting this variable to nil.
-Just change it to `y-or-n-p' of you want to confirm with a single key press
-rather than having to type \"yes\"."
+Therefore we advise against setting this variable to nil.
+You can change it to `y-or-n-p' if you want to confirm
+with a single keystroke instead of \"yes\"."
   :group 'org-link-follow
   :type '(choice
 	  (const :tag "with yes-or-no (safer)" yes-or-no-p)
@@ -1247,16 +1247,16 @@ rather than having to type \"yes\"."
 	  (const :tag "no confirmation (dangerous)" nil)))
 
 (defcustom org-confirm-elisp-link-function 'yes-or-no-p
-  "Non-nil means, ask for confirmation before executing elisp links.
-Elisp links can be dangerous, just think about a link
+  "Non-nil means, ask for confirmation before executing Emacs Lisp links.
+Emacs Lisp links can be dangerous: just think about a link
 
      [[elisp:(shell-command \"rm -rf ~/*\")][Google Search]]
 
-This link would show up in your Org-mode document as \"Google Search\"
+This link would show up in your Org-mode document as \"Google Search\",
 but really it would remove your entire home directory.
-Therefore I *definitely* advise against setting this variable to nil.
-Just change it to `y-or-n-p' of you want to confirm with a single key press
-rather than having to type \"yes\"."
+Therefore we advise against setting this variable to nil.
+You can change it to `y-or-n-p' if you want to confirm
+with a single keystroke instead of \"yes\"."
   :group 'org-link-follow
   :type '(choice
 	  (const :tag "with yes-or-no (safer)" yes-or-no-p)