rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/3617'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-21 11:06:52 +01:00
commit 81c17627f7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.asciidoc
View File

@ -44,8 +44,8 @@ Documentation
In addition to the topics mentioned in this README, the following documents are In addition to the topics mentioned in this README, the following documents are
available: available:
* https://qutebrowser.org/img/cheatsheet-big.png[Key binding cheatsheet]: + * https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[Key binding cheatsheet]: +
image:https://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://qutebrowser.org/img/cheatsheet-big.png"] image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png"]
* link:doc/quickstart.asciidoc[Quick start guide] * link:doc/quickstart.asciidoc[Quick start guide]
* https://www.shortcutfoo.com/app/dojos/qutebrowser[Free training course] to remember those key bindings * https://www.shortcutfoo.com/app/dojos/qutebrowser[Free training course] to remember those key bindings
* link:doc/faq.asciidoc[Frequently asked questions] * link:doc/faq.asciidoc[Frequently asked questions]

4
misc/requirements/requirements-tests.txt
View File

@ -11,7 +11,7 @@ fields==5.0.0
Flask==0.12.2 Flask==0.12.2
glob2==0.6 glob2==0.6
hunter==2.0.2 hunter==2.0.2
hypothesis==3.44.26 hypothesis==3.45.2
itsdangerous==0.24 itsdangerous==0.24
# Jinja2==2.10 # Jinja2==2.10
Mako==1.0.7 Mako==1.0.7
@ -28,7 +28,7 @@ pytest-benchmark==3.1.1
pytest-cov==2.5.1 pytest-cov==2.5.1
pytest-faulthandler==1.4.1 pytest-faulthandler==1.4.1
pytest-instafail==0.3.0 pytest-instafail==0.3.0
pytest-mock==1.6.3 pytest-mock==1.7.0
pytest-qt==2.3.1 pytest-qt==2.3.1
pytest-repeat==0.4.1 pytest-repeat==0.4.1
pytest-rerunfailures==4.0 pytest-rerunfailures==4.0

4
scripts/asciidoc2html.py
View File

@ -85,9 +85,9 @@ class AsciiDoc:
# patch image links to use local copy # patch image links to use local copy
replacements = [ replacements = [
("https://qutebrowser.org/img/cheatsheet-big.png", ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png",
"qute://help/img/cheatsheet-big.png"), "qute://help/img/cheatsheet-big.png"),
("https://qutebrowser.org/img/cheatsheet-small.png", ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png",
"qute://help/img/cheatsheet-small.png") "qute://help/img/cheatsheet-small.png")
] ]
asciidoc_args = ['-a', 'source-highlighter=pygments'] asciidoc_args = ['-a', 'source-highlighter=pygments']