fixup revert commit damage
commitf3a8fde903b57e2c9ce2b7a7c61d73a447f325eb
authorChristophe Rhodes <csr21@cantab.net>
Wed, 25 Mar 2015 19:00:03 +0000 (25 19:00 +0000)
committerChristophe Rhodes <csr21@cantab.net>
Wed, 25 Mar 2015 19:00:03 +0000 (25 19:00 +0000)
treef9d49c625bf2eeb6fa9f3049914935115731b413
parentaf478da610fa56be2ecc8b8930c54304e73c7eb2
fixup revert commit damage

Obviously I tested the lisp build and tests.  Equally obviously I
didn't test the manual, and I also didn't get the conflict
resolution quite right.
doc/manual/deprecated.texinfo