format more commands to the shortcode

Author: dfangl

Diff for: content/en/docs/Local AWS Services/cloudformation/index.md

@@ -50,17 +50,17 @@ services:
       - SERVICES=cloudformation,s3,iam
 
 ```
-{{< command >}}
-## start the container
-$ docker-compose up -d
+```bash
+# start the container
+docker-compose up -d
 
-## check if all services have started (look for a line reading "Ready.")
-$ docker-compose logs
+# check if all services have started (look for a line reading "Ready.")
+docker-compose logs
 
-## check if all required services are up
-## the output should include:  {"s3": "running", "iam": "running"}
-$ curl http://localhost:4566/health
-{{< / command >}}
+# check if all required services are up
+# the output should include:  {"s3": "running", "iam": "running"}
+curl http://localhost:4566/health
+```
 
 #### 2. Write and deploy a simple CloudFormation stack
 
@@ -88,18 +88,18 @@ Resources:
 
 Use this code snippet and save the content in either `cfn-quickstart-stack.yaml` or `cfn-quickstart-stack.json` respectively.
 
-{{< command >}}
-## Deploy the bucket on LocalStack
-## The template file (ending with .yaml or .json) should contain the stack content from above
-$ awslocal cloudformation deploy --stack-name cfn-quickstart-stack --template-file "./cfn-quickstart-stack.yaml"
+```bash
+# Deploy the bucket on LocalStack
+# The template file (ending with .yaml or .json) should contain the stack content from above
+awslocal cloudformation deploy --stack-name cfn-quickstart-stack --template-file "./cfn-quickstart-stack.yaml"
 
-## Verify the bucket was created successfully
-## The output should include a bucket with the name cfn-quickstart-bucket
-$ awslocal s3api list-buckets
+# Verify the bucket was created successfully
+# The output should include a bucket with the name cfn-quickstart-bucket
+awslocal s3api list-buckets
 
-## Delete the stack (this will also delete the bucket)
-$ awslocal cloudformation delete-stack --stack-name cfn-quickstart-stack
-{{< / command >}}
+# Delete the stack (this will also delete the bucket)
+awslocal cloudformation delete-stack --stack-name cfn-quickstart-stack
+```
 
 Check out the official [AWS CloudFormation User Guide](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/Welcome.html) for a general introduction to CloudFormation concepts and a more comprehensive introduction on how to write CloudFormation templates.
 

Diff for: content/en/docs/Local AWS Services/kinesis/index.md

@@ -13,7 +13,7 @@ Kinesis is shipped with the LocalStack Community version and is [extensively sup
 Trying to run the example applications from the [official AWS developer guide](https://docs.aws.amazon.com/streams/latest/dev/examples.html) against LocalStack is a great place to start.
 Assuming you have `awslocal` installed you can also try out the following commands:
 
-```bash
+{{< command >}}
 $ awslocal kinesis create-stream --stream-name samplestream --shard-count 
 
 $ awslocal kinesis list-streams 
@@ -29,7 +29,7 @@ $ awslocal kinesis put-record --cli-binary-format raw-in-base64-out --stream-nam
     "SequenceNumber": "49622467803485029265018102167378141645049970239670845458",
     "EncryptionType": "NONE"
 }
-```
+{{< / command >}}
 
 ## Kinesis backend providers
 

Diff for: content/en/docs/Local AWS Services/s3/index.md

@@ -12,7 +12,7 @@ S3 is shipped with the LocalStack Community version and is [extensively supporte
 
 Assuming you have [`awslocal`]({{< ref "aws-cli" >}}) installed you can also try the following commands:
 
-```bash
+{{< command >}}
 $ awslocal s3api create-bucket --bucket sample-bucket
 
 {
@@ -38,7 +38,7 @@ $ awslocal s3api put-object --bucket sample-bucket --key index.html --body index
 {
     "ETag": "\"d41d8cd98f00b204e9800998ecf8427e\""
 }
-```
+{{< / command >}}
 
  When working with the `SERVICES` environment variable, please make sure to include `s3` in the list of services.
 For instance, to load the S3, SQS, and Kinesis service you'd pass the variable as `SERVICES=s3,sqs,kinesis`.

Diff for: content/en/docs/Local AWS Services/sqs/index.md

@@ -12,7 +12,7 @@ Trying to run the examples in the [official AWS developer](https://docs.aws.amaz
 
 Assuming you have [`awslocal`]({{< ref "aws-cli" >}}) installed you can also try the following commands:
 
-```bash
+{{< command >}}
 $ awslocal sqs create-queue --queue-name sample-queue
 {
     "QueueUrl": "http://localhost:4566/000000000000/sample-queue"
@@ -26,12 +26,11 @@ $ awslocal sqs list-queues
 }
 
 $ awslocal sqs send-message --queue-url http://localhost:4566/00000000000/sample-queue --message-body test
-
 {
     "MD5OfMessageBody": "098f6bcd4621d373cade4e832627b4f6",
     "MessageId": "74861aab-05f8-0a75-ae20-74d109b7a76e"
 }
-```
+{{< / command >}}
 
 When working with the `SERVICES` environment variable, please make sure to include `sqs` in the list of services.
 For instance, to load the DynamoDB, SQS, and Kinesis service you'd pass the variable as `SERVICES=dynamodb,sqs,kinesis`.

Diff for: content/en/docs/Understanding LocalStack/configuration.md

@@ -8,9 +8,9 @@ description: >
 LocalStack allows for many different configuration options.
 You can pass these via environment variables, e.g., like the following:
 
-```bash
-SERVICES=kinesis,lambda,sqs,dynamodb DEBUG=1 localstack start
-```
+{{< command >}}
+$ SERVICES=kinesis,lambda,sqs,dynamodb DEBUG=1 localstack start
+{{< / command >}}
 
 ## Core
 

Diff for: layouts/shortcodes/command.html

@@ -1,7 +1,7 @@
 {{/* Command shortcode. Current limitations: will interpret comments as root command (# prefixes will not be selectable, use ## if this is necessary)*/}}
 
 {{ $inner := trim .Inner "\n" }}
-{{ $inner = replaceRE `(?m)^\s*((?:\$|#)\s)` "###CUSTOM_PREFIX###$1###CUSTOM_PREFIX_END###" $inner}}
+{{ $inner = replaceRE `(?m)^ *((?:\$|#) )` "###CUSTOM_PREFIX###$1###CUSTOM_PREFIX_END###" $inner}}
 {{ $options := "" }}
 {{ with .Get 0 }}
 {{ $options = . }}