Change a lot of http:// URLs to https://.

Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

4 files changed, 25 insertions, 25 deletions

diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 117c54aa9d..340b1b53bf 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -22,17 +22,17 @@ wireshark-git-http-url:\[\]=https://your.username@code.wireshark.org/review/wire
 wireshark-git-ssh-url:\[\]=ssh://your.username@code.wireshark.org:29418/wireshark
 wireshark-buildbot-url:\[\]=http://buildbot.wireshark.org/trunk/waterfall
 wireshark-mailing-lists-url:\[\]=https://www.wireshark.org/lists/
-wireshark-qa-url:\[\]=http://ask.wireshark.org/
+wireshark-qa-url:\[\]=https://ask.wireshark.org/
 wireshark-users-guide-url:\[\]=https://www.wireshark.org/docs/
 wireshark-web-site:\[\]=https://www.wireshark.org/
-wireshark-wiki-site:\[\]=http://wiki.wireshark.org/
+wireshark-wiki-site:\[\]=https://wiki.wireshark.org/
 
 tcpdump-web-site:\[\]=http://www.tcpdump.org/
 tcpdump-man-page-url:\[\]=http://www.tcpdump.org/manpages/tcpdump.1.html
 pcap-filter-man-page-url:\[\]=http://www.tcpdump.org/manpages/pcap-filter.7.html
 
-winpcap-web-site:\[\]=http://www.winpcap.org/
-winpcap-download-page:\[\]=http://www.winpcap.org/install/
+winpcap-web-site:\[\]=https://www.winpcap.org/
+winpcap-download-page:\[\]=https://www.winpcap.org/install/
 
 wikipedia-web-site:\[\]=https://en.wikipedia.org/wiki/
 sysfs-web-site:\[\]=http://linux-diag.sourceforge.net/Sysfsutils.html
@@ -49,7 +49,7 @@ wsug-author-email2:\[\]=rsharpe[AT]ns.aus.com
 wsug-author-email3:\[\]=hagbard[AT]physics.rutgers.edu
 wsug-author-email4:\[\]=luis[AT]ontanon.org
 
-gpl-url:\[\]=http://www.gnu.org/licenses/gpl-2.0.html
+gpl-url:\[\]=https://www.gnu.org/licenses/gpl-2.0.html
 
 [macros]
 
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 89c3ac9720..ea12877b57 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -227,7 +227,7 @@ Wireshark should let you work with multiple capture files. (ws-buglink:10488[])
 
 == Getting Help
 
-Community support is available on http://ask.wireshark.org/[Wireshark's
+Community support is available on https://ask.wireshark.org/[Wireshark's
 Q&A site] and on the wireshark-users mailing list. Subscription
 information and archives for all of Wireshark's mailing lists can be
 found on https://www.wireshark.org/lists/[the web site].
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
index 655b76d7f1..78130d229f 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
@@ -24,8 +24,8 @@ build Wireshark.
 .Our libraries are freely available
 ====
 All libraries required to build Wireshark on Windows are available for download at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and
-http://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and
+https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[].
 See <<ChLibsSetup>> for an easier way to install them.
 ====
 
@@ -106,7 +106,7 @@ as described in <<ChToolsWin32Verify>>.
 
 Then it will download the zipped libraries (together around 45MB for x86 and 52MB for x64) from the
 server location at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] into the
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] into the
 directory specified by WIRESHARK_LIB_DIR and install (unzip) all required
 library files there.
 
@@ -207,7 +207,7 @@ http://www.ibr.cs.tu-bs.de/projects/libsmi/[].
 Wireshark uses the source libSMI distribution at
 http://www.ibr.cs.tu-bs.de/projects/libsmi/[].
 LibSMI is cross-compiled using MinGW32. It's stored in the libsmi zip archive at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
 
 [[ChLibsCares]]
 
@@ -256,7 +256,7 @@ http://www.zlib.net/[].
 ==== Win32 MSVC
 
 The zlib sources are downloaded from
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled
 locally.
 
 [[ChLibsPcap]]
@@ -278,7 +278,7 @@ platform, you can get it at http://www.tcpdump.org/[].
 ==== Win32 MSVC: WinPcap
 
 You can get the "Windows packet capture library" at:
