Merge pull request #915 from sanscontext/combine-landings

improved combined Cloud landing/info pages

_data/toc.yaml

@@ -1083,8 +1083,8 @@ toc:
         title: Get support
 - sectiontitle: Docker Cloud
   section:
-  - path: /docker-cloud/overview/
+  - path: /docker-cloud/
-    title: Docker Cloud Overview
+    title: About Docker Cloud
   - path: /docker-cloud/dockerid/
     title: Docker Cloud Settings and Docker ID
   - path: /docker-cloud/orgs/

docker-cloud/index.md

@@ -1,28 +1,44 @@
 ---
 description: Docker Cloud
-keywords: Docker, cloud
+keywords: Docker, cloud, overview
-notoc: true
+redirect_from:
-title: Welcome to the Docker Cloud docs!
+  - docker-cloud/overview
+title: Docker Cloud Documentation
 ---
-
-<center>
-<img src="images/Docker-Cloud-Blue.svg" height="150" width="150" fill="#1488C6">
-</center>
-
 <style type="text/css">
 .tg td {
-  width="50%";padding:10px 5px;border:none;overflow:hidden;word-break:normal;
+  width="50%";padding:10px 5px;border:none;overflow:hidden;word-break:normal; margin-bottom: .5rem;
 }
 #DocumentationText .bluebar {
-  width="50%";font-size:20px;font-weight:bold;background-color:#1488C6;color:#ffffff;text-align:center;vertical-align:top
+  width="50%";font-size:20px;font-weight:bold;background-color:#1488C6;color:#ffffff;text-align:center;vertical-align:top;
 }
 #DocumentationText .bluebar a{
-  color:#ffffff;font-weight:normal;
+  color:#ffffff;font-weight:normal;text-decoration: underline;
 }
-.plain{
+#DocumentationText .plain p{
-  width="50%";vertical-align:top
+  font-weight:normal;margin-bottom: 0.5rem
+}
+.plain p{
+  width="50%";vertical-align:top;
+}
+.whale a img
+{
+  float:right;
 }
 </style>
+
+<center>
+<div class="whale"><a href="https://cloud.docker.com/" target="_blank"><img src="images/Docker-Cloud-Blue.svg" height="150" width="150" fill="#1488C6" alt="Docker Cloud logo" title="Let's go! Click to go to Docker Cloud." float="right"></a></div>
+</center>
+
+Docker Cloud provides a hosted [registry service](builds/repos.md) with
+[build](builds/automated-build.md) and [testing](builds/automated-testing.md)
+facilities for Dockerized application images; tools to help you set up and
+[manage host infrastructure](infrastructure/); and [application lifecycle features](apps/) to automate deploying (and redeploying) services created from
+images.
+
+Log in to Docker Cloud using your free [Docker ID](../docker-id/).
+
 <table class="tg">
   <tr>
     <td class="bluebar" width="50%"><a href="getting-started/index.md">Tutorial: Getting Started</a></td>
@@ -33,7 +49,7 @@ title: Welcome to the Docker Cloud docs!
     <td class="plain" width="50%"><p>For more advanced beginners: deploy a simple app in Docker Cloud.</p></td>
   </tr>
   <tr>
-    <td class="bluebar" width="50%"><a href="apps/index.md">Manage Apps</a></td>
+    <td class="bluebar" width="50%"><a href="apps/index.md">Manage Applications</a></td>
     <td class="bluebar" width="50%"><a href="builds/index.md">Manage Builds and Images</a></td>
   </tr>
   <tr>
@@ -47,6 +63,37 @@ title: Welcome to the Docker Cloud docs!
     <td class="plain" colspan="2"><p>Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the <a href="infrastructure/cloud-on-aws-faq.md">AWS FAQ</a> and <a href="infrastructure/cloud-on-packet.net-faq.md">Packet.net FAQ</a></p></td>
   </tr>
   <tr>
-    <td class="bluebar" colspan="2"> <a href="/apidocs/docker-cloud/">API Docs</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="docker-errors-faq.md">Frequently Asked Questions</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="release-notes.md">Release Notes</a></td>
+    <td class="bluebar" colspan="2"> <a href="/apidocs/docker-cloud/">API Docs</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="docker-errors-faq.md">Frequently Asked Questions</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="https://forums.docker.com/c/docker-cloud/release-notes">Release Notes</a></td>
   </tr>
 </table>
+
+## About Docker Cloud
+
+### Images, Builds, and Testing
+
+Docker Cloud uses the hosted Docker Cloud Registry, which allows you to publish
+Dockerized images on the internet either publicly or privately. Docker Cloud can
+also store pre-built images, or link to your source code so it can build the
+code into Docker images, and optionally test the resulting images before pushing
+them to a repository.
+
+![](images/cloud-build.png)
+
+### Infrastructure management
+
+Before you can do anything with your images, you need somewhere to run them.
+Docker Cloud allows you to link to your infrastructure or cloud services
+provider so you can provision new nodes automatically. Once you have nodes set
+up, you can deploy images directly from Docker Cloud repositories.
+
+![](images/cloud-clusters.png)
+
+### Services, Stacks, and Applications
+
+Images are just one layer in containerized applications. Once you've built an
+image, you can use it to deploy services (which are composed of one or more
+containers created from an image), or use Docker Cloud's
+[stackfiles](apps/stacks.md) to combine it with other services and
+microservices, to form a full application.
+
+![](images/cloud-stack.png)

docker-cloud/overview.md

@@ -1,44 +0,0 @@
----
-description: Docker Cloud Overview
-keywords: Docker, cloud, three
-title: Docker Cloud overview
----
-
-Docker Cloud is a hosted service that provides a Registry with build and testing
-facilities for Dockerized application images, tools to help you set up and
-manage your host infrastructure, and deployment features to help you automate
-deploying your images to your infrastructure.
-
-#### Your Docker Cloud account and Docker ID
-
-You log in to Docker Cloud using your free Docker ID. Your Docker ID is the same
-set of credentials you used to log in to Docker Hub, and this allows you to
-access your Docker Hub repositories from Docker Cloud.
-
-#### Images, Builds, and Testing
-
-Docker Cloud uses Docker Hub as an online registry service. This allows you to
-publish Dockerized images on the internet either publicly or privately. Along
-with the ability to store pre-built images, Docker Cloud can link to your source
-code repositories and manage building and testing your images before pushing the
-images.
-
-![](images/cloud-build.png)
-
-#### Infrastructure management
-
-Before you can do anything with images, you need somewhere to run them. Docker
-Cloud allows you to link to your infrastructure or cloud services provider which
-lets you provision new nodes automatically, and deploy images directly from your
-Docker Cloud repositories onto your infrastructure hosts.
-
-![](images/cloud-clusters.png)
-
-#### Services, Stacks, and Applications
-
-Images are just one layer in containerized applications. Once you've built an
-image, you can use it to produce containers, which make up a service, or use
-Docker Cloud's stackfiles to combine it with other services and microservices,
-to form a full application.
-
-![](images/cloud-stack.png)