Merge branch 'HolySmoke86-issue2039'

README.asciidoc

@@ -16,7 +16,7 @@ image:https://travis-ci.org/The-Compiler/qutebrowser.svg?branch=master["Build St
 image:https://ci.appveyor.com/api/projects/status/9gmnuip6i1oq7046?svg=true["AppVeyor build status", link="https://ci.appveyor.com/project/The-Compiler/qutebrowser"]
 image:https://codecov.io/github/The-Compiler/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/The-Compiler/qutebrowser?branch=master"]
 
-link:http://www.qutebrowser.org[website] | link:http://blog.qutebrowser.org[blog] | link:https://github.com/The-Compiler/qutebrowser/releases[releases]
+link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | link:https://github.com/The-Compiler/qutebrowser/releases[releases]
 // QUTE_WEB_HIDE_END
 
 qutebrowser is a keyboard-focused browser with a minimal GUI. It's based
@@ -48,8 +48,8 @@ Documentation
 In addition to the topics mentioned in this README, the following documents are
 available:
 
-* A http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]: +
+* A https://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]: +
-image:http://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="http://qutebrowser.org/img/cheatsheet-big.png"]
+image:https://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://qutebrowser.org/img/cheatsheet-big.png"]
 * link:doc/quickstart.asciidoc[Quick start guide]
 * A https://www.shortcutfoo.com/app/dojos/qutebrowser[free training course] to remember those key bindings.
 * link:FAQ.asciidoc[Frequently asked questions]
@@ -90,7 +90,7 @@ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
 mailto:qutebrowser@lists.qutebrowser.org[].
 
 For security bugs, please contact me directly at mail@qutebrowser.org, GPG ID
-http://www.the-compiler.org/pubkey.asc[0xFD55A072].
+https://www.the-compiler.org/pubkey.asc[0xFD55A072].
 
 Requirements
 ------------

doc/help/settings.asciidoc

@@ -1560,7 +1560,7 @@ The file can be in one of the following formats:
 - One host per line
 - A zip-file of any of the above, with either only one file, or a file named 'hosts' (with any extension).
 
-Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext]+
+Default: +pass:[https://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext]+
 
 [[content-host-blocking-enabled]]
 === host-blocking-enabled
@@ -1718,7 +1718,7 @@ The searchengine named `DEFAULT` is used when `general -> auto-search` is true a
 Aliases for commands.
 By default, no aliases are defined. Example which adds a new command `:qtb` to open qutebrowsers website:
 
-`qtb = open http://www.qutebrowser.org/`
+`qtb = open https://www.qutebrowser.org/`
 
 == colors
 Colors used in the UI.

doc/qutebrowser.1.asciidoc

@@ -7,7 +7,7 @@
 :man source: qutebrowser
 :man manual: qutebrowser manpage
 :toc:
-:homepage: http://www.qutebrowser.org/
+:homepage: https://www.qutebrowser.org/
 
 == NAME
 qutebrowser - a keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.
@@ -143,7 +143,7 @@ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
 mailto:qutebrowser@lists.qutebrowser.org[] instead.
 
 For security bugs, please contact me directly at me@the-compiler.org, GPG ID
-http://www.the-compiler.org/pubkey.asc[0xFD55A072].
+https://www.the-compiler.org/pubkey.asc[0xFD55A072].
 
 == COPYRIGHT
 This program is free software: you can redistribute it and/or modify it under
@@ -159,7 +159,7 @@ You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 == RESOURCES
-* Website: http://www.qutebrowser.org/
+* Website: https://www.qutebrowser.org/
 * Mailinglist: mailto:qutebrowser@lists.qutebrowser.org[] /
 https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser
 * Announce-only mailinglist: mailto:qutebrowser-announce@lists.qutebrowser.org[] /

misc/cheatsheet.svg

@@ -2539,7 +2539,7 @@
            y="10"
            style="font-size:10px" /></flowRegion><flowPara
          id="flowPara5604"
-         style="font-size:13px">Website: http://www.qutebrowser.org/ </flowPara><flowPara
+         style="font-size:13px">Website: https://www.qutebrowser.org/ </flowPara><flowPara
          id="flowPara5595"
          style="font-size:13px">IRC: #qutebrowser on Freenode</flowPara><flowPara
          id="flowPara5597"

qutebrowser/app.py

@@ -329,7 +329,7 @@ def _open_quickstart(args):
         tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window='last-focused')
         tabbed_browser.tabopen(
-            QUrl('http://www.qutebrowser.org/quickstart.html'))
+            QUrl('https://www.qutebrowser.org/quickstart.html'))
         state_config['general']['quickstart-done'] = '1'
 
 

qutebrowser/config/configdata.py

@@ -90,7 +90,7 @@ SECTION_DESC = {
         "Aliases for commands.\n"
         "By default, no aliases are defined. Example which adds a new command "
         "`:qtb` to open qutebrowsers website:\n\n"
-        "`qtb = open http://www.qutebrowser.org/`"),
+        "`qtb = open https://www.qutebrowser.org/`"),
     'colors': (
         "Colors used in the UI.\n"
         "A value can be in one of the following format:\n\n"
@@ -871,11 +871,11 @@ def data(readonly=False):
             ('host-block-lists',
              SettingValue(
                  typ.List(typ.Url(), none_ok=True),
-                 'http://www.malwaredomainlist.com/hostslist/hosts.txt,'
+                 'https://www.malwaredomainlist.com/hostslist/hosts.txt,'
                  'http://someonewhocares.org/hosts/hosts,'
                  'http://winhelp2002.mvps.org/hosts.zip,'
                  'http://malwaredomains.lehigh.edu/files/justdomains.zip,'
-                 'http://pgl.yoyo.org/adservers/serverlist.php?'
+                 'https://pgl.yoyo.org/adservers/serverlist.php?'
                  'hostformat=hosts&mimetype=plaintext'),
              "List of URLs of lists which contain hosts to block.\n\n"
              "The file can be in one of the following formats:\n\n"

qutebrowser/misc/crashdialog.py

@@ -381,7 +381,7 @@ class _CrashDialog(QDialog):
         lines = ['The report has been sent successfully. Thanks!']
         lines.append("There was an error while getting the newest version: "
                      "{}. Please check for a new version on "
-                     "<a href=http://www.qutebrowser.org/>qutebrowser.org</a> "
+                     "<a href=https://www.qutebrowser.org/>qutebrowser.org</a> "
                      "by yourself.".format(msg))
         text = '<br/><br/>'.join(lines)
         self.finish()

scripts/dev/ci/appveyor_install.py

@@ -47,7 +47,7 @@ def pip_install(pkg):
 print("Getting PyQt5...")
 qt_version = '5.5.1'
 pyqt_version = '5.5.1'
-pyqt_url = ('http://www.qutebrowser.org/pyqt/'
+pyqt_url = ('https://www.qutebrowser.org/pyqt/'
             'PyQt5-{}-gpl-Py3.4-Qt{}-x32.exe'.format(
                 pyqt_version, qt_version))
 

scripts/setupcommon.py

@@ -104,7 +104,7 @@ setupdata = {
     'version': '.'.join(str(e) for e in _get_constant('version_info')),
     'description': _get_constant('description'),
     'long_description': read_file('README.asciidoc'),
-    'url': 'http://www.qutebrowser.org/',
+    'url': 'https://www.qutebrowser.org/',
     'requires': ['pypeg2', 'jinja2', 'pygments', 'PyYAML'],
     'author': _get_constant('author'),
     'author_email': _get_constant('email'),