Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

Documentation update

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Gareth Woolridge (moon127)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision f6c73b0136d6b20eea9132a7d99a4d4f75232a71

diff --git a/README.md b/README.md
index 6c8562e..a5c94e4 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,14 @@ Or via juju config (Juju 2.x)
 
 The livepatch_key setting must be configured in order for the software to function correctly - see above.
 
-By default, the livepatch software will attempt to retrieve its patch data directly over the network. If you'd like to use an HTTPS web proxy for this traffic instead, you can set the livepatch_proxy value to the address of your proxy server.
+By default, the livepatch software will attempt to retrieve its patch data directly over the network. If you'd like to use a proxy for this traffic instead, you can set the livepatch_proxy value to the address of your proxy server.
 
 Likewise, if you need to use a proxy server to access the Snap Store, snap_proxy can also be set to the address of your proxy server.
 
+Alternatively, if you've configured a proxy for all applications in your environment via juju model-config, the charm will detect this and automatically do the right thing. It'll use http-proxy or https-proxy if either are set, with the latter being preferred.
+
+If two different proxies are set via model config and charm config, the latter will be preferred.
+
 # Contact Information
 
 This charm is maintained here, by the livepatch-charmers team: