commit 3ea8bacac8ec07259b5728b42b5a4f36736d21bb Author: David Fifield <david@bamsoftware.com> Date: Wed Jun 1 15:18:11 2016 -0700 Remove instructions for bypassing Gatekeeper on OS X. Tor Browser now works with Gatekeeper (#6540). These instructions were originally added for #14838. This reverts commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200. This reverts commit 3b647388ec91070e307a9e508f2d7ac597c799d8. This reverts commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50. --- css/layout.css | 14 -------------- download/en/download-easy.wml | 18 ------------------ images/tbb-macosx-step-1.png | Bin 21334 -> 0 bytes images/tbb-macosx-step-2.png | Bin 20451 -> 0 bytes images/tbb-macosx-step-3.png | Bin 13846 -> 0 bytes projects/en/torbrowser.wml | 5 +---- 6 files changed, 1 insertion(+), 36 deletions(-) diff --git a/css/layout.css b/css/layout.css index c65126b..8a79d9d 100644 --- a/css/layout.css +++ b/css/layout.css @@ -660,20 +660,6 @@ table tr img { padding-bottom: 8px; } -.howto th, .howto td { - padding: 2px; -} - -.howto th { - font-weight: bold; - text-align: center; -} - -.howto img { - border: 0; - margin: 0; -} - #download-donate { background-attachment: scroll; background-clip: border-box; diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 7a85413..4bb1517 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -75,24 +75,6 @@ </form> <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p> </div> - <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. --> - <table class="howto"> - <tr> - <th>1. Install</th> - <th>2. Control-click</th> - <th>3. Open</th> - </tr> - <tr> - <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td> - <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td> - <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td> - </tr> - <tr> - <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td> - <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose “Open”.</td> - <td>Click “Open” on the next screen.</td> - </tr> - </table> </div> <!-- START LINUX --> <div id="linux" class="easy linux"> diff --git a/images/tbb-macosx-step-1.png b/images/tbb-macosx-step-1.png deleted file mode 100644 index 2dd11fc..0000000 Binary files a/images/tbb-macosx-step-1.png and /dev/null differ diff --git a/images/tbb-macosx-step-2.png b/images/tbb-macosx-step-2.png deleted file mode 100644 index 40f6f92..0000000 Binary files a/images/tbb-macosx-step-2.png and /dev/null differ diff --git a/images/tbb-macosx-step-3.png b/images/tbb-macosx-step-3.png deleted file mode 100644 index 27e98cf..0000000 Binary files a/images/tbb-macosx-step-3.png and /dev/null differ diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 15ef9e9..261973a 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -570,10 +570,7 @@ <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> <p>Download the file above, save it somewhere, then click on it. - This opens the .dmg file. (On recent versions of OS X, you might get - a warning that it's from an "unidentified developer" — you can - get around this complaint by <a href="https://tor.stackexchange.com/questions/1187/my-osx-is-saying-torbrowserbundle-en-us-cant-be-opened-because-it-is-from-an">control-clicking and selecting "open"</a>.) - Drag the included file into your Applications folder and you will + This opens the .dmg file. Drag the included file into your Applications folder and you will have a Tor Browser application in your chosen language that you can pin on your Dock.</p> </div>