From c198f3a6a344ca1cbfd8cc8937201b0aa14fe31b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 7 Feb 2017 23:27:44 +0100 Subject: [PATCH] Adjust descriptions and dependencies See #1571 --- README.asciidoc | 6 +++--- doc/qutebrowser.1.asciidoc | 2 +- qutebrowser/__init__.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index a33738589..d25d02a61 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -7,7 +7,7 @@ qutebrowser =========== // QUTE_WEB_HIDE -image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.* +image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.* image:https://img.shields.io/pypi/l/qutebrowser.svg?style=flat["license badge",link="https://github.com/qutebrowser/qutebrowser/blob/master/COPYING"] image:https://img.shields.io/pypi/v/qutebrowser.svg?style=flat["version badge",link="https://pypi.python.org/pypi/qutebrowser/"] @@ -20,7 +20,7 @@ link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[bl // QUTE_WEB_HIDE_END qutebrowser is a keyboard-focused browser with a minimal GUI. It's based -on Python, PyQt5 and QtWebKit and free software, licensed under the GPL. +on Python and PyQt5 and free software, licensed under the GPL. It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. @@ -99,7 +99,7 @@ The following software and libraries are required to run qutebrowser: * http://www.python.org/[Python] 3.4 or newer * http://qt.io/[Qt] 5.2.0 or newer (5.5.1 recommended) -* QtWebKit +* QtWebKit (old or link:https://github.com/annulen/webkit/wiki[reloaded]/NG) or QtWebEngine * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2.0 or newer (5.5.1 recommended) for Python 3 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools] diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc index b427ed012..36530bffe 100644 --- a/doc/qutebrowser.1.asciidoc +++ b/doc/qutebrowser.1.asciidoc @@ -10,7 +10,7 @@ :homepage: https://www.qutebrowser.org/ == NAME -qutebrowser - a keyboard-driven, vim-like browser based on PyQt5 and QtWebKit. +qutebrowser - a keyboard-driven, vim-like browser based on PyQt5. == SYNOPSIS *qutebrowser* ['-OPTION' ['...']] [':COMMAND' ['...']] ['URL' ['...']] diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index 514254066..7e2f2140a 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -19,7 +19,7 @@ # pylint: disable=line-too-long -"""A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.""" +"""A keyboard-driven, vim-like browser based on PyQt5.""" import os.path @@ -30,6 +30,6 @@ __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" __version_info__ = (0, 9, 1) __version__ = '.'.join(str(e) for e in __version_info__) -__description__ = "A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit." +__description__ = "A keyboard-driven, vim-like browser based on PyQt5." basedir = os.path.dirname(os.path.realpath(__file__))