Skip to content

Commit 3a44f0d

Browse files
authored
Merge branch 'master' into users/janechu/add-frontpage-to-docs
2 parents 4f5ae4b + 8545ce0 commit 3a44f0d

File tree

1,734 files changed

+1501
-2619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,734 files changed

+1501
-2619
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Packages are located within the `packages` folder of the repository. Each packag
8181
If you'd like to contribute by fixing a bug, implementing a feature, or even correcting typos in our documentation, you'll want to submit a pull request. Before submitting a pull request, be sure to [rebase](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) your branch (typically from master) or use the *merge* button provided by GitHub.
8282

8383
:::note
84-
For additional details on branch management, read the [branch guide](../community/branch-guide.md) documentation.
84+
For additional details on branch management, read the [branch guide](./BRANCH_GUIDE.md) documentation.
8585
:::
8686

8787
#### Change Files
@@ -118,7 +118,7 @@ If you are finding that your changes are either breaking changes or require mult
118118

119119
### Merging a pull request
120120

121-
If you are merging a pull request, be sure to use the pull request title as the commit title. The title should follow the [conventional commit guidelines](https://www.conventionalcommits.org/). It is recommended that if you are merging in pull requests regularly that you add a browser extension that will auto-correct the title for you. A few that should do this are [Refined GitHub](https://github.com/sindresorhus/refined-github) and [Squashed Merge Message](https://github.com/zachwhaley/squashed-merge-message).
121+
If you are merging a pull request, be sure to use the pull request title as the commit title. The title should follow the [conventional commit guidelines](https://www.conventionalcommits.org/).
122122

123123
### Documenting breaking changes
124124

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "none",
3-
"comment": "DevDependency update",
4-
"packageName": "@microsoft/fast-react-wrapper",
3+
"comment": "Update documentation site with 2.0.0 content",
4+
"packageName": "@microsoft/fast-element",
55
"email": "[email protected]",
66
"dependentChangeType": "none"
77
}

packages/web-components/fast-element/docs/guide/declaring-templates.md

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)