[tor-commits] [sbws/master] Merge branch 'ticket27341'

[pastly at torproject.org]

commit eca0d2685cac7bc20571d3d476eda7fcdf48f0a7
Merge: 48715b7 9239f69
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Wed Sep 5 10:35:31 2018 -0400

    Merge branch 'ticket27341'

 CHANGELOG.md                 |  12 +++
 DEPLOY.rst                   |  84 ++++--------------
 INSTALL.rst                  | 198 +++++++++++++++----------------------------
 README.md                    |  17 ----
 docs/source/glossary.rst     |  52 +++++++-----
 docs/source/man_sbws.ini.rst |  39 +++++++--
 docs/source/man_sbws.rst     |   6 ++
 7 files changed, 169 insertions(+), 239 deletions(-)

diff --cc CHANGELOG.md
index b760644,f45182e..1de8368
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,11 -7,18 +7,23 @@@ and this project adheres to [Semantic V
  
  ## [Unreleased]
  
 +### Fixed
 +
 +- Broken environment variable in default sbws config. To use envvar $FOO, write
 +  $$FOO in the config.
 +
+ ### Changed
+ 
+ - sbws install doc is confusing (#27341)
+   - Include system and Python dependencies in `INSTALL`.
+   - Include dependencies for docs and tests in `INSTALL`.
+   - Point to `DEPLOY` to run sbws.
+   - Remove obsolete sections in `INSTALL`
+   - Simplify `DEPLOY`, reuse terms in the `glossary`.
+   - Remove obsolete ``sbws init`` from `DEPLOY`.
+   - Point to config documentation.
+   - Add, unify and reuse terms in `glossary`.
+ 
  ## [0.7.0] - 2018-08-09
  
  **Important changes**: