From 9d0e3c8d61dfb7db671c59695816c8d25edb7310 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 3 Aug 2011 19:15:01 +1200
Subject: [PATCH] Doc and help adjustments.

---
 doc-src/02-docstyle.css     | 8 ++++++++
 doc-src/_websitelayout.html | 2 +-
 doc-src/index.py            | 1 +
 libmproxy/console.py        | 8 ++++----
 todo                        | 8 +-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/doc-src/02-docstyle.css b/doc-src/02-docstyle.css
index 2d83a6498..a971799fd 100644
--- a/doc-src/02-docstyle.css
+++ b/doc-src/02-docstyle.css
@@ -12,6 +12,7 @@ a {
     margin: 0;
     margin-bottom: 1em;
 }
+
 #hd.doc h1 {
     letter-spacing: 3px;
     font-size: 2.5em;
@@ -48,6 +49,12 @@ a {
     color: #000000;
 }
 
+#bd p {
+    margin: 1em 0;
+
+
+}
+
 #ft.doc {
     color: #aaa;
     border-top: 1px solid #aaa;
@@ -65,6 +72,7 @@ a {
 pre {
     padding: 10px;
     background-color: #dddddd;
+    margin: 1em 0;
 }
 
 .terminal {
diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
index 8e2fccaca..a56c107b7 100644
--- a/doc-src/_websitelayout.html
+++ b/doc-src/_websitelayout.html
@@ -10,7 +10,7 @@
             </ul>
         </div>
         <br>
-        <p>an SSL-capable intercepting proxy</p>
+        <p>an SSL-capable man-in-the-middle proxy</p>
     </div>
     <div id="bd">
         <div id="yui-main">
diff --git a/doc-src/index.py b/doc-src/index.py
index 170839e71..07924e631 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -13,6 +13,7 @@ if ns.options.website:
 else:
     ns.title = countershape.template.Template(None, "<h1>@!this.title!@</h1>")
     this.layout = countershape.Layout("_layout.html")
+
 ns.docTitle = "mitmproxy"
 this.markup = markup.Markdown()
 ns.docMaintainer = "Aldo Cortesi"
diff --git a/libmproxy/console.py b/libmproxy/console.py
index a0136a684..d4ad517a0 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -1400,15 +1400,15 @@ class ConsoleMaster(flow.FlowMaster):
             ("o", "toggle options:"),
             (None,
                 highlight_key("anticache", "a") +
-                [("text", ": modify requests to prevent cached responses")]
+                [("text", ": prevent cached responses")]
             ),
             (None,
                 highlight_key("anticomp", "c") +
-                [("text", ": modify requests to try to prevent compressed responses")]
+                [("text", ": prevent compressed responses")]
             ),
             (None,
                 highlight_key("autodecode", "d") +
-                [("text", ": automatically decode compressed responses")]
+                [("text", ": auto-decode compressed content")]
             ),
             (None,
                 highlight_key("killextra", "k") +
@@ -1430,7 +1430,7 @@ class ConsoleMaster(flow.FlowMaster):
             ("w", "save all flows matching current limit"),
             ("W", "save this flow"),
             ("|", "run script on this flow"),
-            ("page up/down", "page up/down"),
+            ("pg up/down", "page up/down"),
         ]
         text.extend(format_keyvals(keys, key="key", val="text", indent=4))
 
diff --git a/todo b/todo
index a8efc9372..78840b2cb 100644
--- a/todo
+++ b/todo
@@ -1,4 +1,3 @@
-
 This is a loose collection of todo items, in case someone else wants to start
 hacking on mitmproxy. Drop me a line (aldo@corte.si) if you want to tackle any
 of these and need some pointers.
@@ -16,9 +15,4 @@ Features:
     - Support HTTP Digest authentication through the stickyauth option. We'll
     have to save the server nonce, and recalculate the hashes for each request.
     - Chunked encoding support for requests (we already support it for responses).
-    - Better manipulation of flows in mitmproxy: copying flows, adding
-    comments.
-
-Bugs:
-
-    - In some circumstances, long URLs in list view are line-broken oddly.
+    - A progress indicator for large files