aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-09-16 17:15:56 -0700
committerGerald Combs <gerald@wireshark.org>2014-09-17 00:17:09 +0000
commit71bb17102e64bb35681236ff9668b71d4ee265e6 (patch)
tree94bb93db65fa2da885d8138a03053fd202e19547 /docbook
parent175039128a10b083bcc20af88531b38709423964 (diff)
Update the docbook directory to use https://www.wireshark.org.
Change-Id: Ied91158cb055b0235b4a5106c3eb6b9300997c32 Reviewed-on: https://code.wireshark.org/review/4141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
-rw-r--r--docbook/release-notes.asciidoc8
-rw-r--r--docbook/user-guide.xml2
-rw-r--r--docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc6
-rw-r--r--docbook/wsug_src/WSUG_app_tools.xml18
-rw-r--r--docbook/wsug_src/WSUG_chapter_customize.xml2
-rw-r--r--docbook/wsug_src/WSUG_chapter_work.asciidoc4
6 files changed, 20 insertions, 20 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 4d550ae95b..bf8683fb4a 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -156,14 +156,14 @@ use Lua.
== Getting Wireshark
Wireshark source code and installation packages are available from
-http://www.wireshark.org/download.html.
+https://www.wireshark.org/download.html.
=== Vendor-supplied Packages
Most Linux and Unix vendors supply their own Wireshark packages. You can
usually install or upgrade Wireshark using the package management system
specific to that platform. A list of third-party packages can be found
-on the http://www.wireshark.org/download.html#thirdparty[download page]
+on the https://www.wireshark.org/download.html#thirdparty[download page]
on the Wireshark web site.
== File Locations
@@ -215,7 +215,7 @@ The 64-bit Mac OS X installer doesn't support Mac OS X 10.9 (ws-buglink:9242[])
Community support is available on http://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 http://www.wireshark.org/lists/[the web site].
+found on https://www.wireshark.org/lists/[the web site].
Official Wireshark training and certification are available from
http://www.wiresharktraining.com/[Wireshark University].
@@ -223,4 +223,4 @@ http://www.wiresharktraining.com/[Wireshark University].
== Frequently Asked Questions
A complete FAQ is available on the
-http://www.wireshark.org/faq.html[Wireshark web site].
+https://www.wireshark.org/faq.html[Wireshark web site].
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 84d2a41b88..eb20e44265 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -86,7 +86,7 @@ DOCUMENT SECTION
Wireshark Info
-->
<!ENTITY WiresharkCurrentVersion "1.99">
- <!ENTITY WiresharkWebSite "http://www.wireshark.org">
+ <!ENTITY WiresharkWebSite "https://www.wireshark.org">
<!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/">
<!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download.html">
<!ENTITY WiresharkBinariesPage "&WiresharkWebSite;/download.html">
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index c270f91bd7..d8c8040f52 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -284,7 +284,7 @@ be spent on more interesting tasks.
* "Up to date" binary packages are available. After a change was committed to
the repository, a binary package / installer is usually available within a few
- hours at: http://www.wireshark.org/download/automated/[]. This can be quite
+ hours at: https://www.wireshark.org/download/automated/[]. This can be quite
helpful, e.g. a bug reporter can easily verify a bugfix by installing a recent
build.
@@ -565,9 +565,9 @@ mailto:wireshark-dev-list-email:[][wireshark-dev mailing list], or attach it to
You can download Windows debugging symbol files (.pdb) from the following locations:
-* 32-bit Windows: http://www.wireshark.org/download/win32/all-versions/
+* 32-bit Windows: https://www.wireshark.org/download/win32/all-versions/
-* 64-bit Windows: http://www.wireshark.org/download/win64/all-versions/
+* 64-bit Windows: https://www.wireshark.org/download/win64/all-versions/
Files are named "Wireshark-pdb-win__bits__-_x_._y_._z_.zip" to match their
corresponding "Wireshark-win__bits__-_x_._y_._z_.exe" installer packages.
diff --git a/docbook/wsug_src/WSUG_app_tools.xml b/docbook/wsug_src/WSUG_app_tools.xml
index fe8d8828b4..431f8c93b3 100644
--- a/docbook/wsug_src/WSUG_app_tools.xml
+++ b/docbook/wsug_src/WSUG_app_tools.xml
@@ -28,7 +28,7 @@
<programlisting>
TShark 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Dump and analyze network traffic.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Copyright 1998-2014 Gerald Combs &lt;gerald@wireshark.org&gt; and contributors.
This is free software; see the source for copying conditions. There is NO
@@ -184,7 +184,7 @@ tcpdump -i &lt;interface> -s 65535 -w &lt;some-file>
<programlisting>
Dumpcap 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Capture network packets and dump them into a pcapng file.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: dumpcap [options] ...
@@ -262,7 +262,7 @@ Use Ctrl-C to stop capturing at any time.
<programlisting>
Capinfos 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Prints various information (infos) about capture files.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: capinfos [options] &lt;infile&gt; ...
@@ -336,7 +336,7 @@ output format.
<programlisting>
Rawshark 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Dump and analyze network traffic.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Copyright 1998-2014 Gerald Combs &lt;gerald@wireshark.org&gt; and contributors.
This is free software; see the source for copying conditions. There is NO
@@ -390,7 +390,7 @@ Miscellaneous:
<programlisting>
Editcap 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Edit and/or translate the format of capture files.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: editcap [options] ... &lt;infile&gt; &lt;outfile&gt; [ &lt;packet#&gt;[-&lt;packet#&gt;] ... ]
@@ -498,7 +498,7 @@ editcap: The available capture file types for the "-F" flag are:
ngwsniffer_1_1 - NetXray, Sniffer (Windows) 1.1
ngwsniffer_2_0 - Sniffer (Windows) 2.00x
niobserver - Network Instruments Observer
- nokialibpcap - Nokia tcpdump - libpcap
+ nokialibpcap - Nokia tcpdump - libpcap
nseclibpcap - Wireshark - nanosecond libpcap
nstrace10 - NetScaler Trace (Version 1.0)
nstrace20 - NetScaler Trace (Version 2.0)
@@ -771,7 +771,7 @@ editcap: The available encapsulation types for the "-T" flag are:
<programlisting>
Mergecap 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Merge two or more capture files into one.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: mergecap [options] -w &lt;outfile&gt;|- &lt;infile&gt; [&lt;infile&gt; ...]
@@ -875,7 +875,7 @@ Miscellaneous:
<programlisting>
Text2pcap 1.99.0 (v1.99.0-rc1-448-gd344a38 from master)
Generate a capture file from an ASCII hexdump of packets.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: text2pcap [options] &lt;infile&gt; &lt;outfile&gt;
@@ -1198,7 +1198,7 @@ CLEAN_DISSECTOR_SRC = \
<programlisting>
Reordercap 1.99.0
Reorder timestamps of input file frames into output file.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Usage: reordercap [options] &lt;infile&gt; &lt;outfile&gt;
diff --git a/docbook/wsug_src/WSUG_chapter_customize.xml b/docbook/wsug_src/WSUG_chapter_customize.xml
index 2c5ba22f7e..c0da6a9353 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.xml
+++ b/docbook/wsug_src/WSUG_chapter_customize.xml
@@ -51,7 +51,7 @@
<programlisting>
Wireshark 1.9.0 (SVN Rev 47047 from /trunk)
Interactively dump and analyze network traffic.
-See http://www.wireshark.org for more information.
+See https://www.wireshark.org for more information.
Copyright 1998-2013 Gerald Combs &lt;gerald@wireshark.org&gt; and contributors.
This is free software; see the source for copying conditions. There is NO
diff --git a/docbook/wsug_src/WSUG_chapter_work.asciidoc b/docbook/wsug_src/WSUG_chapter_work.asciidoc
index 84c7f310ad..c297dda10a 100644
--- a/docbook/wsug_src/WSUG_chapter_work.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_work.asciidoc
@@ -321,7 +321,7 @@ Classless InterDomain Routing (CIDR) notation can be used to test if an IPv4 add
ip.addr == 129.111.0.0/16
|IPv6 address|ipv6.addr == ::1
-|String (text)|http.request.uri == "http://www.wireshark.org/"
+|String (text)|http.request.uri == "https://www.wireshark.org/"
|===============
==== Combining expressions
@@ -796,4 +796,4 @@ the last time reference.
++++++++++++++++++++++++++++++++++++++
<!-- End of WSUG Chapter Work -->
-++++++++++++++++++++++++++++++++++++++ \ No newline at end of file
+++++++++++++++++++++++++++++++++++++++