diff --git a/docs/cmdline-opts/Makefile.inc b/docs/cmdline-opts/Makefile.inc
index abfa38c97..e56bc84c7 100644
--- a/docs/cmdline-opts/Makefile.inc
+++ b/docs/cmdline-opts/Makefile.inc
@@ -21,225 +21,244 @@
 ###########################################################################
 # Shared between Makefile.am and CMakeLists.txt
 
-DPAGES =					\
-  abstract-unix-socket.d			\
-  alt-svc.d                                     \
-  anyauth.d					\
-  append.d basic.d				\
-  cacert.d capath.d				\
-  cert-status.d					\
-  cert-type.d					\
-  cert.d					\
-  ciphers.d					\
-  compressed-ssh.d				\
-  compressed.d					\
-  config.d					\
-  connect-timeout.d				\
-  connect-to.d					\
-  continue-at.d					\
-  cookie-jar.d					\
-  cookie.d					\
-  create-dirs.d					\
-  create-file-mode.d                            \
-  crlf.d crlfile.d				\
-  curves.d					\
-  data-ascii.d					\
-  data-binary.d					\
-  data-urlencode.d				\
-  data.d data-raw.d				\
-  delegation.d					\
-  digest.d					\
-  disable-eprt.d				\
-  disable-epsv.d				\
-  disable.d					\
-  disallow-username-in-url.d			\
-  dns-interface.d				\
-  dns-ipv4-addr.d				\
-  dns-ipv6-addr.d				\
-  dns-servers.d					\
-  doh-url.d					\
-  dump-header.d					\
-  egd-file.d					\
-  engine.d					\
-  etag-compare.d                                \
-  etag-save.d                                   \
-  expect100-timeout.d				\
-  fail-early.d					\
-  fail-with-body.d				\
-  fail.d					\
-  false-start.d					\
-  form-string.d					\
-  form.d					\
-  ftp-account.d					\
-  ftp-alternative-to-user.d			\
-  ftp-create-dirs.d				\
-  ftp-method.d					\
-  ftp-pasv.d					\
-  ftp-port.d					\
-  ftp-pret.d					\
-  ftp-skip-pasv-ip.d				\
-  ftp-ssl-ccc-mode.d				\
-  ftp-ssl-ccc.d					\
-  ftp-ssl-control.d				\
-  get.d globoff.d				\
-  happy-eyeballs-timeout-ms.d			\
-  haproxy-protocol.d				\
-  head.d header.d				\
-  help.d					\
-  hostpubmd5.d					\
-  hsts.d                                        \
-  http0.9.d					\
-  http1.0.d					\
-  http1.1.d http2.d				\
-  http2-prior-knowledge.d			\
-  http3.d                                       \
-  ignore-content-length.d			\
-  include.d					\
-  insecure.d					\
-  interface.d					\
-  ipv4.d ipv6.d					\
-  junk-session-cookies.d			\
-  keepalive-time.d				\
-  key.d key-type.d				\
-  krb.d libcurl.d				\
-  limit-rate.d					\
-  list-only.d					\
-  local-port.d					\
-  location-trusted.d				\
-  location.d					\
-  login-options.d				\
-  mail-auth.d					\
-  mail-from.d					\
-  mail-rcpt-allowfails.d                        \
-  mail-rcpt.d					\
-  manual.d					\
-  max-filesize.d				\
-  max-redirs.d					\
-  max-time.d					\
-  metalink.d					\
-  negotiate.d					\
-  netrc-file.d					\
-  netrc-optional.d				\
-  netrc.d					\
-  next.d no-alpn.d				\
-  no-buffer.d					\
-  no-keepalive.d				\
-  no-npn.d					\
-  no-progress-meter.d                           \
-  no-sessionid.d				\
-  noproxy.d					\
-  ntlm.d ntlm-wb.d				\
-  oauth2-bearer.d				\
-  output.d                                      \
-  output-dir.d                                  \
-  parallel-immediate.d                          \
-  parallel-max.d                                \
-  parallel.d                                    \
-  pass.d                			\
-  path-as-is.d					\
-  pinnedpubkey.d				\
-  post301.d					\
-  post302.d					\
-  post303.d					\
-  preproxy.d					\
-  progress-bar.d				\
-  proto-default.d				\
-  proto-redir.d					\
-  proto.d					\
-  proxy-anyauth.d				\
-  proxy-basic.d					\
-  proxy-cacert.d				\
-  proxy-capath.d				\
-  proxy-cert-type.d				\
-  proxy-cert.d					\
-  proxy-ciphers.d				\
-  proxy-crlfile.d				\
-  proxy-digest.d				\
-  proxy-header.d				\
-  proxy-insecure.d				\
-  proxy-key-type.d				\
-  proxy-key.d					\
-  proxy-negotiate.d				\
-  proxy-ntlm.d					\
-  proxy-pass.d					\
-  proxy-pinnedpubkey.d				\
-  proxy-service-name.d				\
-  proxy-ssl-allow-beast.d			\
-  proxy-tls13-ciphers.d				\
-  proxy-tlsauthtype.d				\
-  proxy-tlspassword.d				\
-  proxy-tlsuser.d				\
-  proxy-tlsv1.d					\
-  proxy-user.d					\
-  proxy.d					\
-  proxy1.0.d					\
-  proxytunnel.d					\
-  pubkey.d quote.d				\
-  random-file.d					\
-  range.d raw.d					\
-  referer.d					\
-  remote-header-name.d				\
-  remote-name-all.d				\
-  remote-name.d					\
-  remote-time.d					\
-  request-target.d				\
-  request.d					\
-  resolve.d					\
-  retry-all-errors.d				\
-  retry-connrefused.d				\
-  retry-delay.d					\
-  retry-max-time.d				\
-  retry.d					\
-  sasl-authzid.d				\
-  sasl-ir.d					\
-  service-name.d				\
-  show-error.d					\
-  silent.d					\
-  socks4.d socks5.d				\
-  socks4a.d					\
-  socks5-basic.d				\
-  socks5-gssapi-nec.d				\
-  socks5-gssapi-service.d			\
-  socks5-gssapi.d				\
-  socks5-hostname.d				\
-  speed-limit.d					\
-  speed-time.d					\
-  ssl-allow-beast.d				\
-  ssl-no-revoke.d				\
-  ssl-reqd.d					\
-  ssl-revoke-best-effort.d			\
-  ssl.d						\
-  sslv2.d sslv3.d				\
-  stderr.d					\
-  styled-output.d				\
-  suppress-connect-headers.d			\
-  tcp-fastopen.d				\
-  tcp-nodelay.d					\
-  telnet-option.d				\
-  tftp-blksize.d				\
-  tftp-no-options.d				\
-  time-cond.d					\
-  tls-max.d					\
-  tls13-ciphers.d				\
-  tlsauthtype.d					\
-  tlspassword.d					\
-  tlsuser.d					\
-  tlsv1.0.d					\
-  tlsv1.1.d					\
-  tlsv1.2.d					\
-  tlsv1.3.d tlsv1.d				\
-  tr-encoding.d					\
-  trace-ascii.d					\
-  trace-time.d					\
-  trace.d					\
-  unix-socket.d					\
-  upload-file.d					\
-  url.d use-ascii.d				\
-  user-agent.d					\
-  user.d verbose.d				\
-  aws-sigv4.d                                   \
-  version.d					\
-  write-out.d					\
+DPAGES = \
+  abstract-unix-socket.d \
+  alt-svc.d \
+  anyauth.d \
+  append.d \
+  aws-sigv4.d \
+  basic.d \
+  cacert.d \
+  capath.d \
+  cert-status.d \
+  cert-type.d \
+  cert.d \
+  ciphers.d \
+  compressed-ssh.d \
+  compressed.d \
+  config.d \
+  connect-timeout.d \
+  connect-to.d \
+  continue-at.d \
+  cookie-jar.d \
+  cookie.d \
+  create-dirs.d \
+  create-file-mode.d \
+  crlf.d \
+  crlfile.d \
+  curves.d \
+  data-ascii.d \
+  data-binary.d \
+  data-raw.d \
+  data-urlencode.d \
+  data.d \
+  delegation.d \
+  digest.d \
+  disable-eprt.d \
+  disable-epsv.d \
+  disable.d \
+  disallow-username-in-url.d \
+  dns-interface.d \
+  dns-ipv4-addr.d \
+  dns-ipv6-addr.d \
+  dns-servers.d \
+  doh-url.d \
+  dump-header.d \
+  egd-file.d \
+  engine.d \
+  etag-compare.d \
+  etag-save.d \
+  expect100-timeout.d \
+  fail-early.d \
+  fail-with-body.d \
+  fail.d \
+  false-start.d \
+  form-string.d \
+  form.d \
+  ftp-account.d \
+  ftp-alternative-to-user.d \
+  ftp-create-dirs.d \
+  ftp-method.d \
+  ftp-pasv.d \
+  ftp-port.d \
+  ftp-pret.d \
+  ftp-skip-pasv-ip.d \
+  ftp-ssl-ccc-mode.d \
+  ftp-ssl-ccc.d \
+  ftp-ssl-control.d \
+  get.d \
+  globoff.d \
+  happy-eyeballs-timeout-ms.d \
+  haproxy-protocol.d \
+  head.d \
+  header.d \
+  help.d \
+  hostpubmd5.d \
+  hsts.d \
+  http0.9.d \
+  http1.0.d \
+  http1.1.d \
+  http2-prior-knowledge.d \
+  http2.d \
+  http3.d \
+  ignore-content-length.d \
+  include.d \
+  insecure.d \
+  interface.d \
+  ipv4.d \
+  ipv6.d \
+  junk-session-cookies.d \
+  keepalive-time.d \
+  key-type.d \
+  key.d \
+  krb.d \
+  libcurl.d \
+  limit-rate.d \
+  list-only.d \
+  local-port.d \
+  location-trusted.d \
+  location.d \
+  login-options.d \
+  mail-auth.d \
+  mail-from.d \
+  mail-rcpt-allowfails.d \
+  mail-rcpt.d \
+  manual.d \
+  max-filesize.d \
+  max-redirs.d \
+  max-time.d \
+  metalink.d \
+  negotiate.d \
+  netrc-file.d \
+  netrc-optional.d \
+  netrc.d \
+  next.d \
+  no-alpn.d \
+  no-buffer.d \
+  no-keepalive.d \
+  no-npn.d \
+  no-progress-meter.d \
+  no-sessionid.d \
+  noproxy.d \
+  ntlm-wb.d \
+  ntlm.d \
+  oauth2-bearer.d \
+  output-dir.d \
+  output.d \
+  parallel-immediate.d \
+  parallel-max.d \
+  parallel.d \
+  pass.d \
+  path-as-is.d \
+  pinnedpubkey.d \
+  post301.d \
+  post302.d \
+  post303.d \
+  preproxy.d \
+  progress-bar.d \
+  proto-default.d \
+  proto-redir.d \
+  proto.d \
+  proxy-anyauth.d \
+  proxy-basic.d \
+  proxy-cacert.d \
+  proxy-capath.d \
+  proxy-cert-type.d \
+  proxy-cert.d \
+  proxy-ciphers.d \
+  proxy-crlfile.d \
+  proxy-digest.d \
+  proxy-header.d \
+  proxy-insecure.d \
+  proxy-key-type.d \
+  proxy-key.d \
+  proxy-negotiate.d \
+  proxy-ntlm.d \
+  proxy-pass.d \
+  proxy-pinnedpubkey.d \
+  proxy-service-name.d \
+  proxy-ssl-allow-beast.d \
+  proxy-tls13-ciphers.d \
+  proxy-tlsauthtype.d \
+  proxy-tlspassword.d \
+  proxy-tlsuser.d \
+  proxy-tlsv1.d \
+  proxy-user.d \
+  proxy.d \
+  proxy1.0.d \
+  proxytunnel.d \
+  pubkey.d \
+  quote.d \
+  random-file.d \
+  range.d \
+  raw.d \
+  referer.d \
+  remote-header-name.d \
+  remote-name-all.d \
+  remote-name.d \
+  remote-time.d \
+  request-target.d \
+  request.d \
+  resolve.d \
+  retry-all-errors.d \
+  retry-connrefused.d \
+  retry-delay.d \
+  retry-max-time.d \
+  retry.d \
+  sasl-authzid.d \
+  sasl-ir.d \
+  service-name.d \
+  show-error.d \
+  silent.d \
+  socks4.d \
+  socks4a.d \
+  socks5-basic.d \
+  socks5-gssapi-nec.d \
+  socks5-gssapi-service.d \
+  socks5-gssapi.d \
+  socks5-hostname.d \
+  socks5.d \
+  speed-limit.d \
+  speed-time.d \
+  ssl-allow-beast.d \
+  ssl-no-revoke.d \
+  ssl-reqd.d \
+  ssl-revoke-best-effort.d \
+  ssl.d \
+  sslv2.d \
+  sslv3.d \
+  stderr.d \
+  styled-output.d \
+  suppress-connect-headers.d \
+  tcp-fastopen.d \
+  tcp-nodelay.d \
+  telnet-option.d \
+  tftp-blksize.d \
+  tftp-no-options.d \
+  time-cond.d \
+  tls-max.d \
+  tls13-ciphers.d \
+  tlsauthtype.d \
+  tlspassword.d \
+  tlsuser.d \
+  tlsv1.0.d \
+  tlsv1.1.d \
+  tlsv1.2.d \
+  tlsv1.3.d \
+  tlsv1.d \
+  tr-encoding.d \
+  trace-ascii.d \
+  trace-time.d \
+  trace.d \
+  unix-socket.d \
+  upload-file.d \
+  url.d \
+  use-ascii.d \
+  user-agent.d \
+  user.d \
+  verbose.d \
+  version.d \
+  write-out.d \
   xattr.d
 
 OTHERPAGES = page-footer page-header
