Small documentation fixes

This commit is contained in:
Florian Bruhin 2014-07-23 20:17:08 +02:00
parent 7ba2b7faae
commit 11c4e28769
3 changed files with 36 additions and 25 deletions

View File

@ -10,15 +10,24 @@ on Python, PyQt5 and QtWebKit and free software, licensed under the GPL.
It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.
Documentation
-------------
In addition to the topics mentioned in that README, the following documents are
available:
* link:doc/FAQ.asciidoc[Frequently asked questions]
* link:doc/HACKING.asciidoc[HACKING]
* link:doc/BUGS[BUGS]
* link:doc/TODO[TODO]
Getting help
------------
Documentation is slowly catching up as this is a rather young project.
You can however get help in the IRC channel
irc://irc.freenode.org/#qutebrowser[#qutebrowser] on Freenode, or by writing a
You can get help in the IRC channel
irc://irc.freenode.org/#qutebrowser[`#qutebrowser`] on
http://freenode.net/[Freenode]
(https://webchat.freenode.net/?channels=#qutebrowser[webchat]), or by writing a
message to the
https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
mailto:qutebrowser@lists.qutebrowser.org[].
@ -26,7 +35,7 @@ mailto:qutebrowser@lists.qutebrowser.org[].
Running qutebrowser
-------------------
After installing the <<requirements>>, you have these options:
After installing the <<requirements,requirements>>, you have these options:
* Run qutebrowser directly via `python3 -m qutebrowser`. Note executing
qutebrowser.py directly as script won't work, as Python won't recognize the
@ -63,7 +72,8 @@ The following software and libraries are required to run qutebrowser:
* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
* https://github.com/g2p/rfc6266[rfc6266]
The following libraries are optional and provide better debugging:
The following libraries are optional and provide colored logging in the
console:
* https://pypi.python.org/pypi/colorlog/[colorlog]
* On Windows: https://pypi.python.org/pypi/colorama/[colorama]

View File

@ -88,4 +88,5 @@ Is there an adblocker?::
* Use the https://www.requestpolicy.com/[RequestPolicy] functionality to
block ads, which currently isn't implemented either.
+
If you think you can add ad blocking or request policy, please contribute!
If you think you can add ad blocking or request policy, please
link:doc/HACKING.asciidoc[contribute]!

View File

@ -18,11 +18,13 @@ probably change it for you then, though.
If you have any problems, I'm more than happy to help! You can get help in
several ways:
* Send a mail to the mailing list at qutebrowser@lists.qutebrowser.org
* Send a mail to the mailing list at mailto:qutebrowser@lists.qutebrowser.org[]
(optionally
https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[subscribe]
first).
* Join the IRC channel `#qutebrowser` on http://www.freenode.org/[Freenode].
* Join the IRC channel irc://irc.freenode.org/#qutebrowser[`#qutebrowser`] on
http://freenode.net/[Freenode]
(https://webchat.freenode.net/?channels=#qutebrowser[webchat]).
Finding something to work on
----------------------------
@ -106,7 +108,7 @@ https://docs.python.org/3.4/library/unittest.html[unittest] framework
- untracked git files
- whitespace/CRLF problems
- `set_trace` invocations
- VCS conflict markers.
- VCS conflict markers
If you changed `setup.py` or `MANIFEST.in`, add the `--setup` argument to run
the following additional checkers:
@ -147,10 +149,10 @@ module.
Debugging
~~~~~~~~~
In the `qutebrowser.utils.debug` and `qutebrowser.utils.signal` modules there
are some useful functions for debugging. In particular you should use
`set_trace` from `qutebrowser.utils.debug` instead of `pdb` to set breakpoints
or you'll get annoying Qt error messages.
In the `qutebrowser.utils.debug` module there are some useful functions for
debugging. In particular you should use `set_trace` from
`qutebrowser.utils.debug` instead of `pdb` to set breakpoints or you'll get
annoying Qt error messages.
When starting qutebrowser with the `--debug` flag you also get useful debug
logs. You can add +--logfilter _category[,category,...]_+ to restrict logging
@ -170,8 +172,6 @@ Some resources which might be handy:
* https://docs.python.org/3/library/index.html[The Python reference]
* http://httpbin.org/[httpbin, a test service for HTTP requests/responses]
* http://requestb.in/[RequestBin, a service to inspect HTTP requests]
* http://greenbytes.de/tech/tc2231/[Test cases for the `Content-Disposition`
header]
Hints
-----
@ -185,7 +185,7 @@ available.
In qutebrowser, the policy is usually using the Python libraries, as they
provide exceptions and other benefits.
There are some exceptions for that:
There are some exceptions to that:
* `QThread` is used instead of Python threads because it provides signals and
slots.