Skip to content

Commit

Permalink
Merge pull request #81 from zenmonkeykstop/issue79
Browse files Browse the repository at this point in the history
Refactored index.rst to split out sections and fix PDF section numbering
  • Loading branch information
zenmonkeykstop committed May 10, 2018
2 parents 2e8fe90 + a323ab7 commit 07bd223
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 71 deletions.
19 changes: 19 additions & 0 deletions docs/about.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
About This Guide
================

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
more people armed to answer those questions and help newsrooms
communicate and store data more securely.

The curriculum is hosted by `OpenNews <https://opennews.org/>`__, a team
that helps developers, designers, and data analysts convene and
collaborate on open journalism projects, and `BuzzFeed Open
Lab <https://www.buzzfeed.com/openlab>`__, an arts and technology
fellowship program at BuzzFeed News. The first draft began during a
two-day event in June 2017, with about 20 people working in-person and
remote.

30 changes: 30 additions & 0 deletions docs/authors.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Authors
=======

This resource began with a convening in Chicago where a dozen committed folks dedicated several days to writing the first draft. More folks stepped in to edit those drafts and offer feedback on them, or submit new lesson plans or workshop materials. This curriculum wouldn't exist without their hard work:

- Alan Palazzolo
- Amanda Hickman
- Blaine Cook
- Carol Waters
- Dan Sinker
- Eliot Stempf
- Emma Carew Grovum
- Erik Reyna
- Freddy Martinez
- Harlo Holmes
- Jason Reich
- Jennifer Henrichsen
- Kevin O'Gorman
- Lindsay Beck
- Lo Benichou
- Mago Torres
- Mariel García-Montes
- Martin Shelton
- Matt Perry
- Mike Tigas
- Norman Shamas
- Quinn Norton
- Rodney Gibbs
- Ryan Pitts
- Ted Han
91 changes: 20 additions & 71 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,19 @@ formal training in what reporters and editors need.

We want to see a whole lot more people prepared to answer those questions and help newsrooms do a better job of communicating (and storing data) securely. BuzzFeed Open Lab and OpenNews teamed up to assemble a solid, thoughtful series of training modules and resource guides that folks can use to help colleagues step up their security literacy. We'd like to cover everything from how to explain why migrating to a password manager is worth the trouble, to how to convince whoever needs convincing that installing Secure Drop is worth the trouble.

About This Guide
----------------

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
more people armed to answer those questions and help newsrooms
communicate and store data more securely.

The curriculum is hosted by `OpenNews <https://opennews.org/>`__, a team
that helps developers, designers, and data analysts convene and
collaborate on open journalism projects, and `BuzzFeed Open
Lab <https://www.buzzfeed.com/openlab>`__, an arts and technology
fellowship program at BuzzFeed News. The first draft began during a
two-day event in June 2017, with about 20 people working in-person and
remote.
.. toctree::
:maxdepth: 1
:caption: About This Guide
:name: sec-about
:glob:

about
contributing
authors
license

Chapter 1 - Being A Better Trainer
----------------------------------
We've organized this guide into three key sections.
Chapter 1 is a resource for new trainers, or folks who are
looking for ways to be better at training in general. We've written
Expand All @@ -41,82 +34,38 @@ valuable resources that already exist in the world.

.. toctree::
:maxdepth: 1
:caption: Chapter 1 - Being a better Trainer
:caption: Being A Better Trainer
:name: sec-chapter1
:glob:

Chapter01*



Chapter 2 - Lesson Plans
------------------------
Chapter 2 is an ever-expanding collection of lesson plans and training
materials to help people cover key topics with their peers.

.. toctree::
:maxdepth: 1
:caption: Chapter 2 - Lesson Plans
:caption: Lesson Plans
:name: sec-chapter2
:glob:

Chapter02*


Chapter 3 - Resources
---------------------
Chapter 3 aggregates links to the best existing
resources, to help new trainers deepen their own expertise. It also includes a glossary of common terms.

.. toctree::
:maxdepth: 1
:caption: Chapter 3 - Resources
:caption: Resources
:name: sec-chapter3
:glob:

Chapter03*



This is a community resource, and it gets better every time anyone from
the journalism and security communities shares advice, writes up a new
lesson, asks a question, or even just spots a typo. We'd love to add
your expertise to this project.

.. toctree::
:maxdepth: 2
:caption: Contributing
:name: sec-contributing

contributing.md


Authors
-------

This resource began with a convening in Chicago where a dozen committed folks dedicated several days to writing the first draft. More folks stepped in to edit those drafts and offer feedback on them, or submit new lesson plans or workshop materials. This curriculum wouldn't exist without their hard work:

- Alan Palazzolo
- Amanda Hickman
- Blaine Cook
- Carol Waters
- Dan Sinker
- Eliot Stempf
- Emma Carew Grovum
- Erik Reyna
- Freddy Martinez
- Harlo Holmes
- Jason Reich
- Jennifer Henrichsen
- Kevin O'Gorman
- Lindsay Beck
- Lo Benichou
- Mago Torres
- Mariel García-Montes
- Martin Shelton
- Matt Perry
- Mike Tigas
- Norman Shamas
- Quinn Norton
- Rodney Gibbs
- Ryan Pitts
- Ted Han

License
-------

`MIT <https://github.com/OpenNewsLabs/newsroom-security-curricula/blob/master/LICENSE>`__
24 changes: 24 additions & 0 deletions docs/license.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
License
=======

The MIT License (MIT)

Copyright (c) 2017 OpenNews, BuzzFeed Open Lab

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

0 comments on commit 07bd223

Please sign in to comment.