2.4 Docker install guide update

Author: IvanJelicSF

etc/docker/README.md

@@ -1,19 +1,19 @@
 # How to install Superdesk and Publisher with Docker
 
-This guide explains how to install complete Superdesk digital publishing system made of Superdesk headless CMS (with the Publisher plugin) and the Publisher, using Docker. 
+This guide explains how to install a complete Superdesk digital publishing system made of Superdesk headless CMS (with the Publisher plugin) and the Publisher, using Docker. 
 
 ## Prerequisites
 
-For using Superdesk and Publisher tohetger, the following line must be added the to `hosts` file on local machine, if it doesn't exist:
+For using Superdesk and Publisher together, the following line must be added the to the `hosts` file on the local machine, if it doesn't exist:
 
 ```
 127.0.0.1  superdesk.local publisher.local
 ```
 
 
-Both ```superdesk.local``` and ```publisher.local``` are configured as aliases for appropriate Superdesk and Publisher containers.
+Both ```superdesk.local``` and ```publisher.local``` are configured as aliases for respective Superdesk and Publisher containers.
 
-Before continuing, Docker network should be set, if it doesn't exist:
+Before continuing, the Docker network should be set, if it doesn't exist:
 
 ```bash
 docker network create sp-publisher-network
@@ -22,7 +22,7 @@ docker network create sp-publisher-network
 
 ## Superdesk
 
-Clone Superdesk with the Publisher plugin repository 
+Clone Superdesk with the Publisher plugin repository:
 
 ``` bash
 git clone -b docker https://github.com/superdesk/superdesk-sp
@@ -110,7 +110,7 @@ Execute commands inside ```superdesk-sp``` directory:
 cd superdesk-sp
 ```
 
-Start superdesk using the ```docker-compose.yml``` file:
+Start Superdesk using the ```docker-compose.yml``` file:
 
 ``` bash
 docker-compose up -d
@@ -122,15 +122,22 @@ Finish Superdesk setup:
 docker-compose run superdesk-server /opt/superdesk/docker/start.sh
 ```
 
+After the first start, the Superdesk gets populated with the demo data, which is generally a good idea. However, reinserting demo data will create problems, so after the first ```docker-compose up -d``` run, change the ```DEMO_DATA``` environment variable in ```docker-compose.yml``` to ```0``` for the ```superdesk-server``` container:
+
+```
+- DEMO_DATA=0
+```
+
+
 ### Post installation 
 
 This will install Superdesk with the Publisher plugin and make it available at [superdesk.local:8080](http://superdesk.local:8080). 
 
-In order to have it talk to the Publisher, attach to ```superdesk-sp_superdesk-client_1``` container and edit `config.random.js` (ie config.ec23ae24.js).
+To have it talk to the Publisher, attach to ```superdesk-sp_superdesk-client_1``` container and edit `config.random.js` (ie config.ec23ae24.js).
 
 ```bash
 docker exec -it superdesk-sp_superdesk-client_1 bash
-apt update && apt -y install nano
+apt update && apt -y install nano && nano config.ec23ae24.js
 ```
 
 
@@ -159,13 +166,7 @@ window.superdeskConfig = {
 	},
 };
 ```
-
-### Restarting containers
-After the first start, Superdesk is being populated with demo data, which is generally good idea. However, reinserting demo data will create problems, so after the first ```docker-compose up -d``` run, change demo data environment variable in ```docker-compose.yml``` to ```0``` for the ```superdesk-server``` container:
-
-```
-- DEMO_DATA=0
-```
+This concludes the Superdesk installation and setup, and the Publisher connection. As the Publisher is not yet installed and configured, it won't be available in Superdesk, if you try looking for it at this point. The steps for installing the Publisher are below.
 
 
 ## Publisher
@@ -175,7 +176,7 @@ If you are still in the `superdesk-sp` directory, go one step up
 cd ..
 ```
 
-Clone Publisher repository and move into the `etc/docker` directory 
+Clone the Publisher repository and move into the `etc/docker` directory 
 
 ``` bash
 git clone -b 2.4 https://github.com/superdesk/web-publisher
@@ -190,7 +191,7 @@ Copy `.env.example` to `.env`:
 cp .env.example .env
 ```
 
-`.env.example` file contains environment variable for having Publisher available at [publisher.local](http://publisher.local), and connected to Superdesk at [superdesk.local:8080](http://superdesk.local:8080) (available in superdesk-client Docker container). 
+`.env.example` file contains an environment variable for having the Publisher available at [publisher.local](http://publisher.local), and connected to Superdesk at [superdesk.local:8080](http://superdesk.local:8080) (available in superdesk-client Docker container). 
 
 Copy `.docker-compose.yml.example` to `.docker-compose.yml.`
 
@@ -228,11 +229,11 @@ docker-compose run php php bin/console doctrine:database:create
 docker-compose run php php bin/console doctrine:migrations:migrate --no-interaction 
 ```
 
