Merge from origin/emacs-26

0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual

Conflicts:
	doc/emacs/files.texi
	test/lisp/subr-tests.el

8 files changed, 14 insertions, 11 deletions

diff --git a/lisp/leim/quail/latin-alt.el b/lisp/leim/quail/latin-alt.el
index a7d39ec839e..5044fb2d29b 100644
--- a/lisp/leim/quail/latin-alt.el
+++ b/lisp/leim/quail/latin-alt.el
@@ -1156,7 +1156,7 @@ Caters for French and Dutch.
 
              |         | examples
  ------------+---------+----------
-  others     |         | fl. -> ƒ  eur. -> €  ij -> ij  IJ -> IJ
+  others     |         | fl. -> ƒ  eur. -> €
  ------------+---------+----------
              | postfix |
  ------------+---------+----------
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 5afd5c5804b..ea17fb518e2 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -124,7 +124,7 @@ Args are NAME BUFFER HOST SERVICE.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or `buffer-name') to associate with the process.
  Process output goes at end of that buffer, unless you specify
- an output stream or filter function to handle the output.
+ a filter function to handle the output.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el
index 31f3d46ed66..6303141c898 100644
--- a/lisp/net/shr-color.el
+++ b/lisp/net/shr-color.el
@@ -137,7 +137,7 @@ absolute value without any unit."
     ("MediumAquaMarine" . "#66CDAA")
     ("MediumBlue" . "#0000CD")
     ("MediumOrchid" . "#BA55D3")
-    ("MediumPurple" . "#9370D8")
+    ("MediumPurple" . "#9370DB")
     ("MediumSeaGreen" . "#3CB371")
     ("MediumSlateBlue" . "#7B68EE")
     ("MediumSpringGreen" . "#00FA9A")
@@ -158,7 +158,7 @@ absolute value without any unit."
     ("PaleGoldenRod" . "#EEE8AA")
     ("PaleGreen" . "#98FB98")
     ("PaleTurquoise" . "#AFEEEE")
-    ("PaleVioletRed" . "#D87093")
+    ("PaleVioletRed" . "#DB7093")
     ("PapayaWhip" . "#FFEFD5")
     ("PeachPuff" . "#FFDAB9")
     ("Peru" . "#CD853F")
@@ -166,6 +166,7 @@ absolute value without any unit."
     ("Plum" . "#DDA0DD")
     ("PowderBlue" . "#B0E0E6")
     ("Purple" . "#800080")
+    ("RebeccaPurple" . "#663399")
     ("Red" . "#FF0000")
     ("RosyBrown" . "#BC8F8F")
     ("RoyalBlue" . "#4169E1")
diff --git a/lisp/net/starttls.el b/lisp/net/starttls.el
index 2069843e3bb..e2dff2d53d6 100644
--- a/lisp/net/starttls.el
+++ b/lisp/net/starttls.el
@@ -270,7 +270,7 @@ Args are NAME BUFFER HOST PORT.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or `buffer-name') to associate with the process.
  Process output goes at end of that buffer, unless you specify
- an output stream or filter function to handle the output.
+ a filter function to handle the output.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index ae49edcb1d5..b02a2654d41 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -204,7 +204,7 @@ Args are NAME BUFFER HOST PORT.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer name) to associate with the process.
  Process output goes at end of that buffer, unless you specify
- an output stream or filter function to handle the output.
+ a filter function to handle the output.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
diff --git a/lisp/subr.el b/lisp/subr.el
index 00bab70e8a3..056392a9266 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2123,10 +2123,10 @@ and the file name is displayed in the echo area."
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer name) to associate with the process.
 
-Process output (both standard output and standard error streams) goes
-at end of BUFFER, unless you specify an output stream or filter
-function to handle the output.  BUFFER may also be nil, meaning that
-this process is not associated with any buffer.
+Process output (both standard output and standard error streams)
+goes at end of BUFFER, unless you specify a filter function to
+handle the output.  BUFFER may also be nil, meaning that this
+process is not associated with any buffer.
 
 PROGRAM is the program file name.  It is searched for in `exec-path'
 \(which see).  If nil, just associate a pty with the buffer.  Remaining
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index aa3113bd340..f8da1b21965 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -842,7 +842,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
             (format "Creation of the standard fontset failed: %s" err)
             :error)))
 
-  (x-open-connection (system-name) x-command-line-resources t)
+  (x-open-connection (or (system-name) "") x-command-line-resources t)
 
   ;; Add GNUstep menu items Services, Hide and Quit.  Rename Help to Info
   ;; and put it first (i.e. omit from menu-bar-final-items.
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 55c21f8acb0..727bc18ebb8 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -499,6 +499,7 @@ further value candidates, since that list would be infinite.")
     ("red" . "#ff0000")
     ("purple" . "#800080")
     ("fuchsia" . "#ff00ff")
+    ("magenta" . "#ff00ff")
     ("green" . "#008000")
     ("lime" . "#00ff00")
     ("olive" . "#808000")
@@ -507,6 +508,7 @@ further value candidates, since that list would be infinite.")
     ("blue" . "#0000ff")
     ("teal" . "#008080")
     ("aqua" . "#00ffff")
+    ("cyan" . "#00ffff")
     ("orange" . "#ffa500")
     ("aliceblue" . "#f0f8ff")
     ("antiquewhite" . "#faebd7")