Glenn Morris 3ee1841f28 Merge from origin/emacs-26 ... b98cf9c ; Fix a typo in the Emacs manual 700fcd7 * doc/emacs/help.texi: Fix paren typo. c9c0e40 More minor changes in shell-related nodes of Emacs manual e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual 087681b8 Improve documentation of kmacro commands and variables. be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon. 1d9e66a Don't check non-X frames for z order (Bug#31373) 7dc028e Check NSWindow is actually a frame Conflicts: src/nsfns.m		2018-05-15 09:09:48 -07:00
..
ChangeLog.1	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
ctags.1	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
ebrowse.1	Fix copyright years by hand	2018-01-01 01:02:09 -08:00
emacs.1.in	* doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.	2018-05-10 22:47:04 -04:00
emacsclient.1	Add support for arguments in emacsclient's ALTERNATE_EDITOR (Bug #25082)	2017-08-30 21:59:38 +01:00
etags.1	etags(1): fix formatting problem	2018-01-19 14:18:09 +00:00