-### Tenants and organisation
+### Tenants and organization
 
-There are two options:
-* Load tenants and organization sample data fixtures
-* Setup the tenant manually
+There are two options for creating organization and tenants:
+* Load sample data fixtures
+* Manual setup
 
 #### Load tenants and organization sample data with fixtures
 
@@ -253,7 +254,7 @@ docker-compose run php php bin/console sylius:theme:assets:install
 
 Skip the next step (Setup the tenant manually)
 
-#### Setup the tenant manually
+#### Manual setup
 
 ##### Create Elasticsearch indexes
 
@@ -311,12 +312,12 @@ docker exec docker_php_1 sh -c 'chown -R www-data:www-data /var/www/publisher/va
 
 ### Preview
 
-Go to http://publisher.local for viewing the app in dev mode.
+Go to http://publisher.local to view the app in dev mode.
 
-### Configure (optional)
+### Optional configuration
 
 If you use Docker for Windows, you might need to additionally 
-change the values of `SWP_DOMAIN` and `CACHE_SERVERS` env vars from `localhost` to `127.0.0.1` in `.env` file.
+change the values of `SWP_DOMAIN` and `CACHE_SERVERS` env vars from `localhost` to `127.0.0.1` in the `.env` file.
 
 ### Where to see nginx logs?
 
@@ -328,9 +329,11 @@ change the values of `SWP_DOMAIN` and `CACHE_SERVERS` env vars from `localhost`
 
 ## Setting up Superdesk to talk to Publisher
 
-After successfully finishing both installations, there are additional steps in order to have articles being published from Superdesk to Publisher. 
+After successfully finishing both installations, there are additional steps to have articles published from the Superdesk to the Publisher. 
+
+First of all, check if the Superdesk and Publisher are talking to each other, assuming that the Publisher is installed and available at [publisher.local](http://publisher.local): go to the hamburger menu in the upper left corner of the Superdesk interface, and choose Publisher Settings.
 
-First of all, check if Superdesk and Publisher are talking to each other, assuming that the Publisher is installed and available at [publisher.local](http://publisher.local): go to the hamburger menu in the upper left corner, and choose Publisher Settings, Publisher tenant(s) should be listed.
+Publisher tenant(s) should be listed.
 
 ### Create product
 
@@ -340,23 +343,23 @@ https://www.youtube.com/watch?v=g_lVOJ5aOzQ
 
 ### Create Subscriber
 
-In order to push content from Superdesk to Publisher, a Subscriber must be added with following information (replicate the setup from the video):
+To push content from the Superdesk to the Publisher, a Subscriber must be added with the following information (replicate the setup from the video):
 
 **Destination**
 * Resource URL: http://publisher.local/api/v2/content/push
-* Assest URL: http://publisher.local/api/v2/assets/push
+* Asset URL: 
 
 https://www.youtube.com/watch?v=wjsVBM88IRg (**this video uses the older version with publisher.local:8080, use publisher.local instead**)
 
-### Create “catch all” publishing rule
+### Create a “catch all” publishing rule
 
-After the content is sent to Publisher’s subscriber, Publisher needs a generic rule to “catch” and publish it. Therefore one “catch all” rule should be created.
+After the content is sent to the Publisher’s subscriber, the Publisher needs a generic rule to “catch” and publish it. Therefore one “catch all” rule should be created.
 
-In *[Publisher Settings](http://superdesk.local:8080/#/publisher/settings)* (available in the Superdesk "hamburger" menu) choose *Publishing Rules* from the left pane, click *Add new* and choose *Organizational rule*.  Name it *catch-all*, switch on *Catch all* toggle, click + button under *Destination (Tenants)*, choose your tenant and click *Save*.
+In *[Publisher Settings](http://superdesk.local:8080/#/publisher/settings)* (available in the Superdesk "hamburger" menu) choose *Publishing Rules* from the left pane, click *Add new* and choose *Organizational rule*.  Name it *catch-all*, switch on *Catch all* toggle, click + button under *Destination (Tenants)*, choose your tenant, and click *Save*.
 
 
 ### Create and publish an article
 
 https://www.youtube.com/watch?v=UDCZdEfGfHI
 
-This process can be automated by creating publishing rules with category targeting (specific category publishes to specific route). Article flow from Superdesk to Publisher  can be monitored in the Publisher Output Control.
+This process can be automated by creating publishing rules with category targeting (specific category publishes to the specific route). Article flow from Superdesk to Publisher  can be monitored in the Publisher Output Control.