diff options
| author | Joakim Verona | 2011-09-19 11:37:46 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-09-19 11:37:46 +0200 |
| commit | 4caed0bee59613be5d2a6c4afabcdc43222f953e (patch) | |
| tree | d0c1debf666ef2107492e6cdd2bc8d6bb17de8a2 /doc/man | |
| parent | c139d20a0c582a2c8fe3766128092c32b692ac23 (diff) | |
| parent | c5b01d8c63cfd14c95a029540a6fb0da84537726 (diff) | |
| download | emacs-4caed0bee59613be5d2a6c4afabcdc43222f953e.tar.gz emacs-4caed0bee59613be5d2a6c4afabcdc43222f953e.zip | |
upstream
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 0735e0593f9..a5146be9175 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-09-17 Sven Joachim <svenjoac@gmx.de> | ||
| 2 | |||
| 3 | * emacs.1: Escape a dash. | ||
| 4 | |||
| 1 | 2011-07-12 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-07-12 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * emacsclient.1: Document exit status. | 7 | * emacsclient.1: Document exit status. |
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 10fcc186fdd..aef5bd402a2 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 | |||
| @@ -407,7 +407,7 @@ The value can be one of | |||
| 407 | .IR fullwidth , | 407 | .IR fullwidth , |
| 408 | or | 408 | or |
| 409 | .IR fullheight , | 409 | .IR fullheight , |
| 410 | which correspond to the command-line options `\-fs', `-mm', `\-fw', | 410 | which correspond to the command-line options `\-fs', `\-mm', `\-fw', |
| 411 | and `\-fh', respectively. | 411 | and `\-fh', respectively. |
| 412 | Note that this applies to the initial frame only. | 412 | Note that this applies to the initial frame only. |
| 413 | .TP | 413 | .TP |