diff --git a/docs/content/faq/how-can-i-deploy-a-docker-image.md b/docs/content/faq/how-can-i-deploy-a-docker-image.md index 9b978eaffd..f621bf2dc0 100644 --- a/docs/content/faq/how-can-i-deploy-a-docker-image.md +++ b/docs/content/faq/how-can-i-deploy-a-docker-image.md @@ -32,7 +32,7 @@ Create a file called `config.json`, which you will pass to `flynn release add` v } ``` -Flynn requires the Docker Docker image's registry URL to install. The easiest way to get this is to pull the image from the Docker registry and print its ID using the Docker CLI. +Flynn requires the Docker image's registry URL. The easiest way to get this is to pull the image from the Docker registry and print its ID using the Docker CLI. $ docker pull memcached $ docker images --no-trunc|grep memcached @@ -43,7 +43,7 @@ Now, you can create the app via the Flynn CLI, create a release using the Docker # Create the app. $ flynn create --remote "" memcached - # Create a release using the Docker registries url. + # Create a release using the Docker registry url. $ flynn -a memcached release add -f config.json "https://registry.hub.docker.com?name=memcached&id=8937d6d027a4f52b877aacd9faa68b8a89652d858845e1ea2cf7bc6a8306db00" # Start the service by scaling it up. diff --git a/docs/content/faq/how-can-i-pass-configuration-to-my-app.md b/docs/content/faq/how-can-i-pass-configuration-to-my-app.md index 0618baa8aa..ee0759fb2a 100644 --- a/docs/content/faq/how-can-i-pass-configuration-to-my-app.md +++ b/docs/content/faq/how-can-i-pass-configuration-to-my-app.md @@ -12,7 +12,7 @@ Flynn deploys apps directly from a git repository without a configuration manage This has the added benefits of supporting multiple arbitrary environments without a dedicated configuration file for each, and making configuration changes without going through the cycle of code change, commit, code review, and deploy. -To set a configuration variable via the CLI, use `flynn set NAME=value`, e.g.: +To set a configuration variable via the CLI, use `flynn env set NAME=value`, e.g.: # Set the environment variable SECRET in myapp flynn -a myapp env set SECRET=thisismysecret diff --git a/docs/content/faq/how-can-i-use-multiple-clusters-with-cli.md b/docs/content/faq/how-can-i-use-multiple-clusters-with-cli.md index 9772100480..3dd6ee8802 100644 --- a/docs/content/faq/how-can-i-use-multiple-clusters-with-cli.md +++ b/docs/content/faq/how-can-i-use-multiple-clusters-with-cli.md @@ -1,12 +1,12 @@ --- -title: How can I use multiple Flynn clusters with the CLI tool +title: How can I use multiple Flynn clusters with the CLI tool? layout: docs toc_min_level: 2 --- -# How can I use multiple Flynn clusters with the CLI tool +# How can I use multiple Flynn clusters with the CLI tool? -Flynn's supports CLI multiple clusters out of the box. Use the `-c` option to specify a cluster by name. +The Flynn CLI supports multiple clusters out of the box. Use the `-c` flag to specify a cluster by name. # List apps on a Flynn cluster named production $ flynn -c production apps diff --git a/docs/content/faq/how-can-i-use-my-own-domain.md b/docs/content/faq/how-can-i-use-my-own-domain.md index 8ddc6532bb..edcb2b9f99 100644 --- a/docs/content/faq/how-can-i-use-my-own-domain.md +++ b/docs/content/faq/how-can-i-use-my-own-domain.md @@ -6,13 +6,13 @@ toc_min_level: 2 # How can I use my own domain in Flynn? -Flynn clusters are provisioned a flynnhub.com domain under which all hostnames — including apps — reside, e.g. wordpress-master-master.evoa.flynnhub.com. The simplest approach to using your own domain name is to add a CNAME in your domain for each app. +Flynn clusters are provisioned with a flynnhub.com domain under which all hostnames — including apps — reside, e.g. wordpress-master-master.evoa.flynnhub.com. The simplest way to use your own domain is to add a CNAME for each app. wordpress.mydomain.com. IN CNAME wordpress-master-master.evoa.flynnhub.com -You must also add your new domain to the app, either in the dashboard or via the CLI. +You must also add a route for your domain to the app, either in the dashboard or via the CLI. - # Add a domain via the `flynn route` command + # Add a route using the `flynn route` command $ flynn route add http wordpress.mydomain.com ![adding a domain](/images/docs/add-domain.png)