2 files changed, 9 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5481e7f51dc..dc43450110f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
+
+        * misc.texi (emacsclient Options): Add q/quiet.
+
 2011-03-02  Glenn Morris  <rgm@gnu.org>
 
         * mule.texi (Communication Coding) <x-select-request-type>:
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d7143d1498a..1299895a06e 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1672,6 +1672,11 @@ all server buffers are finished.  You can take as long as you like to
 edit the server buffers within Emacs, and they are @emph{not} killed
 when you type @kbd{C-x #} in them.
 
+@item -q
+@itemx --quiet
+Do not let @command{emacsclient} display messages about waiting for
+Emacs or connecting to remote server sockets.
+
 @item -s @var{server-name}
 @itemx --socket-name=@var{server-name}
 Connect to the Emacs server named @var{server-name}.  The server name