Merge ~woutervb/snap-store-proxy-charm:sync_doc_with_store-admin_register into snap-store-proxy-charm:master

[Wouter van Bommel]

Remove base64 references for registration_bundle

Since the tools `store-admin` will already output the data in the
correct format for juju config to consume, there is no need for the end
user to do any manipulation. So the documentation is updated to reflect
this.

[Jonathan Hartley (tartley)]

Oooh! Updated docs! :-) Approved!

review: Approve

diff --git a/README.md b/README.md
index 9ca4d72..2e2d77c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Below is a minimal bundle example that can be used to deploy the charm using juj
       snap-store-proxy:
         charm: snap-store-proxy-charm
         options:
-          registration_bundle: <content of registration file base64 encoded>
+          registration_bundle: <content of registration file>
 
     relations:
     - - postgresql:db-admin
@@ -45,7 +45,7 @@ There are some mandatory config options that have to be configured for the charm
 
 * **registration_bundle** - A bundle created with a snap called `snapstore-admin`. This tool supports accounts with 2 Factor authentication for Ubuntu One accounts, and contains everything to reproduce the proxy. This is the recommended way to configure the proxy. It is also a required way, if the machine on which the proxy is installed does not have an internet connection to the store. Easiest way to provide this option on the cli is the following:
 
-      juju config snap-store-proxy registration_bundle=$(cat <path to file created with snapstore-client> | base64)
+      juju config snap-store-proxy registration_bundle=$(cat <path to file created with snapstore-client>)
 
 ## Juju resource usage
 
@@ -62,7 +62,7 @@ An example bundle to do such a deployment will look like the following.
       snap-store-proxy:
         charm: snap-store-proxy
         options:
-          registration_bundle: <content of registration file base64 encoded>
+          registration_bundle: <content of registration file>
         resources:
           snap-store-proxy: ./snap-store-proxy.snap
           core: ./core20.snap
diff --git a/config.yaml b/config.yaml
index 1a194a6..1bf660f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -8,7 +8,7 @@ options:
   registration_bundle:
     default: null
     desciption: |
-      A bundle created via `snapstore-proxy_registration_bundle` added as a base64 
-      encoded string. ie "$(cat <file> | base64)"
+      Registration file generated via `store-admin`, added as ie \
+      $(cat <generated file>)
     type: string
 
diff --git a/docs/install.md b/docs/install.md
index 3f6ba93..e924349 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -56,13 +56,13 @@ can be used for installation.
 
 In both the installation examples above, the charm still needs to be
 registered. This registration has to be done via the snap `store-admin` and
-will produce a registration file. This registration file needs to be added,
-encoded using base64, to the charm option called `registration_bundle`.
+will produce a registration file. This registration file needs to be added
+to the charm option called `registration_bundle`.
 
 I this file is called `register.json` the following command can be used:
 
     juju config snap-store-proxy \
-        registration_bundle=$(cat register.json | base64 -w 0)
+        registration_bundle=$(cat <output of store-admin register>)
 
 Obviously this can also be added to the juju deployment bundle, both methods,
 registering during installation, or after installation, are supported.
diff --git a/docs/snap-store-proxy-charm docs - index.md b/docs/snap-store-proxy-charm docs - index.md
index ff47ce5..62cb23f 100644
--- a/docs/snap-store-proxy-charm docs - index.md
+++ b/docs/snap-store-proxy-charm docs - index.md
@@ -6,7 +6,7 @@ To get started, deploy the charm in a test environment as follows:
     juju deploy snap-store-proxy-charm
     juju relate postgresql:db-admin snap-store-proxy-charm:db-admin
     juju config snap-store-proxy-charm registration_bundle=\
-        $(cat <registration bundle> | base64)
+        $(cat <registration bundle>)
 
 For more information on how to obtain a registration bundle [see here](https://snapcraft.io/store-admin).
 
diff --git a/juju/overlay.yaml.example b/juju/overlay.yaml.example
index d6f4220..55b72d7 100644
--- a/juju/overlay.yaml.example
+++ b/juju/overlay.yaml.example
@@ -1,4 +1,4 @@
 applications:
   snap-store-proxy:
     options:
-      registration_bundle: `cat <registation file> | base64`
+      registration_bundle: $(`cat <registation file>`)