bug#7674: Bugs in Emacs manual and online file

[Chong Yidong]

Peng Li <flyd1005@gmail.com> writes:

> (1) Emacs Manual      Chapter 32 Maintaining Large Programs
>
> Version Control: Using version control systems.
> Change Log: Maintaining a change history for your program.
> Tags: Go directly to any function in your program in one command. Tags
> remembers which file it is in.
> EDE: An integrated development environment for Emacs.
> <<<<<< This is section 32.5 ???
> Emerge: A convenient way of merging two versions of a program.
> <<<<<< This is section 32.4 ???

Thanks, this was a merge error.  I've committed a fix.

> (2) In the following file, "Maintaining Large Programs" is Chapter 25.
> Obviously the whole PDF file should be updated.
> http://www.gnu.org/software/emacs/manual/emacs.pdf

Unfortunately, this seems unavoidable.  We section the two versions
slightly differently (even though the same text content is used),
because an organization that makes sense for the printed manual
sometimes does not read well for the online version, and vice version.