Merge from origin/emacs-30

8f8da2d7854 ; * ChangeLog.4: Update.
49adcf30b01 ; * etc/AUTHORS: Update.
1381c6f9591 * Update authors.el
5c0f3f5826e ; * etc/NEWS: Mark unmarked entries.
8a0c9c234f1 Document 'trusted-content
c6ce11b2a48 Mention network-interface-list in network-interface-info ...
a7905145f70 ; * lisp/emacs-lisp/re-builder.el (reb-change-syntax): Fi...
cde22c02011 Move NEWS items from unreleased 28.3 to released 29.1
5686bb5b428 Improve browse-url-android-share docstring
92041e15f4a Minor doc fix for url-handler-regexp
9fd96e2ab95 Improve reb-change-syntax docstring
b9dc337ea74 * lisp/files.el (trusted-content-p): Make `:all` work in ...
4b685bc4fcd ; * src/process.c (Fnetwork_interface_list): Fix typo.
c14c4895719 ; * lisp/net/nsm.el (nsm-trust-local-network): Fix typo.
10f976300d0 ; Add some tree-sitter thing content to the manual
55303a6bc0a * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info...
8b6c6cffd1f trusted-content: Adjust the last patch based on prelimina...
69b16e5c638 ; * etc/NEWS: Fix typos.
5c6dbc65f36 ; * doc/lispref/frames.texi (Multiple Terminals): Add ind...
856a58e2827 Update documentation of 'etags' regexps some more
4c68846223b Update documentation of 'etags' regexps
b5158bd1914 elisp-mode.el: Disable Flymake byte-compile backend in un...

# Conflicts:
#	doc/man/etags.1
#	etc/NEWS
#	lisp/org/ox-texinfo.el

1 files changed, 3 insertions, 2 deletions

diff --git a/src/process.c b/src/process.c
index 4b3178005c8..928fae09ef6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4613,7 +4613,7 @@ network_interface_info (Lisp_Object ifname)
 DEFUN ("network-interface-list", Fnetwork_interface_list,
        Snetwork_interface_list, 0, 2, 0,
        doc: /* Return an alist of all network interfaces and their network address.
-Each element is cons of the form (IFNAME . IP) where IFNAME is a
+Each element is a cons of the form (IFNAME . IP) where IFNAME is a
 string containing the interface name, and IP is the network address in
 internal format; see the description of ADDRESS in
 `make-network-process'.  The interface name is not guaranteed to be
@@ -4664,7 +4664,8 @@ where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address,
 NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and
 FLAGS is the current flags of the interface.
 
-Data that is unavailable is returned as nil.  */)
+Data that is unavailable is returned as nil.  Only returns IPv4 layer 3
+addresses, for IPv6 use `network-interface-list'.  */)
   (Lisp_Object ifname)
 {
 #if ((defined HAVE_NET_IF_H                            \