9 commits

Author	SHA1	Message	Date
Paul Eggert	90f5282e20	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	2017-03-19 12:34:03 -07:00
Eli Zaretskii	2b774fa873	Mention "editor" in Emacs man page header ... * doc/man/emacs.1.in: Mention "editor" in the header line. (Bug#25771, Bug#25779)	2017-02-18 13:32:45 +02:00
Paul Eggert	bcf244ef9b	Merge from origin/emacs-25 ... 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017	2017-01-01 01:10:47 -08:00
Paul Eggert	2e2a806803	Fix copyright years by hand ... These are dates that admin/update-copyright did not update, or updated incorrectly.	2017-01-01 04:01:41 +00:00
Glenn Morris	35007ad9da	* src/emacs.c (usage_message): Mention named daemon. (Bug#24949) ... * doc/man/emacs.1.in: Likewise.	2016-11-15 18:21:06 -05:00
Paul Eggert	9c3dbabee3	Fix copyright years by hand ... These are dates that admin/update-copyright did not update, or updated incorrectly.	2016-01-01 01:38:07 -08:00
Paul Eggert	3262e49067	Prefer double-quote to accent-grave in man pages	2015-04-07 11:59:22 -07:00
Paul Eggert	52a4e87c63	Fix copyright years by hand ... These are dates that admin/update-copyright did not update, or updated incorrectly. Also, back out the copyright-date change to doc/misc/texinfo.tex, as upstream hasn't updated that date yet.	2015-01-01 14:27:34 -08:00
Glenn Morris	be1f31616a	Further reduce the number of versioned files storing the version number ... * configure.ac (doc/man/emacs.1): Generate it. * Makefile.in (top_bootclean): Remove doc/man/emacs.1. * make-dist: Do not distribute doc/man/emacs.1. * admin/admin.el (set-version): No need to update doc/man/emacs.1. * doc/man/emacs.1.in: Rename from emacs.1. * .bzrignore: Add doc/man/emacs.1.	2014-11-09 18:01:56 -08:00

Renamed from doc/man/emacs.1 (Browse further)