From 9235fa29bf2e18976109ed48166d6b8a979b59c2 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Mon, 17 Jun 2019 15:03:02 -0700 Subject: [PATCH 1/2] Fix minor typo --- tools/releaseTools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseTools.psm1 b/tools/releaseTools.psm1 index 66fd322a885..bfb5fb973cd 100644 --- a/tools/releaseTools.psm1 +++ b/tools/releaseTools.psm1 @@ -159,7 +159,7 @@ function Get-ChangeLog ## and eventually merge the release branch back to the master branch. This will result in different commit nodes ## in master branch that actually represent same set of changes. ## - ## In this case, we cannot simply use the revision range "$tag_hash..HEAD" becuase it will include the original + ## In this case, we cannot simply use the revision range "$tag_hash..HEAD" because it will include the original ## commits in the master branch that were cherry-picked to the release branch -- they are reachable from 'HEAD' ## but not reachable from the last release tag. Instead, we need to exclude the commits that were cherry-picked, ## and only include the commits that are not in the last release into the change log. From a2df8680fd069210bf5765bad525747ffd24db4d Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Mon, 17 Jun 2019 15:06:33 -0700 Subject: [PATCH 2/2] another --- src/System.Management.Automation/engine/hostifaces/History.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Management.Automation/engine/hostifaces/History.cs b/src/System.Management.Automation/engine/hostifaces/History.cs index 8ba4373d3c9..3f800bbc526 100644 --- a/src/System.Management.Automation/engine/hostifaces/History.cs +++ b/src/System.Management.Automation/engine/hostifaces/History.cs @@ -1816,7 +1816,7 @@ private void ClearHistoryByID() ); } else - {// if id,count adn newest parameters are present + {// if id,count and newest parameters are present // throw an exception for invalid count values long id = _id[0];