Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

[gnu-emacs] / doc / misc / dired-x.texi

diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index f7c73237249c3696e7f2d09caee0c65806082d5f..cde39ff6a629aa1a0098efd818e255a7cf3d41ee 100644 (file)
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -152,10 +152,10 @@ Commands using file marking
 @noindent
 @file{dired-x.el} binds some functions to keys in Dired Mode (@pxref{Key
 Index}) and also binds @kbd{C-x C-j} and @kbd{C-x 4 C-j} @emph{globally} to
-@code{dired-jump} (@pxref{Miscellaneous Commands}).  It may also bind @kbd{C-x
-C-f} and @kbd{C-x 4 C-f} to @code{dired-x-find-file} and
-@code{dired-x-find-file-other-window}, respectively (@pxref{Find File At
-Point}).
+@code{dired-jump} (@pxref{Miscellaneous Commands}).  Optionally, it
+also binds @kbd{C-x C-f} and @kbd{C-x 4 C-f} to
+@code{dired-x-find-file} and @code{dired-x-find-file-other-window},
+respectively (@pxref{Find File At Point}).
 
 @node Technical Details, , Features, Introduction
 @section Technical Details
@@ -514,7 +514,7 @@ omitted automatically
 @noindent
 You can set @code{dired-local-variables-file} to @code{nil} to suppress this.
 The value of @code{dired-enable-local-variables} controls if and how these
-local variables are read.  This variable exists so that if may override the
+local variables are read.  This variable exists so that it may override the
 default value of @code{enable-local-variables}.
 
 @noindent