Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:discourse-documentation into charm-k8s-ingress:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: 5aa4cfd5f4ea201e1c6c183e726ac3ab1c3032ca
Merged at revision: d2b050d301a5b50368f4627253698bd6fd0b03d8
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:discourse-documentation
Merge into: charm-k8s-ingress:master
Diff against target: 30 lines (+6/-1)
2 files modified
README.md (+5/-1)
metadata.yaml (+1/-0)
Reviewer Review Type Date Requested Status
ingress-charmers Pending
Review via email: mp+401597@code.launchpad.net

Commit message

Add links to discourse-based documentation on charmhub

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision d2b050d301a5b50368f4627253698bd6fd0b03d8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index d156990..4fa3c98 100644
3--- a/README.md
4+++ b/README.md
5@@ -1,4 +1,4 @@
6-# Ingress Operator
7+# Nginx Ingress Integrator
8
9 ## Description
10
11@@ -70,3 +70,7 @@ sent by the relation, but will use a `service-port` of 8080.
12 ## Testing
13
14 Simply run `make test`.
15+
16+---
17+
18+For more details, [see here](https://charmhub.io/nginx-ingress-integrator/docs).
19diff --git a/metadata.yaml b/metadata.yaml
20index ec3b17e..5cf5107 100644
21--- a/metadata.yaml
22+++ b/metadata.yaml
23@@ -5,6 +5,7 @@ description: |
24 An operator to configure a kubernetes ingress.
25 summary: |
26 An operator to configure a kubernetes ingress.
27+docs: https://discourse.charmhub.io/t/nginx-ingress-integrator-docs-index/4511
28 bases:
29 - name: ubuntu
30 channel: 20.04/stable

Subscribers

People subscribed via source and target branches

to all changes: