Merge lp:~simpoir/landscape-charm/trivial_doc_updates into lp:~landscape/landscape-charm/trunk

[Simon Poirier]

Trivial documentation updates on config and actions.

Trivial documentation updates on config and actions.

[Daniel Manrique (roadmr)]

+1

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 402
Branch: lp:~simpoir/landscape-charm/trivial_doc_updates
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1318/

review: Approve (test results)

=== modified file 'README.md'
--- README.md	2019-01-24 18:01:41 +0000
+++ README.md	2020-02-27 16:18:16 +0000
@@ -38,9 +38,9 @@
 license-file
 ------------
 
-You can set this as a juju configuration option after deployment on each deployed landscape-service like:
+You can set this as a juju configuration option after deployment on each deployed landscape-server application like:
 
-    $ juju set <landscape-service> "license-file=$(cat license-file)"
+    $ juju config landscape-server "license-file=$(cat license-file)"
 
 
 SSL
 
=== modified file 'actions.yaml'
--- actions.yaml	2019-05-28 20:36:35 +0000
+++ actions.yaml	2020-02-27 16:18:16 +0000
@@ -1,10 +1,7 @@
 pause:
-  description: Pause the Landscape unit. This action will interrupt any
-    Landscape-related processing on the unit and prevent any further processing
-    from happening.
+  description: Pause the Landscape service.
 resume:
-  description: Resume the Landscape unit. This action will start all the
-    Landscape services on the unit.
+  description: Resume the Landscape service.
 upgrade:
   description: Upgrade software on the Landscape unit. This action will update
     APT package indexes and upgrade the landscape-server package.