-http://www.winpcap.org/install/[]
+https://www.winpcap.org/install/[]
 
 [[ChLibsGNUTLS]]
 
@@ -293,14 +293,14 @@ protocols (aka: HTTPS).
 
 If this library isn't already installed or available as a
 package for your platform, you can get it at
-http://www.gnu.org/software/gnutls/download.html[].
+https://www.gnu.org/software/gnutls/download.html[].
 
 [[ChLibsWin32GNUTLS]]
 
 ==== Win32 MSVC
 
 We provide a package cross-compiled using MinGW32 at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
 
 [[ChLibsGcrypt]]
 
@@ -315,7 +315,7 @@ support for many ciphers, such as DES, 3DES, AES, Blowfish, and others..
 
 If this library isn't already installed or available as a
 package for your platform, you can get it at
-http://directory.fsf.org/security/libgcrypt.html[].
+https://directory.fsf.org/wiki/Libgcrypt[].
 
 [[ChLibsWin32Gcrypt]]
 
@@ -343,7 +343,7 @@ http://web.mit.edu/Kerberos/dist/[].
 ==== Win32 MSVC
 
 We provide a package at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
 
 [[ChLibsLua]]
 
@@ -364,7 +364,7 @@ http://www.lua.org/download.html[].
 ==== Win32 MSVC
 
 We provide a copy of the official package at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
 
 [[ChLibsPortAudio]]
 
@@ -385,7 +385,7 @@ http://www.portaudio.com/download.html[].
 ==== Win32 MSVC
 
 The PortAudio sources are downloaded from
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled
 locally.
 
 [[ChLibsGeoIP]]
@@ -408,7 +408,7 @@ http://www.maxmind.com/app/c[].
 ==== Win32 MSVC
 
 We provide a package cross-compiled using MinGW32 at
-http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
+https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSDG Chapter Libraries -->
diff --git a/docbook/wsug_src/WSUG_app_files.asciidoc b/docbook/wsug_src/WSUG_app_files.asciidoc
index 3d85e418e1..8ad5812ec4 100644
--- a/docbook/wsug_src/WSUG_app_files.asciidoc
+++ b/docbook/wsug_src/WSUG_app_files.asciidoc
@@ -16,12 +16,12 @@ are saved to a capture file, it's helpful to know a bit about the capture file
 contents.
 
 Wireshark uses the
-link:http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html[pcapng] file
+link:https://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html[pcapng] file
 format as the default format to save captured packets. It is very flexible
 but other tools may not support it.
 
 Wireshark also supports the
-link:http://wiki.wireshark.org/Development/LibpcapFileFormat[libpcap] file
+link:https://wiki.wireshark.org/Development/LibpcapFileFormat[libpcap] file
 format. This is a much simpler format and is well established. However, it has
 some drawbacks: it's not extensible and lacks some information that would be
 really helpful (e.g. being able to add a comment to a packet such as ``the
@@ -51,7 +51,7 @@ The following data is saved for each packet:
 * The packet's raw bytes
 
 A detailed description of the libpcap file format can be found at:
-link:$$http://wiki.wireshark.org/Development/LibpcapFileFormat$$[]
+link:$$https://wiki.wireshark.org/Development/LibpcapFileFormat$$[]
 
 [[ChIOFileNotContentSection]]
 
@@ -407,7 +407,7 @@ contains the following:
 [database]
 source=Wikipedia
 version=1
-url_template=http://${language}.wikipedia.org/wiki/${PATH}
+url_template=https://${language}.wikipedia.org/wiki/${PATH}
 
 # Substitution data for the location template.
 # Each occurrence of the keys below in the location template will be
@@ -446,7 +446,7 @@ configuration:
 [database]
 source=Wikipedia
 version=1
-location=http://en.wikipedia.org/wiki/
+location=https://en.wikipedia.org/wiki/
 
 [map]
 tcp=TCP
@@ -541,4 +541,4 @@ _C:\TEMP_
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSUG Appendix Files -->
-++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
+++++++++++++++++++++++++++++++++++++++