diff options
author | Gerald Combs <gerald@wireshark.org> | 2019-05-28 13:47:15 -0700 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-05-29 04:00:42 +0000 |
commit | 2eb1a0dd6102e6a2958457d12fc85becb30358d6 (patch) | |
tree | 30919ea29aaaa713a07b39dc8d209bd2a750741c | |
parent | 4997002458e5262aa88c3b0d8a132d2237f909d4 (diff) |
Use the HTTPS URL for our main site in a few places.
Fixup the encoding of plugins/plugin.rc.in while we're here.
Change-Id: I21b56ce68bc3d84298a846a991c72bf710b9ae8a
Reviewed-on: https://code.wireshark.org/review/33414
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/copyright | 2 | ||||
-rwxr-xr-x | doc/extcap_example.py | 4 | ||||
-rw-r--r-- | image/libwireshark.rc.in | 2 | ||||
-rw-r--r-- | image/libwscodecs.rc.in | 2 | ||||
-rw-r--r-- | image/libwsutil.rc.in | 2 | ||||
-rw-r--r-- | image/wireshark.rc.in | 2 | ||||
-rw-r--r-- | image/wiretap.rc.in | 2 | ||||
-rw-r--r-- | plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui | 2 | ||||
-rw-r--r-- | plugins/plugin.rc.in | 5 | ||||
-rw-r--r-- | ui/qt/about_dialog.cpp | 2 | ||||
-rw-r--r-- | wireshark.appdata.xml | 4 |
13 files changed, 17 insertions, 16 deletions
@@ -200,5 +200,5 @@ README.windows for those instructions. If you have trouble with the build or installation process, you can find assistance on the wireshark-users and wireshark-dev mailing lists (see -http://www.wireshark.org/lists/ for details) or the Wireshark Q&A site: +https://www.wireshark.org/lists/ for details) or the Wireshark Q&A site: https://ask.wireshark.org . diff --git a/debian/control b/debian/control index 58b68eac8c..6e6a027917 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: lsb-release, Build-Conflicts: libsnmp4.2-dev, libsnmp-dev Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/ -Homepage: http://www.wireshark.org/ +Homepage: https://www.wireshark.org/ Package: wireshark-common Architecture: any diff --git a/debian/copyright b/debian/copyright index ca93518d16..dd6302e004 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Wireshark -Source: http://www.wireshark.org/ +Source: https://www.wireshark.org/ Files-Excluded: debian Files: * diff --git a/doc/extcap_example.py b/doc/extcap_example.py index fa72e01a2a..e72560974f 100755 --- a/doc/extcap_example.py +++ b/doc/extcap_example.py @@ -170,10 +170,10 @@ def extcap_config(interface, option): def extcap_version(): - print ("extcap {version=1.0}{help=http://www.wireshark.org}{display=Example extcap interface}") + print ("extcap {version=1.0}{help=https://www.wireshark.org}{display=Example extcap interface}") def extcap_interfaces(): - print ("extcap {version=1.0}{help=http://www.wireshark.org}{display=Example extcap interface}") + print ("extcap {version=1.0}{help=https://www.wireshark.org}{display=Example extcap interface}") print ("interface {value=example1}{display=Example interface 1 for extcap}") print ("interface {value=example2}{display=Example interface 2 for extcap}") print ("control {number=%d}{type=string}{display=Message}{tooltip=Package message content. Must start with a capital letter.}{placeholder=Enter package message content here ...}{validation=^[A-Z]+}" % CTRL_ARG_MESSAGE) diff --git a/image/libwireshark.rc.in b/image/libwireshark.rc.in index 7be0004e84..6a52b9acbc 100644 --- a/image/libwireshark.rc.in +++ b/image/libwireshark.rc.in @@ -18,7 +18,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark dissector library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "libwireshark @VERSION@\0" diff --git a/image/libwscodecs.rc.in b/image/libwscodecs.rc.in index 64080a7d86..e529975fec 100644 --- a/image/libwscodecs.rc.in +++ b/image/libwscodecs.rc.in @@ -18,7 +18,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark codecs library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "libwscodecs @VERSION@\0" diff --git a/image/libwsutil.rc.in b/image/libwsutil.rc.in index 235774cdff..54d1e9a888 100644 --- a/image/libwsutil.rc.in +++ b/image/libwsutil.rc.in @@ -18,7 +18,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark utility library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "libwsutil @VERSION@\0" diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in index 2a1f2dafcd..ba337e6e9d 100644 --- a/image/wireshark.rc.in +++ b/image/wireshark.rc.in @@ -21,7 +21,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Wireshark @VERSION@\0" diff --git a/image/wiretap.rc.in b/image/wiretap.rc.in index c82e483f1f..31ed0a0245 100644 --- a/image/wiretap.rc.in +++ b/image/wiretap.rc.in @@ -18,7 +18,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark capture file library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "wiretap @VERSION@\0" diff --git a/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui index 2353dd76ac..faf560b417 100644 --- a/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui +++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui @@ -73,7 +73,7 @@ <item> <widget class="QLabel" name="lblAboutDialog"> <property name="text"> - <string><html><head/><body><p><span style=" font-size:10pt;"><br/></span><span style=" font-size:10pt; font-weight:600;">PlugIn Interface Demonstration</span><span style=" font-size:10pt;"><br/>Version: </span><span style=" font-size:10pt; font-weight:600;">0.0.1 </span></p><p><span style=" font-size:10pt;">Copyright © </span><span style=" font-size:10pt; font-style:italic;">Wireshark Foundation</span><span style=" font-size:10pt;"><br/></span><a href="http://www.wireshark.org"><span style=" text-decoration: underline; color:#0000ff;">www.wireshark.org</span></a></p></body></html></string> + <string><html><head/><body><p><span style=" font-size:10pt;"><br/></span><span style=" font-size:10pt; font-weight:600;">PlugIn Interface Demonstration</span><span style=" font-size:10pt;"><br/>Version: </span><span style=" font-size:10pt; font-weight:600;">0.0.1 </span></p><p><span style=" font-size:10pt;">Copyright © </span><span style=" font-size:10pt; font-style:italic;">Wireshark Foundation</span><span style=" font-size:10pt;"><br/></span><a href="https://www.wireshark.org"><span style=" text-decoration: underline; color:#0000ff;">www.wireshark.org</span></a></p></body></html></string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/plugins/plugin.rc.in b/plugins/plugin.rc.in index 60a90cfbdb..368c6f4748 100644 --- a/plugins/plugin.rc.in +++ b/plugins/plugin.rc.in @@ -1,4 +1,5 @@ #include "winver.h" +#pragma code_page(65001) VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_MODULE_VERSION@ @@ -16,11 +17,11 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" VALUE "FileDescription", "@MODULE_NAME@ dissector\0" VALUE "FileVersion", "@MODULE_VERSION@\0" VALUE "InternalName", "@MODULE_NAME@ @MODULE_VERSION@\0" - VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" + VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" VALUE "OriginalFilename", "@MODULE_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@PROJECT_VERSION@\0" diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index ff28775b06..1045578c34 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -302,7 +302,7 @@ AboutDialog::AboutDialog(QWidget *parent) : message += "<p>" + html_escape(runtime_info_str) + "</p>\n\n"; message += "<p>Wireshark is Open Source Software released under the GNU General Public License.</p>\n\n"; message += "<p>Check the man page and "; - message += "<a href=http://www.wireshark.org>http://www.wireshark.org</a> "; + message += "<a href=https://www.wireshark.org>https://www.wireshark.org</a> "; message += "for more information.</p>\n\n"; ui->pte_wireshark->setFrameStyle(QFrame::NoFrame); diff --git a/wireshark.appdata.xml b/wireshark.appdata.xml index 26dda5eebd..4be781ff8c 100644 --- a/wireshark.appdata.xml +++ b/wireshark.appdata.xml @@ -43,8 +43,8 @@ </description> <url type="homepage">https://www.wireshark.org</url> <screenshots> - <screenshot type="default">http://www.wireshark.org/~morriss/Screenshot-Wireshark2.0-Http-cap.png</screenshot> - <screenshot>http://www.wireshark.org/~morriss/Screenshot-Wireshark2.0-Stevens-graph.png</screenshot> + <screenshot type="default">https://www.wireshark.org/~morriss/Screenshot-Wireshark2.0-Http-cap.png</screenshot> + <screenshot>https://www.wireshark.org/~morriss/Screenshot-Wireshark2.0-Stevens-graph.png</screenshot> </screenshots> <updatecontact>wireshark-dev_at_wireshark.org</updatecontact> </application> |