diff --git a/docs/examples/Makefile.inc b/docs/examples/Makefile.inc
index 8b7b11b2c..defaad6d6 100644
--- a/docs/examples/Makefile.inc
+++ b/docs/examples/Makefile.inc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -21,28 +21,125 @@
 ###########################################################################
 
 # These are all libcurl example programs to be test compiled
-check_PROGRAMS = 10-at-a-time anyauthput cookie_interface debug fileupload \
-  fopen ftpget ftpgetresp ftpupload getinfo getinmemory http-post httpput  \
-  https multi-app multi-debugcallback multi-double multi-post multi-single \
-  persistent post-callback postit2 sepheaders simple simplepost simplessl  \
-  sendrecv httpcustomheader certinfo chkspeed ftpgetinfo ftp-wildcard      \
-  smtp-mail smtp-mime smtp-multi smtp-ssl smtp-tls smtp-vrfy smtp-expn     \
-  rtsp externalsocket resolve progressfunc pop3-retr pop3-list pop3-uidl   \
-  pop3-dele pop3-top pop3-stat pop3-noop pop3-ssl pop3-tls pop3-multi      \
-  imap-list imap-lsub imap-fetch imap-store imap-append imap-examine       \
-  imap-search imap-create imap-delete imap-copy imap-noop imap-ssl         \
-  imap-tls imap-multi url2file sftpget ftpsget postinmemory http2-download \
-  http2-upload http2-serverpush getredirect ftpuploadfrommem               \
-  ftpuploadresume sslbackend postit2-formadd multi-formadd                 \
-  shared-connection-cache sftpuploadresume http2-pushinmemory parseurl     \
-  urlapi imap-authzid pop3-authzid smtp-authzid http3 altsvc               \
-  http3-present multi-poll httpput-postfields
+check_PROGRAMS = \
+  10-at-a-time \
+  altsvc \
+  anyauthput \
+  certinfo \
+  chkspeed \
+  cookie_interface \
+  debug \
+  externalsocket \
+  fileupload \
+  fopen \
+  ftp-wildcard \
+  ftpget \
+  ftpgetinfo \
+  ftpgetresp \
+  ftpsget \
+  ftpupload \
+  ftpuploadfrommem \
+  ftpuploadresume \
+  getinfo \
+  getinmemory \
+  getredirect \
+  http-post \
+  http2-download \
+  http2-pushinmemory \
+  http2-serverpush \
+  http2-upload \
+  http3 \
+  http3-present \
+  httpcustomheader \
+  httpput \
+  httpput-postfields \
+  https \
+  imap-append \
+  imap-authzid \
+  imap-copy \
+  imap-create \
+  imap-delete \
+  imap-examine \
+  imap-fetch \
+  imap-list \
+  imap-lsub \
+  imap-multi \
+  imap-noop \
+  imap-search \
+  imap-ssl \
+  imap-store \
+  imap-tls \
+  multi-app \
+  multi-debugcallback \
+  multi-double \
+  multi-formadd \
+  multi-poll \
+  multi-post \
+  multi-single \
+  parseurl \
+  persistent \
+  pop3-authzid \
+  pop3-dele \
+  pop3-list \
+  pop3-multi \
+  pop3-noop \
+  pop3-retr \
+  pop3-ssl \
+  pop3-stat \
+  pop3-tls \
+  pop3-top \
+  pop3-uidl \
+  post-callback \
+  postinmemory \
+  postit2 \
+  postit2-formadd \
+  progressfunc \
+  resolve \
+  rtsp \
+  sendrecv \
+  sepheaders \
+  sftpget \
+  sftpuploadresume \
+  shared-connection-cache \
+  simple \
+  simplepost \
+  simplessl \
+  smtp-authzid \
+  smtp-expn \
+  smtp-mail \
+  smtp-mime \
+  smtp-multi \
+  smtp-ssl \
+  smtp-tls \
+  smtp-vrfy \
+  sslbackend \
+  url2file \
+  urlapi
 
 # These examples require external dependencies that may not be commonly
 # available on POSIX systems, so don't bother attempting to compile them here.
