From dc99e1b55df44acdbce1070f327c4c8483cedd54 Mon Sep 17 00:00:00 2001 From: Lee Burton Date: Fri, 16 Sep 2016 13:36:13 -0700 Subject: [PATCH] a few more typo fixes in the contribution guide --- 1-CONTRIBUTION-GUIDE/best-practices.md | 2 +- 1-CONTRIBUTION-GUIDE/git-tutorial.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/1-CONTRIBUTION-GUIDE/best-practices.md b/1-CONTRIBUTION-GUIDE/best-practices.md index 0a80ea3b6eef..022241fd222b 100644 --- a/1-CONTRIBUTION-GUIDE/best-practices.md +++ b/1-CONTRIBUTION-GUIDE/best-practices.md @@ -172,7 +172,7 @@ The following guidelines are relevant to the main deployment template and nested Note: A complex object cannot contain an expression that references a value from a complex object. Define a separate variable for this purpose. -13. The **domainNameLabel** property for publicIPAddresses must be **unique**. domainNameLabel is required to be betweeen 3 and 63 characters long and to follow the rules specified by this regular expression ^[a-z][a-z0-9-]{1,61}[a-z0-9]$. As the uniqueString function will generate a string that is 13 characters long in the example below it is presumed that the dnsPrefixString prefix string has been checked to be no more than 50 characters long and to conform to those rules. +13. The **domainNameLabel** property for publicIPAddresses must be **unique**. domainNameLabel is required to be between 3 and 63 characters long and to follow the rules specified by this regular expression ^[a-z][a-z0-9-]{1,61}[a-z0-9]$. As the uniqueString function will generate a string that is 13 characters long in the example below it is presumed that the dnsPrefixString prefix string has been checked to be no more than 50 characters long and to conform to those rules. ``` "parameters": { diff --git a/1-CONTRIBUTION-GUIDE/git-tutorial.md b/1-CONTRIBUTION-GUIDE/git-tutorial.md index 76922afa7261..c7801bd53e39 100644 --- a/1-CONTRIBUTION-GUIDE/git-tutorial.md +++ b/1-CONTRIBUTION-GUIDE/git-tutorial.md @@ -218,7 +218,7 @@ git push -f Please note the advice further up [about default push behavior in old/outdated versions of Git](#ensure-a-safe-push-behavior). -When we're ready to merge your Pull Request, it is very likely we may ask you to "sqash your commits". To do so, read on below. +When we're ready to merge your Pull Request, it is very likely we may ask you to "squash your commits". To do so, read on below. ### Squashing Commits You should commit often. It's a great backup and safety net in case you mess up. At the same time, you don't want your pull request to contain all your commits - in practice, a pull request should contain one commit. There are obvious exceptions to this rule (like epic projects - think 'Windows support for Docker'), but your little template should most definitely be just one commit. For that to happen, we need to rewrite history. @@ -268,7 +268,7 @@ Then, once you're done, update the branch on your own fork in GitHub. Push with git push -f ``` -If you never pushed the branch before, you can use the normal push command - there's no history that we need to overwrite with the `f` paramter. +If you never pushed the branch before, you can use the normal push command - there's no history that we need to overwrite with the `f` parameter. ``` git push -u origin NAME_OF_YOUR_BRANCH