diff options
| author | Paul Eggert | 2017-03-19 12:34:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 12:34:03 -0700 |
| commit | 90f5282e20df79dedaa9d231a108f9a91222eca7 (patch) | |
| tree | 4b2f648d7209c93fc845c68beccd27b98a51fdac /doc/man | |
| parent | c4fca5cee27e3bf399ad23bf42317bffcc80f160 (diff) | |
| parent | ec4226d81074751c105264a3a3383c48d0a05e41 (diff) | |
| download | emacs-90f5282e20df79dedaa9d231a108f9a91222eca7.tar.gz emacs-90f5282e20df79dedaa9d231a108f9a91222eca7.zip | |
Merge from origin/emacs-25
ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description.
2b774fa Mention "editor" in Emacs man page header
ae60d0c Document problems with nerd-fonts
2fdb5a9 ; Details about pinning Emacs to w32 task bar
5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i...
4c51ef4 Clarify what is the "cursor"
8303c32 ; * etc/NEWS: Copyedits.
3f7493e ; Fix a typo in comment
c54cf8d Improve commentary in lisp.h
8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro...
0ba9932 Disable native completion for ipython (Bug#25067)
38fc456 Fix a typo in ada-mode manual
00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d...
a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-...
# Conflicts:
# etc/NEWS
# etc/PROBLEMS
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/emacs.1.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index 6807e866526..5d0948f51b3 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | . | 3 | . |
| 4 | . | 4 | . |
| 5 | .SH NAME | 5 | .SH NAME |
| 6 | emacs \- GNU project Emacs | 6 | emacs \- GNU project Emacs editor |
| 7 | . | 7 | . |
| 8 | . | 8 | . |
| 9 | .SH SYNOPSIS | 9 | .SH SYNOPSIS |