Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:deploy-from-charmhub into charm-k8s-ingress:master

[Tom Haddon]

We can now deploy from charmhub direct

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

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

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

Merge proposal is approved, but source revision has changed, setting status to needs review.

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

Change successfully merged at revision 482c095489fef0e4c3852cc0967e9f4595339117

diff --git a/README.md b/README.md
index 9f2052b..d156990 100644
--- a/README.md
+++ b/README.md
@@ -10,20 +10,12 @@ size, etc.).
 
 ## Usage
 
-This charm needs to be built locally as charmhub.io can't yet host charms with
-"bases" in `metadata.yaml`. Once that's been added, deployment instructions
-will be updated, but for now, see the "Running the charm locally" section
-below.
-
-## Running the charm locally
-
-To build the charm, run `charmcraft build`.
-
 You'll need version to be using Juju [version 2.9-rc11](https://discourse.charmhub.io/t/juju-2-9-rc11-release-notes/4501) or later.
 
-As an example, you could deploy this charm as follows:
+As an example, you could deploy this charm as follows (we're using the name
+"ingress" in this model for brevity):
 ```
-juju deploy ./nginx-ingress-integrator.charm ingress --resource placeholder-image=google/pause
+juju deploy nginx-ingress-integrator ingress
 ```
 To create an ingress for your service, you'd then add a relation to a charm
 that supports the `ingress` relation. As an example:
@@ -67,7 +59,7 @@ can still override the configuration of the ingress using Juju config. Using
 the above example, where your charm sets the `service-port` as "80" in the
 relation, you could override this by doing the following:
 ```
-juju deploy ./nginx-ingress-integrator.charm ingress --resource placeholder-image='google/pause' --config kube-config="$(microk8s config)"
+juju deploy nginx-ingress-integrator ingress
 juju deploy ./gunicorn.charm --resource gunicorn-image='gunicorncharmers/gunicorn-app:edge'
 juju relate ingress gunicorn
 juju config ingress service-port=8080
diff --git a/lib/charms/nginx_ingress_integrator/v0/ingress.py b/lib/charms/nginx_ingress_integrator/v0/ingress.py
index a935d5a..066b257 100644
--- a/lib/charms/nginx_ingress_integrator/v0/ingress.py
+++ b/lib/charms/nginx_ingress_integrator/v0/ingress.py
@@ -19,7 +19,7 @@ Import `IngressRequires` in your charm, with two required options:
     - session-cookie-max-age
     - tls-secret-name
 
-See `config.yaml` for descriptions of each, along with the required type.
+See [the config section](https://charmhub.io/nginx-ingress-integrator/configure) for descriptions of each, along with the required type.
 
 As an example, add the following to `src/charm.py`:
 ```
@@ -55,7 +55,7 @@ LIBAPI = 0
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 3
+LIBPATCH = 4
 
 logger = logging.getLogger(__name__)