diff options
| author | Glenn Morris | 2014-11-01 11:05:30 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-11-01 11:05:30 -0700 |
| commit | d5d8ca30e5f481a32414c42bcc3b5a042061ff07 (patch) | |
| tree | febc223f19801e8e01b9498c5ba9d6c7bfcfa091 /doc | |
| parent | e54c5e4e25098be9df9d9c46d32165887b0ff9d3 (diff) | |
| parent | b99e8f833671a2b52be654eb477830294c624a97 (diff) | |
| download | emacs-d5d8ca30e5f481a32414c42bcc3b5a042061ff07.tar.gz emacs-d5d8ca30e5f481a32414c42bcc3b5a042061ff07.zip | |
Merge from emacs-24; up to 117656
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/emacsclient.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index a5abcff0d5d..6930271e548 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 | |||
| @@ -52,7 +52,7 @@ options starting with two dashes (`-'). | |||
| 52 | .B \-a, \-\-alternate-editor=EDITOR | 52 | .B \-a, \-\-alternate-editor=EDITOR |
| 53 | if the Emacs server is not running, run the specified editor instead. | 53 | if the Emacs server is not running, run the specified editor instead. |
| 54 | This can also be specified via the `ALTERNATE_EDITOR' environment variable. | 54 | This can also be specified via the `ALTERNATE_EDITOR' environment variable. |
| 55 | If the value of EDITOR is the empty string, run `emacs --daemon' to | 55 | If the value of EDITOR is the empty string, run `emacs \-\-daemon' to |
| 56 | start Emacs in daemon mode, and try to connect to it. | 56 | start Emacs in daemon mode, and try to connect to it. |
| 57 | .TP | 57 | .TP |
| 58 | .B -c, \-\-create-frame | 58 | .B -c, \-\-create-frame |