[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100337: * emacsclient.1: Arrange options alphabetically (Bug#7620).

[Chong Yidong]

------------------------------------------------------------
revno: 100337
author: Jari Aalto <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-12-29 11:42:53 +0800
message:
  * emacsclient.1: Arrange options alphabetically (Bug#7620).
modified:
  doc/man/ChangeLog
  doc/man/emacsclient.1

=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2010-10-10 00:05:14 +0000
+++ b/doc/man/ChangeLog 2010-12-29 03:42:53 +0000
@@ -1,3 +1,7 @@
+2010-12-29  Jari Aalto  <address@hidden>  (tiny change)
+
+       * emacsclient.1: Arrange options alphabetically (Bug#7620).
+
 2010-10-10  Glenn Morris  <address@hidden>
 
        * emacs.1: Small fixes.

=== modified file 'doc/man/emacsclient.1'
--- a/doc/man/emacsclient.1     2008-12-13 04:14:26 +0000
+++ b/doc/man/emacsclient.1     2010-12-29 03:42:53 +0000
@@ -49,36 +49,36 @@
 The programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 .TP
-.B \-nw, \-t, \-\-tty
-open a new Emacs frame on the current terminal
+.B \-a, \-\-alternate-editor=EDITOR
+if the Emacs server is not running, run the specified editor instead.
+This can also be specified via the `ALTERNATE_EDITOR' environment variable.
+If the value of EDITOR is the empty string, then Emacs is started in
+daemon mode and emacsclient will try to connect to it.
 .TP
 .B -c, \-\-create-frame
 create a new frame instead of trying to use the current Emacs frame
 .TP
+.B \-d, \-\-display=DISPLAY
+tell the server to display the files on the given display.
+.TP
 .B \-e, \-\-eval
 do not visit files but instead evaluate the arguments as Emacs
 Lisp expressions.
 .TP
+.B \-f, \-\-server-file=FILENAME
+use TCP configuration file FILENAME for communication.
+This can also be specified via the `EMACS_SERVER_FILE' environment variable.
+.TP
 .B \-n, \-\-no-wait
 returns
 immediately without waiting for you to "finish" the buffer in Emacs.
 .TP
+.B \-nw, \-t, \-\-tty
+open a new Emacs frame on the current terminal
+.TP
 .B \-s, \-\-socket-name=FILENAME
 use socket named FILENAME for communication.
 .TP
-.B \-f, \-\-server-file=FILENAME
-use TCP configuration file FILENAME for communication.
-This can also be specified via the `EMACS_SERVER_FILE' environment variable.
-.TP
-.B \-a, \-\-alternate-editor=EDITOR
-if the Emacs server is not running, run the specified editor instead.
-This can also be specified via the `ALTERNATE_EDITOR' environment variable.
-If the value of EDITOR is the empty string, then Emacs is started in
-daemon mode and emacsclient will try to connect to it.
-.TP
-.B \-d, \-\-display=DISPLAY
-tell the server to display the files on the given display.
-.TP
 .B \-V, \-\-version
 print version information and exit
 .TP