Merge branch 'develop' into version_bump

thoward-godaddy · Nov 7, 2018 · 092ac01 · 092ac01
2 parents 80ed232 + b8e616a
commit 092ac01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -50,7 +50,7 @@ Learn how to get started using the SAM CLI with these guides:
 -  `Running and debugging serverless applications locally <docs/usage.rst>`__: Describes how to use SAM CLI for invoking Lambda functions locally, running automated tests, fetching logs, and debugging applications
 -  `Packaging and deploying your application <docs/deploying_serverless_applications.rst>`__: Deploy your local application using an S3 bucket, and AWS CloudFormation.
 -  `Advanced <docs/advanced_usage.rst>`__: Learn how to work with compiled languages (such as Java and .NET), configure IAM credentials, provide environment variables, and more.
--  `Examples <#examples>`__
+-  `Examples <https://github.com/awslabs/serverless-application-model/tree/master/examples/apps>`__
 
 
 Project Status

diff --git a/samcli/local/init/exceptions.py b/samcli/local/init/exceptions.py
@@ -14,4 +14,4 @@ def __init__(self, **kwargs):
 
 class GenerateProjectFailedError(InitErrorException):
     fmt = \
-        ("An error ocurred while generating this {project}: {provider_error}")
+        ("An error occurred while generating this {project}: {provider_error}")