From e838aa1860b269012c361118fc98038c17f0e6c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferenc=20so=C3=B3s?= <eluch@different.hu>
Date: Mon, 20 Jan 2020 09:59:38 +0100
Subject: Fix wording for ssl_insecure option on mitmweb

---
 .../js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap | 2 +-
 web/src/js/components/Header/OptionMenu.jsx                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap
index 83d9355c..106f1732 100644
--- a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap
+++ b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap
@@ -76,7 +76,7 @@ exports[`OptionMenu Component should render correctly 1`] = `
             onChange={[Function]}
             type="checkbox"
           />
-          Verify server certificates
+          Don't verify server certificates
         </label>
       </div>
     </div>
diff --git a/web/src/js/components/Header/OptionMenu.jsx b/web/src/js/components/Header/OptionMenu.jsx
index 765129ed..4eb319ec 100644
--- a/web/src/js/components/Header/OptionMenu.jsx
+++ b/web/src/js/components/Header/OptionMenu.jsx
@@ -31,7 +31,7 @@ function OptionMenu({ openOptions }) {
                             Use host header for display
                         </SettingsToggle>
                         <SettingsToggle setting="ssl_insecure">
-                            Verify server certificates
+                            Don't verify server certificates
                         </SettingsToggle>
                     </div>
                     <div className="menu-legend">Quick Options</div>
-- 
cgit v1.2.3


From ff759fa51b00c05c3873efaa8ae16abe3d078bfb Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 21 Feb 2020 23:16:02 +0100
Subject: update compiled mitmweb assets, fix #3822

---
 web/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/README.md b/web/README.md
index c43d09f0..ebdd1f2f 100644
--- a/web/README.md
+++ b/web/README.md
@@ -2,5 +2,5 @@
 
 
 - Run `yarn` to install dependencies
-- Run `gulp` to start live-compilation.
+- Run `yarn run gulp` to start live-compilation.
 - Run `mitmweb` and open http://localhost:8081/
-- 
cgit v1.2.3


From 53ee0b23ecd1cf7fb84b371b9ead6f54bc0e66cb Mon Sep 17 00:00:00 2001
From: Lucas Ramage <oxr463@gmx.us>
Date: Fri, 3 Apr 2020 10:35:03 -0400
Subject:  Clarify developer documentation for mitmweb

Bug: https://github.com/mitmproxy/mitmproxy/issues/3888
---
 web/README.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'web')

diff --git a/web/README.md b/web/README.md
index ebdd1f2f..ae558bd6 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,5 +1,7 @@
 # Quick Start
 
+**Be sure to follow the Development Setup instructions found in the README.md,
+and activate your virtualenv environment before proceeding.**
 
 - Run `yarn` to install dependencies
 - Run `yarn run gulp` to start live-compilation.
-- 
cgit v1.2.3