From a66913d4a30b2ce2dedc58afcf79ad77faead278 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 14 Mar 2014 00:02:00 +0100
Subject: forward proxy -> upstream proxy

---
 doc-src/_nav.html                   |  2 +-
 doc-src/features/forwardproxy.html  | 16 ----------------
 doc-src/features/index.py           |  2 +-
 doc-src/features/reverseproxy.html  |  6 +++---
 doc-src/features/upstreamproxy.html | 16 ++++++++++++++++
 5 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 doc-src/features/forwardproxy.html
 create mode 100644 doc-src/features/upstreamproxy.html

(limited to 'doc-src')

diff --git a/doc-src/_nav.html b/doc-src/_nav.html
index 5460601f..ddc27dca 100644
--- a/doc-src/_nav.html
+++ b/doc-src/_nav.html
@@ -11,7 +11,7 @@
         $!nav("anticache.html", this, state)!$
         $!nav("clientreplay.html", this, state)!$
         $!nav("filters.html", this, state)!$
-        $!nav("forwardproxy.html", this, state)!$
+        $!nav("upstreamproxy.html", this, state)!$
         $!nav("proxyauth.html", this, state)!$
         $!nav("replacements.html", this, state)!$
         $!nav("serverreplay.html", this, state)!$
diff --git a/doc-src/features/forwardproxy.html b/doc-src/features/forwardproxy.html
deleted file mode 100644
index 203520d5..00000000
--- a/doc-src/features/forwardproxy.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-In this mode, mitmproxy accepts proxy requests and unconditionally forwards all
-requests to a specified upstream server. This is in contrast to <a
-href="@!urlTo("reverseproxy.html")!@">reverse proxy mode</a>, in which
-mitmproxy forwards ordinary HTTP requests to an upstream server.
-
-<table class="table">
-    <tbody>
-        <tr>
-            <th width="20%">command-line</th> <td>-F http[s]://hostname[:port]</td>
-        </tr>
-        <tr>
-            <th>mitmproxy shortcut</th> <td><b>F</b></td>
-        </tr>
-    </tbody>
-</table>
diff --git a/doc-src/features/index.py b/doc-src/features/index.py
index e15f3311..0618681f 100644
--- a/doc-src/features/index.py
+++ b/doc-src/features/index.py
@@ -4,7 +4,7 @@ pages = [
     Page("anticache.html", "Anticache"),
     Page("clientreplay.html", "Client-side replay"),
     Page("filters.html", "Filter expressions"),
-    Page("forwardproxy.html", "Forward proxy mode"),
+    Page("upstreamproxy.html", "Upstream proxy mode"),
     Page("setheaders.html", "Set Headers"),
     Page("serverreplay.html", "Server-side replay"),
     Page("sticky.html", "Sticky cookies and auth"),
diff --git a/doc-src/features/reverseproxy.html b/doc-src/features/reverseproxy.html
index 7be02b87..7ad1c26c 100644
--- a/doc-src/features/reverseproxy.html
+++ b/doc-src/features/reverseproxy.html
@@ -1,8 +1,8 @@
 
 In reverse proxy mode, mitmproxy accepts standard HTTP requests and forwards
-them to the specified upstream server. This is in contrast to <a
-href="@!urlTo("forwardproxy.html")!@">forward proxy mode</a>, in which
-mitmproxy forwards HTTP proxy requests to an upstream server.
+them to the specified upstream server. This is in contrast to
+<a href="@!urlTo("upstreamproxy.html")!@">upstream proxy mode</a>, in which
+mitmproxy forwards HTTP proxy requests to an upstream proxy server.
 
 Note that the displayed URL for flows in this mode will use the value of the
 __Host__ header field from the request, not the reverse proxy server. 
diff --git a/doc-src/features/upstreamproxy.html b/doc-src/features/upstreamproxy.html
new file mode 100644
index 00000000..5b9c2289
--- /dev/null
+++ b/doc-src/features/upstreamproxy.html
@@ -0,0 +1,16 @@
+
+In this mode, mitmproxy accepts proxy requests and unconditionally forwards all
+requests to a specified upstream proxy server. This is in contrast to <a
+href="@!urlTo("reverseproxy.html")!@">reverse proxy mode</a>, in which
+mitmproxy forwards ordinary HTTP requests to an upstream server.
+
+<table class="table">
+    <tbody>
+        <tr>
+            <th width="20%">command-line</th> <td>-U http[s]://hostname[:port]</td>
+        </tr>
+        <tr>
+            <th>mitmproxy shortcut</th> <td><b>U</b></td>
+        </tr>
+    </tbody>
+</table>
-- 
cgit v1.2.3