2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7109284991..aee691b82c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-04  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-shell-send-string):
+        (python-shell-send-string-no-output): Fix docstring (Bug#16547).
+
 2014-02-04  Anders Lindgren  <andlind@gmail.com>
 
         * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6058fbfe800..6b508e03a04 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2118,8 +2118,7 @@ there for compatibility with CEDET.")
     temp-file-name))
 
 (defun python-shell-send-string (string &optional process)
-  "Send STRING to inferior Python PROCESS.
-When MSG is non-nil messages the first line of STRING."
+  "Send STRING to inferior Python PROCESS."
   (interactive "sPython command: ")
   (let ((process (or process (python-shell-get-or-create-process))))
     (if (string-match ".\n+." string)   ;Multiline.
@@ -2168,8 +2167,7 @@ detecting a prompt at the end of the buffer."
 
 (defun python-shell-send-string-no-output (string &optional process)
   "Send STRING to PROCESS and inhibit output.
-When MSG is non-nil messages the first line of STRING.  Return
-the output."
+Return the output."
   (let ((process (or process (python-shell-get-or-create-process)))
         (comint-preoutput-filter-functions
          '(python-shell-output-filter))