Merge pull request docker#1330 from sanscontext/cloud-cleanup

Cloud: add cleanup instructions, remove no-local-docker instructions

docker-cloud/getting-started/deploy-app/12_data_management_with_volumes.md

@@ -14,7 +14,10 @@ you'll need to define a volume.
 
 ### Data persistence
 
-In order to persist, data in Docker Cloud must be stored in a volume. The volume can be defined on the image (for example in the Dockerfile), or specified when you create a new service in the Docker Cloud web UI. Learn more about volumes in Docker Cloud [here](../../apps/volumes.md).
+In order to persist, data in Docker Cloud must be stored in a volume. The volume
+can be defined on the image (for example in the Dockerfile), or specified when
+you create a new service in the Docker Cloud web UI. Learn more about volumes in
+Docker Cloud [here](/docker-cloud/apps/volumes.md).
 
 #### Test for lack of persistence
 
@@ -139,4 +142,13 @@ set up a volume to save the data.
 
 There's lots more to learn about Docker Cloud, so check out [the rest of our documentation](/docker-cloud/), the [API and CLI Documentation](../../../apidocs/docker-cloud.md), and our [Knowledge Hub](https://success.docker.com/Cloud) and [Docker Cloud Forums](https://forums.docker.com/c/docker-cloud).
 
+You might also want to delete or remove all of your hello world Stacks, Services, and Nodes running in Docker Cloud. To clean up when you're finished with the tutorial:
+
+- Click **Stacks** in the left navigation, hover over the stack you created and click the selection box that appears, then click **Terminate**.
+- Once the Stack has terminated, click **Services** in the left navigation, hover over each service you created, click the selection box that appears, then click **Terminate**.
+- Click **Node Clusters** in the left navigation, hover over the node cluster you created, click the selection box that appears, then click **Terminate**.
+
+Objects (Stacks, Services, Node Clusters, and Containers and nodes) still appear
+in the list in Docker Cloud for about five minutes after they are terminated.
+
 Happy Docking!

docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry.md

@@ -16,8 +16,8 @@ In step 2, you set your Docker Cloud username as an environment variable called
 > **Note**: By default, the `docker-cloud` CLI uses your default user namespace,
 meaning the repositories, nodes, and services associated with your individual
 Docker ID account name. To use the CLI to interact with objects that belong to
-an [organization](../../orgs.md), prefix these commands with
-`DOCKERCLOUD_NAMESPACE=my-organization`. See the [CLI documentation](../../installing-cli.md#use-the-docker-cloud-cli-with-an-organization) for more information.
+an [organization](/docker-cloud/orgs.md), prefix these commands with
+`DOCKERCLOUD_NAMESPACE=my-organization`. See the [CLI documentation](/docker-cloud/installing-cli.md#use-the-docker-cloud-cli-with-an-organization) for more information.
 
 
 First tag the image. Tags in this case denote different builds of an image.

docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service.md

@@ -9,15 +9,6 @@ title: Deploy the app as a Docker Cloud service
 
 In this step you will deploy the app as a Docker Cloud Service. Remember that a service is a group of containers of the same **image:tag**.
 
-What you'll do in this step is slightly different if you have Docker Engine
-installed locally or not.
-
-* If you have Docker Engine installed locally, start at
-[Deploy app with Docker Engine installed locally](5_deploy_the_app_as_a_service.md#deploy-app-with-docker-engine-installed-locally).
-
-* If you do not have Docker Engine installed locally, start at [Deploy app without Docker Engine installed locally](5_deploy_the_app_as_a_service.md#deploy-app-without-docker-engine-installed-locally).
-
-
 ## Deploy app with Docker Engine installed locally
 
 > **Note**: By default, the `docker-cloud` CLI uses your default user namespace,
@@ -38,35 +29,11 @@ or
 $ docker-cloud service run -p 80 --name web $DOCKER_ID_USER/quickstart-go
 ```
 
-Skip the next section and read about [The run command](5_deploy_the_app_as_a_service.md#the-run-command).
-
-## Deploy app without Docker Engine installed locally
-
-If you don't have Docker Engine installed locally and you have been following
-this tutorial, you probably don't have either of the quickstart images in your
-private registry in Docker Cloud. To deploy the service without Engine installed
-locally, use the public images `dockercloud/quickstart-python` or
-`dockercloud/quickstart-go` available on Docker Hub.
-
-To do this execute one of the following commands:
-
-**Python quickstart**
-
-```bash
-$ docker-cloud service run -p 80 --name web dockercloud/quickstart-python
-```
-
-**Go quickstart**
-
-```bash
-$ docker-cloud service run -p 80 --name web dockercloud/quickstart-go
-```
-
-Go to the next section to read about [The run command](5_deploy_the_app_as_a_service.md#the-run-command).
-
 ## The run command
 
-The `run` command **creates and runs** the service using the image you chose. The **-p 80** flag publishes port 80 in the container so that it is publicly accessible, and maps it to a dynamically assigned port in the node.
+The `run` command **creates and runs** the service using the image you chose.
+The **-p 80** flag publishes port 80 in the container so that it is publicly
+accessible, and maps it to a dynamically assigned port in the node.
 
 It might take a minute or two to get your service up and running. Once it
 completes the startup process, it will be in the *running* state.

docker-cloud/getting-started/your_first_service.md

@@ -116,6 +116,15 @@ Click the links icon to the right of the endpoint. This opens a new tab and show
 
 **Congratulations!** You've successfully deployed your first service using Docker Cloud.
 
+## Optional cleanup
+
+You probably don't need the `hello-world` container to run for very long after you complete the tutorial. To clean up and remove all of the resources you created during this tutorial:
+
+- Click **Services**, hover over the `hello-world` container and click the selection that box appears, then click the **Terminate** icon to the right of the service information.
+- Click **Node Clusters**, select the node cluster you created, and click the **Terminate** icon at the right end of the cluster information.
+
+Both terminated Services and Node Clusters remain in the UI for about five minutes. After that time, they no longer appear.
+
 ### What's next?
 
-Learn more about [scaling your service](../apps/service-scaling.md), or check out some of our other [Deploy an app tutorial](deploy-app/index.md).
+Learn more about [scaling your service](../apps/service-scaling.md), or check out some of our other [Deploy an app tutorial](deploy-app/index.md).