master updated (ec1aaac5c0 -> aedb74b294)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  ec1aaac5c0 Set border colors through the toolkit
      adds  5942504391 Reword face-remap-add-relative manual entry
       new  aedb74b294 Merge from origin/emacs-28


Summary of changes:
 doc/lispref/display.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)