From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 1 Jul 2011 12:48:02 +0000 (+0200)
Subject: * dired-aux.el (dired-diff): Doc fixup (bug#8816).
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~271
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ace6c69c026717404139ab2935a2a15d17e7103a;p=emacs.git

* dired-aux.el (dired-diff): Doc fixup (bug#8816).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cee146a3ef..a8893d9da82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-07-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* dired-aux.el (dired-diff): Doc fixup (bug#8816).
+
 	* dired.el (dired-mode): Fix up the doc string as suggested by
 	Drew Adams (bug#8817).
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 8e4b3b5c6a6..f9c6000a047 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -56,9 +56,9 @@ into this list; they also should call `dired-log' to log the errors.")
   "Compare file at point with file FILE using `diff'.
 FILE defaults to the file at the mark.  (That's the mark set by
 \\[set-mark-command], not by Dired's \\[dired-mark] command.)
-The prompted-for file is the first file given to `diff'.
+The prompted-for FILE is the first file given to `diff'.
 With prefix arg, prompt for second argument SWITCHES,
-which is options for `diff'."
+which is the string of command switches for `diff'."
   (interactive
    (let* ((current (dired-get-filename t))
 	  ;; Get the file at the mark.