2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86eadb3f1dd..4b65d0b4ee2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
         * dired.el (dired-mode-map): Make :help text more accurate (bug#14893).
         (dired-prev-marked-file): Doc fix (bug#14855).
+        (dired-up-directory): Doc fix (bug#14848).
 
         * minibuffer.el (read-file-name): Doc clarification (bug#15096).
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 742c9583941..5e0c9047005 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2045,7 +2045,9 @@ Optional prefix ARG says how many lines to move; default is one line."
 (defun dired-up-directory (&optional other-window)
   "Run Dired on parent directory of current directory.
 Find the parent directory either in this buffer or another buffer.
-Creates a buffer if necessary."
+Creates a buffer if necessary.
+If OTHER-WINDOW (the optional prefix arg), display the parent
+directory in another window."
   (interactive "P")
   (let* ((dir (dired-current-directory))
          (up (file-name-directory (directory-file-name dir))))