Merge pull request play-with-docker#248 from ManoMarks/master

adding new language for landing page
JohnZhaoXiaoHu · May 15, 2018 · 89a5776 · 89a5776
2 parents f28012a + 794dd17
commit 89a5776
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/www/assets/dockerconus2018.png b/www/assets/dockerconus2018.png
diff --git a/www/default/landing.html b/www/default/landing.html
@@ -54,9 +54,11 @@ <h1 class="display-3">Play with Docker</h1>
 
       <div class="row marketing">
         <div class="col-lg-12">
-            <p>Play with Docker (PWD) is a project hacked by <a href="https://www.twitter.com/marcosnils">Marcos Liljedhal</a> and <a href="https://www.twitter.com/xetorthio">Jonathan Leibiusky</a> and sponsored by Docker Inc.</p>
-            <p>PWD is a Docker playground which allows users to run Docker commands in a matter of seconds. It gives the experience of having a free Alpine Linux Virtual Machine in browser, where you can build and run Docker containers and even create clusters in <a href="https://docs.docker.com/engine/swarm/">Docker Swarm Mode</a>. Under the hood Docker-in-Docker (DinD) is used to give the effect of multiple VMs/PCs. In addition to the playground, PWD also includes a training site composed of a large set of Docker labs and quizzes from beginner to advanced level available at <a href="http://training.play-with-docker.com/">training.play-with-docker.com</a>.</p>
-        </div>
+            <p>Play with Docker (PWD) is the official Docker playground which allows users to run Docker commands in a
+             matter of seconds. You can even even manage your Swarm or Kubernetes clusters with <a href="https://www.docker.com/enterprise-edition">Docker Enterprise Edition</a>. In addition to the playground, PWD also includes a training site composed of a large set of Docker labs and quizzes from beginner to advanced level available at <a href="http://training.play-with-docker.com/">training.play-with-docker.com</a>.</p>
+            <p>And don't forget to join us June 11-15 for DockerCon in San Francisco.</p>
+            <a href="http://2018.dockercon.com/"><img src="/assets/dockercon.png"</a>
+            </div>
       </div>
 
       <footer class="footer">

diff --git a/www/k8s/landing.html b/www/k8s/landing.html
@@ -54,13 +54,12 @@ <h1 class="display-3">Play with Kubernetes</h1>
 
       <div class="row marketing">
         <div class="col-lg-12">
-            <p>Play with Kubernetes (PWK) is a project hacked by <a href="https://www.twitter.com/marcosnils">Marcos Lilljedahl</a> and <a href="https://www.twitter.com/xetorthio">Jonathan Leibiusky</a> and sponsored by Docker Inc.</p>
-            <p>PWK is a K8s playground which allows users to run K8s clusters in a matter of seconds. It gives the experience of having a free Alpine Linux Virtual Machine in browser. Under the hood Docker-in-Docker (DinD) is used to give the effect of multiple VMs/PCs.</p>
+            <p>Play with Kubernetes is a labs site provided by <a href="https://docker.com">Docker</a> and created by Tutorius. Play with Kubernetes is a playground which allows users to run K8s clusters in a matter of seconds. It gives the experience of having a free Alpine Linux Virtual Machine in browser. Under the hood Docker-in-Docker (DinD) is used to give the effect of multiple VMs/PCs.</p>
         </div>
       </div>
 
       <footer class="footer">
-        <p>&copy; Play with K8s 2017</p>
+        <p>Site provided by <a href="https://docker.com">Docker, Inc.</a>, created by Tutorius</p>
       </footer>
 
     </div>