aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-03-22 14:57:57 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-03-22 14:57:57 +1300
commit45ab22f0d9b75a6cdfa123d206243e4eb2d40d41 (patch)
tree28f236d8a8efa3f15d82f5d035a09740edbd13f9 /doc-src
parent1441fade907142598e26ef7c4850700d936988a9 (diff)
downloadmitmproxy-45ab22f0d9b75a6cdfa123d206243e4eb2d40d41.tar.gz
mitmproxy-45ab22f0d9b75a6cdfa123d206243e4eb2d40d41.tar.bz2
mitmproxy-45ab22f0d9b75a6cdfa123d206243e4eb2d40d41.zip
Add modal help to GridEditor.
Also includes some minor refactoring and documentation stubs.
Diffstat (limited to 'doc-src')
-rw-r--r--doc-src/certinstall/android.html13
-rw-r--r--doc-src/certinstall/index.py1
-rw-r--r--doc-src/index.html3
-rw-r--r--doc-src/index.py2
4 files changed, 17 insertions, 2 deletions
diff --git a/doc-src/certinstall/android.html b/doc-src/certinstall/android.html
new file mode 100644
index 00000000..388ede1a
--- /dev/null
+++ b/doc-src/certinstall/android.html
@@ -0,0 +1,13 @@
+
+The Android Proxy Problem
+-------------------------
+
+
+The Solution
+------------
+
+
+Step-by-step
+------------
+
+
diff --git a/doc-src/certinstall/index.py b/doc-src/certinstall/index.py
index c3893bcb..8ba3b7df 100644
--- a/doc-src/certinstall/index.py
+++ b/doc-src/certinstall/index.py
@@ -5,4 +5,5 @@ pages = [
Page("osx.html", "OSX"),
Page("windows7.html", "Windows 7"),
Page("ios.html", "IOS"),
+ Page("android.html", "Android"),
]
diff --git a/doc-src/index.html b/doc-src/index.html
index f7aabe05..557deafd 100644
--- a/doc-src/index.html
+++ b/doc-src/index.html
@@ -13,12 +13,13 @@
<li><a href="@!urlTo("filters.html")!@">Filter expressions</a></li>
</ul>
<li><a href="@!urlTo("scripts.html")!@">Scripts</a></li>
- <li><a href="@!urlTo("ssl.html")!@">SSL interception</a></li>
+ <li><a href="@!urlTo("ssl.html")!@">Setting up SSL interception</a></li>
<ul>
<li><a href="@!urlTo("certinstall/firefox.html")!@">Firefox</a></li>
<li><a href="@!urlTo("certinstall/osx.html")!@">OSX</a></li>
<li><a href="@!urlTo("certinstall/windows7.html")!@">Windows 7</a></li>
<li><a href="@!urlTo("certinstall/ios.html")!@">iPhone/iPad</a></li>
+ <li><a href="@!urlTo("certinstall/android.html")!@">Android</a></li>
</ul>
<li><a href="@!urlTo("library.html")!@">libmproxy</a></li>
<li>Tutorials</li>
diff --git a/doc-src/index.py b/doc-src/index.py
index 10cc3b36..a2296e70 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -77,7 +77,7 @@ pages = [
Page("anticache.html", "Anticache"),
Page("filters.html", "Filter expressions"),
Page("scripts.html", "Scripts"),
- Page("ssl.html", "SSL interception"),
+ Page("ssl.html", "Setting up SSL interception"),
Directory("certinstall"),
Page("library.html", "libmproxy: mitmproxy as a library"),
Directory("tutorials"),