From 643858a5fc1f40f856aba10ae629ff2d008d6559 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Tue, 20 Oct 2020 19:14:20 -0700 Subject: [PATCH] Complete the branch rename from master to main --- .azure-pipelines.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- doc/CONTRIBUTING.md | 4 ++-- sources/CascadiaCode-Bold.ufo/fontinfo.plist | 2 +- sources/CascadiaCode-ExtraLight.ufo/fontinfo.plist | 2 +- sources/CascadiaCode-Regular.ufo/fontinfo.plist | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 87b1cc463..e60c8d82a 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ trigger: none pr: branches: include: - - master + - main parameters: - name: static diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 205bf76a0..935138f2c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ * [ ] Closes #xxx * [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Requires FONTLOG.txt to be updated -* [ ] Requires [/images/cascadia-code.png](/microsoft/cascadia-code/blob/master/images/cascadia-code.png) and/or [/images/cascadia-code-characters.png](/microsoft/cascadia-code/blob/master/images/cascadia-code-characters.png) to be updated +* [ ] Requires [/images/cascadia-code.png](/microsoft/cascadia-code/blob/main/images/cascadia-code.png) and/or [/images/cascadia-code-characters.png](/microsoft/cascadia-code/blob/main/images/cascadia-code-characters.png) to be updated * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx @@ -19,4 +19,4 @@ ## Before (if applicable) and After Images of the Character(s) -## Validation Steps Performed \ No newline at end of file +## Validation Steps Performed diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 960420f44..95066f4d6 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -94,10 +94,10 @@ When you'd like the team to take a look, (even if the work is not yet fully-comp ### Merge -Once your code has been reviewed and approved by the requisite number of team members, it will be merged into the master branch. Once merged, your PR will be automatically closed. +Once your code has been reviewed and approved by the requisite number of team members, it will be merged into the main branch. Once merged, your PR will be automatically closed. --- ## Thank you -Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/cascadia-code/labels/Help-Wanted)? 😜 \ No newline at end of file +Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/cascadia-code/labels/Help-Wanted)? 😜 diff --git a/sources/CascadiaCode-Bold.ufo/fontinfo.plist b/sources/CascadiaCode-Bold.ufo/fontinfo.plist index 521181063..797d6b29e 100644 --- a/sources/CascadiaCode-Bold.ufo/fontinfo.plist +++ b/sources/CascadiaCode-Bold.ufo/fontinfo.plist @@ -174,7 +174,7 @@ openTypeNameLicense Microsoft supplied font. You may use this font to create, display, and print content as permitted by the license terms or terms of use, of the Microsoft product, service, or content in which this font was included. You may only (i) embed this font in content as permitted by the embedding restrictions included in this font; and (ii) temporarily download this font to a printer or other output device to help print content. Any other use is prohibited. -The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/master/LICENSE). +The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/main/LICENSE). Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: diff --git a/sources/CascadiaCode-ExtraLight.ufo/fontinfo.plist b/sources/CascadiaCode-ExtraLight.ufo/fontinfo.plist index 31365cf8a..e2e05de14 100644 --- a/sources/CascadiaCode-ExtraLight.ufo/fontinfo.plist +++ b/sources/CascadiaCode-ExtraLight.ufo/fontinfo.plist @@ -174,7 +174,7 @@ openTypeNameLicense Microsoft supplied font. You may use this font to create, display, and print content as permitted by the license terms or terms of use, of the Microsoft product, service, or content in which this font was included. You may only (i) embed this font in content as permitted by the embedding restrictions included in this font; and (ii) temporarily download this font to a printer or other output device to help print content. Any other use is prohibited. -The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/master/LICENSE). +The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/main/LICENSE). Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: diff --git a/sources/CascadiaCode-Regular.ufo/fontinfo.plist b/sources/CascadiaCode-Regular.ufo/fontinfo.plist index 28c3c507d..a18143ec1 100644 --- a/sources/CascadiaCode-Regular.ufo/fontinfo.plist +++ b/sources/CascadiaCode-Regular.ufo/fontinfo.plist @@ -174,7 +174,7 @@ openTypeNameLicense Microsoft supplied font. You may use this font to create, display, and print content as permitted by the license terms or terms of use, of the Microsoft product, service, or content in which this font was included. You may only (i) embed this font in content as permitted by the embedding restrictions included in this font; and (ii) temporarily download this font to a printer or other output device to help print content. Any other use is prohibited. -The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/master/LICENSE). +The following license, based on the SIL Open Font license (https://scripts.sil.org/OFL), applies to this font. Additional license terms may be found on the GitHub repository for this font (https://github.com/microsoft/cascadia-code/blob/main/LICENSE). Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: