aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPo Lu2021-12-10 14:50:21 +0800
committerPo Lu2021-12-10 14:50:21 +0800
commitcc0f147180300b672894de931bee76b2a3a719e9 (patch)
tree2fca1fb8adcb4aa1726f3274922f78eafe9a1aa5 /doc
parent6919d5a7c0a23c14ae77f7c708ea6d0ef2478108 (diff)
parent6e865a7171d80cd91b54c6d71b88d960b920abe3 (diff)
downloademacs-cc0f147180300b672894de931bee76b2a3a719e9.tar.gz
emacs-cc0f147180300b672894de931bee76b2a3a719e9.zip
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/rcirc.texi2
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--doc/misc/url.texi6
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 58ca045e786..f03f614275c 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -464,7 +464,7 @@ your status as ``being back'' if you do not. People can use the
464@cindex help about irc 464@cindex help about irc
465Typical IRC servers implement many more commands. You can read more 465Typical IRC servers implement many more commands. You can read more
466about the fantastic world of IRC online at 466about the fantastic world of IRC online at
467@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help 467@uref{https://www.irchelp.org/, the Internet Relay Chat (IRC) help
468archive}. 468archive}.
469 469
470@node Configuration 470@node Configuration
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2a8a0382807..86f4d1c38eb 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4231,7 +4231,7 @@ It is even possible to access file archives in file archives, as
4231(progn 4231(progn
4232 (url-handler-mode 1) 4232 (url-handler-mode 1)
4233 (find-file 4233 (find-file
4234 "http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")) 4234 "https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control"))
4235@end group 4235@end group
4236@end lisp 4236@end lisp
4237 4237
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 8f15e11007e..90e38e5d30e 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -90,7 +90,7 @@ can be accessed (usually over a network) in a specific way.
90 90
91@example 91@example
92ftp://ftp.is.co.za/rfc/rfc1808.txt 92ftp://ftp.is.co.za/rfc/rfc1808.txt
93http://www.ietf.org/rfc/rfc2396.txt 93https://www.ietf.org/rfc/rfc2396.txt
94ldap://[2001:db8::7]/c=GB?objectClass?one 94ldap://[2001:db8::7]/c=GB?objectClass?one
95mailto:John.Doe@@example.com 95mailto:John.Doe@@example.com
96news:comp.infosystems.www.servers.unix 96news:comp.infosystems.www.servers.unix
@@ -708,7 +708,7 @@ Well-known ports are used if the URL does not specify a port.
708@cindex rcirc 708@cindex rcirc
709 709
710 The @code{irc} scheme is defined in the Internet Draft at 710 The @code{irc} scheme is defined in the Internet Draft at
711@url{http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which 711@url{https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
712was never approved as an RFC). Such URLs have the form 712was never approved as an RFC). Such URLs have the form
713 713
714@example 714@example
@@ -1181,7 +1181,7 @@ opened by the URL library.
1181@c machines off the local network. This is characterized by being able 1181@c machines off the local network. This is characterized by being able
1182@c to reach someplace with a raw ip number, but not its hostname 1182@c to reach someplace with a raw ip number, but not its hostname
1183@c (@url{http://129.79.254.191/} works, but 1183@c (@url{http://129.79.254.191/} works, but
1184@c @url{http://www.cs.indiana.edu/} doesn't). This used to happen on 1184@c @url{https://www.cs.indiana.edu/} doesn't). This used to happen on
1185@c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be 1185@c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be
1186@c rebuilt linked against the resolver library, it can use the external 1186@c rebuilt linked against the resolver library, it can use the external
1187@c @command{nslookup} program instead. 1187@c @command{nslookup} program instead.