From 6aa05df944add1fe7b681ae6e7d6336f2ff3ae55 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 23 Oct 2014 15:50:43 +1300
Subject: Correct docs - we no longer support change of basic proxy mode in the
 console app

---
 doc-src/features/upstreamproxy.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc-src/features/upstreamproxy.html')

diff --git a/doc-src/features/upstreamproxy.html b/doc-src/features/upstreamproxy.html
index 6039f4df..bb354cd3 100644
--- a/doc-src/features/upstreamproxy.html
+++ b/doc-src/features/upstreamproxy.html
@@ -9,8 +9,5 @@ mitmproxy forwards ordinary HTTP requests to an upstream server.
         <tr>
             <th width="20%">command-line</th> <td>-U http://hostname[:port]</td>
         </tr>
-        <tr>
-            <th>mitmproxy shortcut</th> <td><b>U</b></td>
-        </tr>
     </tbody>
 </table>
-- 
cgit v1.2.3


From 6bed0764609029e9d01b1d28b7826fb37ab20d3e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 23 Oct 2014 16:13:03 +1300
Subject: Document http2https and https2http

---
 doc-src/features/upstreamproxy.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc-src/features/upstreamproxy.html')

diff --git a/doc-src/features/upstreamproxy.html b/doc-src/features/upstreamproxy.html
index bb354cd3..47bc115d 100644
--- a/doc-src/features/upstreamproxy.html
+++ b/doc-src/features/upstreamproxy.html
@@ -11,3 +11,17 @@ mitmproxy forwards ordinary HTTP requests to an upstream server.
         </tr>
     </tbody>
 </table>
+
+Here, **schema** is one of http, https, http2https or https2http. The latter
+two extended schema specifications control the use of HTTP and HTTPS on
+mitmproxy and the upstream server. You can indicate that mitmproxy should use
+HTTP, and the upstream server uses HTTPS like this:
+
+	http2https://hostname:port
+
+And you can indicate that mitmproxy should use HTTPS while the upstream
+service uses HTTP like this:
+
+	https2http://hostname:port
+
+
-- 
cgit v1.2.3