Skip to content

Commit d048218

Browse files
authored
Merge pull request SharePoint#141 from SharePoint/master
Merge master changes to staging
2 parents baf944c + b15654c commit d048218

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Any images associated with the docs should be uploaded into the `spfx\images` fo
4040

4141
The first step is registering yourself on GitHub. Go to https://github.com/ and click on the "Sign up for GitHub" button. Once you're registered ensure you're logged on with your new account and navigate to the Office 365 Developer Patterns and Practices repository at https://github.com/sharepoint/sp-dev-docs. The right top side of the page contains a button called "Fork":
4242

43-
![Fork the sp-dev-docs github repository](./images/contribute-fork-docs-repo.png)
43+
![Fork the sp-dev-docs github repository](../images/contribute-fork-docs-repo.png)
4444

4545
Clicking on this button will Fork the SharePoint developer documentation repository to your GitHub account. It's actually like taking a copy. Select your personal GitHub account you registered earlier as the account to for this repository.
4646

@@ -50,7 +50,7 @@ Once the forking has been done you'll find the docs repo under your account with
5050

5151
Now that you have forked the docs repository, to sync this forked repository to your local machine, you will need to clone the repository. You can find the clone URL in the `Clone or download` dropdown in the repo page.
5252

53-
![Clone the forked SharePoint developer docs repository](./images/contribute-docs-clone-options.png)
53+
![Clone the forked SharePoint developer docs repository](../images/contribute-docs-clone-options.png)
5454

5555
If you have any Git Desktop or any git source control installed, you can click the `Open is Desktop`, else follow the steps below:
5656

@@ -106,7 +106,7 @@ Navigate to the forked sp-dev-docs repo in your account. Make sure your current
106106

107107
Once you are in the staging branch, you should see a message to `Compare & pull request`
108108

109-
![Submit a pull request to sp-dev-docs repo](./images/contribute-docs-submit-pr.png)
109+
![Submit a pull request to sp-dev-docs repo](../images/contribute-docs-submit-pr.png)
110110

111111
This will start a new pull request. Make sure you use the following [template]() to fill in your changes. Make sure you are creating this pull request against the `staging` branch.
112112

@@ -116,4 +116,4 @@ Once you have all the information, click the `Create pull request` to submit you
116116

117117
In order to keep your forked sp-dev-docs repo up-to-date with the parent repository, you will need to first [configure a remote that points to upstream repository](https://help.github.com/articles/configuring-a-remote-for-a-fork).
118118

119-
Once you have configured the upstream repository, follow the steps [here](https://help.github.com/articles/configuring-a-remote-for-a-fork) to sync your fork to keep it up-to-date with the upstream repository.
119+
Once you have configured the upstream repository, follow the steps [here](https://help.github.com/articles/configuring-a-remote-for-a-fork) to sync your fork to keep it up-to-date with the upstream repository.

LICENSE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This repository is licensed under the [Creative Commons Attribution-NonCommercial-NoDerivs 3.0 United States](https://creativecommons.org/licenses/by-nc-nd/3.0/us) license.
2+
3+
Copyright (c) Microsoft Corporation. Distributed under the following terms:
4+
5+
1. Microsoft and any contributors to this project each grants you a license, under its respective copyrights, to the Microsoft SharePoint Documentation under the [Creative Commons Attribution-NonCommercial-NoDerivs 3.0 United States License](https://creativecommons.org/licenses/by-nc-nd/3.0/us/legalcode). In addition, with respect to any sample code contained in the documentation, Microsoft and any such contributors grants you an additional license, under its respective intellectual property rights, to use the code to develop or design your software for Microsoft SharePoint and/or Office 365.
6+
7+
2. Microsoft, Microsoft Office, Microsoft SharePoint, Office 365, Windows, Windows Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries. This license does not grant you rights to use any names, logos, or trademarks. For Microsoft’s general trademark guidelines, go to [1](http://go.microsoft.com/fwlink/?LinkID=254653).
8+
9+
3. Microsoft and any contributors reserves all others rights, whether under copyrights, patents, or trademarks, or by implication, estoppel or otherwise.

0 commit comments

Comments
 (0)