-COMPLICATED_EXAMPLES = curlgtk.c curlx.c htmltitle.cpp cacertinmem.c \
-  ghiper.c hiperfifo.c htmltidy.c multithread.c opensslthreadlock.c \
-  sampleconv.c synctime.c threaded-ssl.c evhiperfifo.c \
-  smooth-gtk-thread.c version-check.pl href_extractor.c \
-  multi-uv.c xmlstream.c usercertinmem.c sessioninfo.c \
-  threaded-shared-conn.c crawler.c ephiperfifo.c multi-event.c
+COMPLICATED_EXAMPLES = \
+  cacertinmem.c \
+  crawler.c \
+  curlgtk.c \
+  curlx.c \
+  ephiperfifo.c \
+  evhiperfifo.c \
+  ghiper.c \
+  hiperfifo.c \
+  href_extractor.c \
+  htmltidy.c \
+  htmltitle.cpp \
+  multi-event.c \
+  multi-uv.c \
+  multithread.c \
+  opensslthreadlock.c \
+  sampleconv.c \
+  sessioninfo.c \
+  smooth-gtk-thread.c \
+  synctime.c \
+  threaded-shared-conn.c \
+  threaded-ssl.c \
+  usercertinmem.c \
+  version-check.pl \
+  xmlstream.c