Resolved merge conflict

Author: Roger Berlind

404.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
@@ -23,7 +23,7 @@
 
     <div class="container">
       <div class="header clearfix">
-        <div class="header-home"><a href="/">Socks Shop</a></div>
+        <div class="header-home"><a href="/">Sock Shop</a></div>
         <nav>
           <ul class="nav header-nav">
             <li class=""><a href="/docs/quickstart.html">Quickstart</a></li>
@@ -54,13 +54,13 @@ <h2>Socks Not Found</h2>
           <div class="col-sm-6">
             <h3>Open Source &amp; Free</h3>
             <p>
-              Socks Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
+              Sock Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
             </p>
           </div>
           <div class="col-sm-6">
-            <h3>Socks Shop on Slack</h3>
+            <h3>Sock Shop on Slack</h3>
             <p>
-              The Weave Community hosts the Socks Shop Slack channel.
+              The Weave Community hosts the Sock Shop Slack channel.
               <a href="https://weaveworks.github.io/community-slack/" target="_blank">Join Slack</a> and tell us how you're using the app.
             </p>
           </div>

_includes/header.html

@@ -1,5 +1,5 @@
 <div class="header clearfix">
-<div class="header-home"><a href="{{site.main_url_prefix}}/">Socks Shop</a></div>
+<div class="header-home"><a href="{{site.main_url_prefix}}/">Sock Shop</a></div>
 <nav>
   <ul class="nav header-nav">
     <li class="{% if include.quickstart %}active{% endif %}"><a href="/docs/quickstart.html">Quickstart</a></li>

_layouts/api.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

_layouts/default.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

_layouts/quickstart.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Microservices Demo: Socks Shop</title>
+    <title>Microservices Demo: Sock Shop</title>
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

deployment/apcera.md

@@ -13,6 +13,7 @@ Apcera has tested Sock Shop on the Apcera Community Edition running single-cloud
 
 The Sock Shop application is packaged and configured for Apcera using a [Multi-Resource Manifest file](https://docs.apcera.com/jobs/multi-resource-manifests/) called sockshop-docker.json which is similar to a Docker Compose file. Scripts are provided to make it easy to deploy all the services and a network from the manifest, to start and stop the services, and to delete everything that was deployed.
 
+
 ### Pre-requisites
 
 - Set up your preferred private or public cloud environment, preferably AWS, Google, Azure, or VMware.
@@ -59,6 +60,7 @@ After determining your targeted cluster and default namespace, this script does
 - It creates [job affinity tags](https://docs.apcera.com/jobs/job-affinity/) to make sure that each service that uses a database is deployed to the same Apcera instance manager as the database.
 - It then runs the startSockShop.sh script to start all of the Sock Shop services.
 
+
 Altogether, the script should take under two minutes to run.
 
 ### Using
@@ -83,6 +85,7 @@ You can use the startSockShop.sh and stopSockShop.sh scripts to start and stop a
 
 Run the deleteSockShop.sh script to delete the Sock Shop services and network.
 
+
 <!-- deploy-doc-start destroy-infrastructure -->
 
     ./deleteSockShop.sh

deployment/ecs-weave-shippable.md

@@ -6,7 +6,7 @@ layout: default
 
 
 ### Goal
-In this scenario, you'll set up and run the containerized Socks Shop
+In this scenario, you'll set up and run the containerized Sock Shop
 eCommerce application, with fully automated deployments, in 30
 minutes or less.
 
@@ -94,7 +94,7 @@ Take note of the following values:
 ### Configure an automated CI/CD pipeline
 
 Your Weave-enabled Amazon ECS cluster should now be running 15 out of the 16 services
-of the Socks Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
+of the Sock Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
 We'll use Shippable to set up an automated CI/CD pipeline to deploy the
 <a href="https://github.com/microservices-demo/front-end" style="color: orange">
 front-end</a> service.

docs/index.md

@@ -7,14 +7,14 @@ layout: default
 
 <h2>Introduction</h2>
 <p>
-  Socks Shop microservices are designed to have minimal expectations, using DNS to find other services.
+  Sock Shop microservices are designed to have minimal expectations, using DNS to find other services.
   This means that it is possible to insert load-balancers and service routers, as required or desired.
 </p>
 <p>
   There are pre-built configuration scripts for various platforms that aim to make running the whole application simple.
 </p>
 <p>
-  Socks Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
+  Sock Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
 </p>
 <p>
   Please let us know how you use it!

docs/quickstart.md

@@ -3,7 +3,7 @@ layout: quickstart
 ---
 ## Quick start
 
-  The easiest and fastest way to get started with the Socks Shop application is by using Docker Compose.  If you don't have Docker and Compose installed, 
+  The easiest and fastest way to get started with the Sock Shop application is by using Docker Compose.  If you don't have Docker and Compose installed, 
   please visit the [the Docker website](https://www.docker.com) for instructions on how to install them.
 
 ### Clone the application repository

docs/user-accounts.md

@@ -2,7 +2,7 @@
 layout: default
 ---
 <h2>User Accounts</h2>
-<p>To log into Socks Shop and complete a transaction, you'll need credentials. 
+<p>To log into Sock Shop and complete a transaction, you'll need credentials. 
   The 'user' microservice ships with the following accounts.</p>
 <table class="user-creds">
   <thead>