Merge pull request #61 from zenmonkeykstop/master

Final M+E edits

docs/Chapter01-01-BeingABetterTrainer.md

@@ -54,7 +54,7 @@ If you're ready to start improving your skills as a trainer, there are some fant
 + Level Up's guide to [Creating Safe Spaces](https://level-up.cc/before-an-event/creating-safe-spaces/
 ) is also an excellent resource to get you thinking about making everyone welcome in your workshops.
 +  Integrated Security maintains a number of guides that cover [facilitation, learning styles and creating safe spaces](http://www.integratedsecuritymanual.org/facilitation-method).
-+ Aorta is a fantastic collective that does among other things, great work training facilitators and trainers. They publish a number of excellent [resources](http://aorta.coop/resources/) including a guide to [Anti-oppressive Facilitation for Democratic Process](http://aorta.coop/portfolio_page/anti-oppressive-facilitation/). Though their guide is geared more towards group decision making, but it is still a fantastic resource for trainers.
++ Aorta is a fantastic collective that does among other things, great work training facilitators and trainers. They publish a number of excellent [resources](http://aorta.coop/resources/) including a guide to [Anti-oppressive Facilitation for Democratic Process](http://aorta.coop/portfolio_page/anti-oppressive-facilitation/). Their guide is geared more towards group decision making, but it is still a fantastic resource for trainers.
 + Aspiration facilitates nonprofit technology convenings and they work hard to create collaborative and rewarding workshops. Their [facilitation guidelines](https://facilitation.aspirationtech.org/index.php?title=Facilitation:Facilitator_Guidelines
 ) and [workshop design advice](https://facilitation.aspirationtech.org/index.php?title=Facilitation:Sessions) are both worth checking out.
 + Open News led the process of creating the curriculum resource you're reading right now. Their [SRCCON facilitation guide](https://srccon.org/facilitators/index.html) is great, as is their roundup of [OpenNews posts on session design](https://opennews.org/blog/srccon-session-planning/).

docs/Chapter01-04-FramingStrategies.md

@@ -54,7 +54,7 @@ This exercise isn't meant to be a stand-alone session, and can be a good warmup
 
 ## Integrated Security
 
-Some digital security trainers have used Kvinna till Kvinna’s [integrated security facilitation approach](http://www.integratedsecuritymanual.org/sites/default/files/samplestructure_0.pdf) based on the idea that collective discussions on what security means and the practices we already take to protect ourselves are a good way to continue building our security capacity.
+Some digital security trainers have used Kvinna's [integrated security facilitation approach](http://www.integratedsecuritymanual.org/sites/default/files/samplestructure_0.pdf), based on the idea that collective discussions on what security means and the practices we already take to protect ourselves are a good way to continue building our security capacity.
 
 This framing can be helpful in newsrooms where security needs are much broader than what is typically covered in digital security curriculum. The lesson plan is intended for a session lasting two to four hours.
 
@@ -64,13 +64,13 @@ Customize it, bring in some of your favorite properties of the net, etc.
 
 Practical privacy and security is just a part of digital literacy. Right now, for most people, learning how their computers work seems hard enough, learning how the network works seems impossible. But it's not, it's just learning a new perspective about the world we live in everyday.
 
-It's worthwhile to take a moment to say how amazing the age we live in is, how wonderful and awesome it is, and downright magical it is, living through the mediation of just about everything. When I was young we didn't have 30 second access to all human knowledge, now I can't tolerate being out of touch with the world for more than a few hours. We used to go to the library to find things out. When someone moved away, we accepted that we'd probably never see from or hear from them again. The lives of people in distant lands, or even Des Moines, was mysterious.
+It's worthwhile to take a moment to say how amazing the age we live in is, how wonderful and awesome it is, and downright magical it is, living through the mediation of just about everything. At the turn of the century we didn't have 30-second access to all human knowledge, now we can't tolerate being out of touch with the world for more than a few hours. We used to go to the library to find things out. When someone moved away, we accepted that we'd probably never see from or hear from them again. The lives of people in distant lands, or even Des Moines, was mysterious.
 
-Now, if I want to talk to hundreds, or even thousands, of people, I turn to Twitter. If I wanted to do that when I was a teenager, I just couldn't. I could work for years to get onto a platform with that kind of reach, but that was a career choice -- go to college, try to get a job, work for it, possibly for most of my life. Now it's a regular part of life, normal and even banal.
+Now, if we want to talk to hundreds, or even thousands, of people, we can turn to Twitter, or a host of other platforms. Networks with equivalent reach and ease of access simply didn't exist for previous generations. Someone could work for years to get onto a platform with that kind of reach, but that was a career choice -- go to college, try to get a job, work for it, possibly for most of their life. Now it's a regular part of life, normal and even banal.
 
-There's more books than I could hope to read, much less own, that fit on my three-inch screen. Or, I can realize reading on a 3" screen sucks, and listen to audiobooks, of which there are more than I could ever listen to -- even in the public domain, having been read by random volunteers! Thanks, random volunteers!
+There are more books than we could hope to read, much less own, that fit on a three-inch screen. Or, realizing that reading on a 3" screen sucks,  we can turn to audiobooks, of which there are more than we could ever listen to -- even in the public domain, having been read by random volunteers! Thanks, random volunteers!
 
-I can book a flight to Seoul, order a box of baby chickens, and find patient communities for dozens of bowel diseases in the span of 20 minutes, all from this magical phone in front of me, or this small box with more computational power than took humanity to the moon.
+We can book a flight to Seoul, order a box of baby chickens, and find patient communities for dozens of rare diseases in the span of 20 minutes, all from a magical phone in our pockets, or a small box with more computational power than took humanity to the moon.
 
 We live in an age of working magic wands, an age with no muggles. We're all wizards now -- but there's no Hogwarts. We're muddling through, and everyone having all these powers can seem scary. But the world gets better as we all learn to use them.
 

docs/Chapter03-03-OrgBestPractices.md

@@ -14,7 +14,7 @@ Before we even talk about tools for taking confidential tips securely, there are
 
 1. Who is going to maintain the page? If you’re reading this, the person maintaining the secure tip page for your newsroom might be you. Make sure you know what that entails, and that there's a plan in place for handing off ownership if you leave the newsroom.
 
-2.  The page should easily accessible, and under the newsroom's control. Don't
+2.  The page should easily accessible, and under the newsroom's control. 
 
 3.  Host secure tip pages with HTTPS, not over an unsecured HTTP connection. This prevents unwanted third parties from snooping on would-be sources’ connections to your tip page. If your site doesn't already default to HTTPS, address that first. Two excellent resources to help make the case: [The US CIO's excellent and thorough explanation](https://https.cio.gov/everything/), and [Chrome's Developer Blog](https://developers.google.com/web/fundamentals/security/encrypt-in-transit/why-https).
 
@@ -54,7 +54,7 @@ Your tips page is a good place to offer that education.
 
 The best we can do is support the appropriate communication channels, and advertise that we’re available to check out tips. Have a page where these channels are clearly organized, and share it with information about the tradeoffs.
 
-It’s also important to be be clear that if they have reached out over a less-than-ideal channel, such as calling from their work phone or using their work computer, sources may have burned themselves already.
+It’s also important to be clear that if they have reached out over a less-than-ideal channel, such as calling from their work phone or using their work computer, sources may have burned themselves already.
 
 The Intercept has [an excellent guide](https://theintercept.com/leak/) to reaching out anonymously. They are very clear both about how to reach out, and *what not to do*.
 
@@ -81,7 +81,7 @@ Some common secure communication channels include [Signal](https://signal.org/),
 + [WhatsApp](https://whatsapp.com/) has over a billion users on [iPhone](https://itunes.apple.com/us/app/whatsapp-messenger/id310633997) and [Android](https://play.google.com/store/apps/details?id=com.whatsapp) and uses similar encryption to Signal. It’s easy to use, and with the right settings, can be a decent option for routine communications. WhatsApp users can share more types of files than Signal, and it can be
 a great way to send documents.
 
-    + Tradeoffs: Importantly, some settings must be tweaked to maximize the security  of the app, and to make it safer for routine use. Under some circumstances, WhatsApp backs up unencrypted messages to iCloud or Google Drive by default: users may need to confirm that backups are be disabled. [Upgrading WhatsApp Security](https://medium.com/@mshelton/upgrading-whatsapp-security-386c8ce496d3) is an excellent guide to ... upgrading WhatsApp securit.
+    + Tradeoffs: Importantly, some settings must be tweaked to maximize the security  of the app, and to make it safer for routine use. Under some circumstances, WhatsApp backs up unencrypted messages to iCloud or Google Drive by default: users may need to confirm that backups are disabled. [Upgrading WhatsApp Security](https://medium.com/@mshelton/upgrading-whatsapp-security-386c8ce496d3) is a good place to get started.
 
     + Like Signal, WhatsApp stores user phone numbers. They also [store substantially more data](https://www.whatsapp.com/legal/#privacy-policy) -- your address book, who you contact most often, and other information about how you use the service. WhatsApp [shares that data with their parent company, Facebook](https://www.eff.org/deeplinks/2016/08/what-facebook-and-whatsapps-data-sharing-plans-really-mean-user-privacy-0). Facebook,and WhatsApp can be forced to share their user data in response to a court order or subpoena.
 

docs/index.rst

@@ -20,7 +20,7 @@ This resource collects the advice and experience of journalists,
 newsroom developers, and security experts, organized into a set of
 lessons and training materials available for newsroom staff who find
 themselves leading security trainings. In a moment when reporters are
-asking how to protect themselves and their sources, we want to see a
+asking how to protect themselves and their sources, we want to see 
 more people armed to answer those questions and help newsrooms
 communicate and store data more securely.