Merge from origin/emacs-26

30c4f35 (origin/emacs-26) query-replace-regexp undo: Update next-repl...
c596be0 Amend the menu caption for page "Display Property" in the Eli...
13b9510 Add description of chinese-sisheng

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 6a26667510a..dfd464c827c 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -497,6 +497,10 @@ one of them selects that alternative.  The keys @kbd{C-f}, @kbd{C-b},
 do the highlighting in the buffer showing the possible characters,
 rather than in the echo area.
 
+  To enter characters according to the @dfn{pīnyīn} transliteration
+method instead, use the @code{chinese-sisheng} input method.  This is
+a composition based method, where e.g. @kbd{pi1} results in @samp{pī}.
+
   In Japanese input methods, first you input a whole word using
 phonetic spelling; then, after the word is in the buffer, Emacs
 converts it into one or more characters using a large dictionary.  One
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 428fe9595a6..3c3ee1fc6a4 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -25,7 +25,7 @@ that Emacs presents to the user.
 * Fringes::             Controlling window fringes.
 * Scroll Bars::         Controlling scroll bars.
 * Window Dividers::     Separating windows visually.
-* Display Property::    Enabling special display features.
+* Display Property::    Images, margins, text size, etc.
 * Images::              Displaying images in Emacs buffers.
 * Xwidgets::            Displaying native widgets in Emacs buffers.
 * Buttons::             Adding clickable buttons to Emacs buffers.