aboutsummaryrefslogtreecommitdiffstats
path: root/docs/tutorials
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-07 10:52:18 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-07 10:52:18 +0200
commitc4286b15dc3d95f52b7ce5b5292796109fa77f3f (patch)
treec83c666e6f82df7c397e4291bb3a0f32d7d864ae /docs/tutorials
parent31ee4607c892f85c5d139e54acbc3ca4f9fb6bcb (diff)
downloadmitmproxy-c4286b15dc3d95f52b7ce5b5292796109fa77f3f.tar.gz
mitmproxy-c4286b15dc3d95f52b7ce5b5292796109fa77f3f.tar.bz2
mitmproxy-c4286b15dc3d95f52b7ce5b5292796109fa77f3f.zip
docs: minor fixes
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/30second.rst2
-rw-r--r--docs/tutorials/gamecenter.rst2
-rw-r--r--docs/tutorials/transparent-dhcp.rst12
3 files changed, 9 insertions, 7 deletions
diff --git a/docs/tutorials/30second.rst b/docs/tutorials/30second.rst
index 75304bda..4c8bf326 100644
--- a/docs/tutorials/30second.rst
+++ b/docs/tutorials/30second.rst
@@ -63,4 +63,4 @@ conversation back to the file.
.. _Firebug: https://getfirebug.com/
.. _urllib: https://docs.python.org/library/urllib.html
.. _Toggle Proxy: https://addons.mozilla.org/en-us/firefox/addon/toggle-proxy-51740/
-.. _wicd: https://launchpad.net/wicd \ No newline at end of file
+.. _wicd: https://launchpad.net/wicd
diff --git a/docs/tutorials/gamecenter.rst b/docs/tutorials/gamecenter.rst
index 18745f2d..96c30437 100644
--- a/docs/tutorials/gamecenter.rst
+++ b/docs/tutorials/gamecenter.rst
@@ -125,4 +125,4 @@ same score through perfect play, effectively beating the game. So, which is it
in this case? I'll leave that for you to decide.
.. _Super Mega Worm: https://itunes.apple.com/us/app/super-mega-worm/id388541990?mt=8
-.. _property list: https://en.wikipedia.org/wiki/Property_list \ No newline at end of file
+.. _property list: https://en.wikipedia.org/wiki/Property_list
diff --git a/docs/tutorials/transparent-dhcp.rst b/docs/tutorials/transparent-dhcp.rst
index 1e53b333..ce285b63 100644
--- a/docs/tutorials/transparent-dhcp.rst
+++ b/docs/tutorials/transparent-dhcp.rst
@@ -5,7 +5,8 @@ Transparently proxify virtual machines
This walkthrough illustrates how to set up transparent proxying with mitmproxy.
We use VirtualBox VMs with an Ubuntu proxy machine in this example,
-but the general *Internet <--> Proxy VM <--> (Virtual) Internal Network* setup can be applied to other setups.
+but the general *Internet <--> Proxy VM <--> (Virtual) Internal Network* setup can be applied to
+other setups.
1. Configure Proxy VM
---------------------
@@ -35,9 +36,9 @@ DHCP and TFTP) services to a small-scale network.
- Before we get to that, we need to fix some Ubuntu quirks:
**Ubuntu >12.04** runs an internal dnsmasq instance (listening on loopback only) by default
- `[1] <https://www.stgraber.org/2012/02/24/dns-in-ubuntu-12-04/>`_. For our use case, this needs to be
- disabled by changing ``dns=dnsmasq`` to ``#dns=dnsmasq`` in **/etc/NetworkManager/NetworkManager.conf**
- and running
+ `[1] <https://www.stgraber.org/2012/02/24/dns-in-ubuntu-12-04/>`_. For our use case, this needs
+ to be disabled by changing ``dns=dnsmasq`` to ``#dns=dnsmasq`` in
+ **/etc/NetworkManager/NetworkManager.conf** and running
>>> sudo restart network-manager
@@ -84,4 +85,5 @@ Finally, we can run mitmproxy in transparent mode with
>>> mitmproxy -T
The proxied machine cannot to leak any data outside of HTTP or DNS requests.
-If required, you can now :ref:`install the mitmproxy certificates on the proxied machine <certinstall>`. \ No newline at end of file
+If required, you can now :ref:`install the mitmproxy certificates on the proxied machine
+<certinstall>`.