fixing weird merge issue

Author: switch180

content/relational-migration/application refactoring/index2.en.md

@@ -29,4 +29,4 @@ open a different browser and navigate to the web app:
 (You can also open the same browser in Incognito Mode for this step.)
 
 5. Click the Target API button and paste in the new Rest API URL.
-6. Notice the title of the page has updated to **DynamoDB App** in a blue color.
+6. Notice the title of the page has updated to **DynamoDB App** in a blue color. If it isn't blue, you can refresh the page and see the color change.

content/relational-migration/data migration/index3.en.md

@@ -44,6 +44,7 @@ We can also check the import status within the AWS Console.
 4. In the search box, type DynamoDB to visit the DyanmoDB console.
 5. From the left nav, click Imports from S3.
 6. Notice your import is listed along with the current status. 
+ ![Import from S3](/static/images/relational-migration/import-from-s3.png)
 7. Once the import has completed, you can click it to see a summary including item count and the size of the import.
 8. On the left nav, click to Tables.
 9. In the list of tables, click on the Customers table.

content/relational-migration/index.en.md

@@ -58,7 +58,7 @@ then apply them to create a new VIEW and use this to perform a custom import.
 Developer challenge: Write a new set of data access functions that point to DynamoDB.
 
 ### Runtime environment
-This workshop is designed to run in an AWS-provided environment that includes a MySQL database on EC2.
+This workshop is designed to run in an immersion day on Workshop Studio in an AWS-provided environment that includes a MySQL database on EC2. It cannot be run in your own AWS account, however the code is all open source.
 
 ### Technical Depth
 This workshop is a L300 level workshop. Having SQL, Python, and Bash skills will help but are not required.

content/relational-migration/setup/index.en.md

@@ -14,8 +14,6 @@ You likely have a developer desktop or laptop,
 the ability to find and clone the public Github code repository,
 and a running MySQL database instance.
 You can create a new Amazon S3 bucket quickly, which can be used as a staging area for data to be migrated. 
-All the steps, tools, and scripts presented in the workshop are designed to be taken home with you
-so you can perform a real database migration.
 
 
 

content/relational-migration/setup/index2.en.md

@@ -26,8 +26,6 @@ The Lambda source code project has been setup as follows
 
 
 1. Next, let's deploy the Chalice application stack.
-   The deploy may take up to three minutes, be patient.
-
 ```bash
 chalice deploy --stage relational
 ```

contentspec.yaml

@@ -13,4 +13,4 @@ params:
   event_driven_architecture_lab_yaml : "https://s3.amazonaws.com/amazon-dynamodb-labs.com/assets/event-driven-cfn.yaml"
   github_contributing_guide : "https://github.com/aws-samples/amazon-dynamodb-labs/blob/master/CONTRIBUTING.md"
   github_issues_link : "https://github.com/aws-samples/amazon-dynamodb-labs/issues"
-  lsql_git_commit : "cea34bc520512c70091aba2995de0e99a31d1078"
+  lsql_git_commit : "47a43bedf75bc0859e9141ad1bdd1f330f0933f1"