mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 22:40:46 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-12-10 14:50:21 +08:00
commit cc0f147180
25 changed files with 68 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/misc/rcirc.texi
View file

@ -464,7 +464,7 @@ your status as ``being back'' if you do not. People can use the
@cindex help about irc
Typical IRC servers implement many more commands. You can read more
about the fantastic world of IRC online at
@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help
@uref{https://www.irchelp.org/, the Internet Relay Chat (IRC) help
archive}.
@node Configuration

2
doc/misc/tramp.texi
View file

@ -4231,7 +4231,7 @@ It is even possible to access file archives in file archives, as
(progn
(url-handler-mode 1)
(find-file
"http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control"))
"https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control"))
@end group
@end lisp

6
doc/misc/url.texi
View file

@ -90,7 +90,7 @@ can be accessed (usually over a network) in a specific way.
@example
ftp://ftp.is.co.za/rfc/rfc1808.txt
http://www.ietf.org/rfc/rfc2396.txt
https://www.ietf.org/rfc/rfc2396.txt
ldap://[2001:db8::7]/c=GB?objectClass?one
mailto:John.Doe@@example.com
news:comp.infosystems.www.servers.unix
@ -708,7 +708,7 @@ Well-known ports are used if the URL does not specify a port.
@cindex rcirc
The @code{irc} scheme is defined in the Internet Draft at
@url{http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
@url{https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
was never approved as an RFC). Such URLs have the form
@example
@ -1181,7 +1181,7 @@ opened by the URL library.
@c machines off the local network. This is characterized by being able
@c to reach someplace with a raw ip number, but not its hostname
@c (@url{http://129.79.254.191/} works, but
@c @url{http://www.cs.indiana.edu/} doesn't). This used to happen on
@c @url{https://www.cs.indiana.edu/} doesn't). This used to happen on
@c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be
@c rebuilt linked against the resolver library, it can use the external
@c @command{nslookup} program instead.