Merge from emacs--rel--22

[gnu-emacs] / doc / emacs / display.texi

diff --git a/man/display.texi b/doc/emacs/display.texi
similarity index 100%
rename from man/display.texi
rename to doc/emacs/display.texi