merge problem with doc/man ChangeLogs

[Glenn Morris]

Hi Miles,


Your Nov 21 change to doc/emacs/ChangeLog (rev 1.42) in the trunk:

  Merge from emacs--rel--22

  Revision: address@hidden/emacs--devo--0--patch-937

put rms's flymake entry in the wrong file. It should have gone to
doc/misc/ChangeLog. Similar things seem to have happened with previous
merges. I probably did the wrong thing with the arch tags when I
created the doc/ directory. I will sort the current problems out.