Merge remote-tracking branch 'refs/remotes/origin/master' into live

This commit is contained in:
LizRoss
2016-09-02 12:57:43 -07:00
6 changed files with 45 additions and 13 deletions

View File

@ -13,22 +13,54 @@ You've already completed this step.
We've tried to make editing an existing file as simple as possible. We've tried to make editing an existing file as simple as possible.
- If you're already in the repo, just navigate to the file you want to make the edits to and click the **Edit** button. **To edit a topic**
- Alternatively, if you're viewing a TechNet page in your browser, click the **Contribute** button on the top right of the page. You will be redirected to the relevant source file in the repo, where you can click the **Edit** button.
When you're done, submit a pull request back to the master branch of the official repository.
After you create the pull request, a member of the writing team will review your changes. 1. Go to the page on TechNet that you want to update, and then click **Contribute**.
If your request is accepted, updates are published to one of the following places: ![GitHub Web, showing the Contribute link](images/contribute-link.png)
- [Windows 10](https://technet.microsoft.com/itpro/windows) 2. Click the **Pencil** icon (in the red box) to edit the content.
- [Internet Explorer 11](https://technet.microsoft.com/itpro/internet-explorer)
- [Microsoft Edge](https://technet.microsoft.com/itpro/microsoft-edge) ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
- [Surface](https://technet.microsoft.com/itpro/surface)
- [Surface Hub](https://technet.microsoft.com/itpro/surface-hub) 3. Using markdown language, make your changes to the topic. For info about how to edit content using markdown, see:
- [Windows 10 for Education](https://technet.microsoft.com/edu/windows) - **If you're linked to the Microsoft organization in GitHub:** [Windows Open Publishing Guide Home](http://aka.ms/windows-op-guide)
- [Microsoft Desktop Optimization Pack](https://technet.microsoft.com/itpro/mdop)
- **If you're external to Microsoft:** [Mastering Markdown](https://guides.github.com/features/mastering-markdown/)
4. Make your suggested change, and then click **Preview Changes** to make sure it looks correct.
![GitHub Web, showing the Preview Changes tab](images/preview-changes.png)
5. When youre done editing the topic, scroll to the bottom of the page, and then click **Propose file change** to create a fork in your personal GitHub account.
![GitHub Web, showing the Propose file change button](images/propose-file-change.png)
The **Comparing changes** screen appears to see what the changes are between your fork and the original content.
6. On the **Comparing changes** screen, youll see if there are any problems with the file youre checking in.
If there are no problems, youll see the message, **Able to merge**.
![GitHub Web, showing the Comparing changes screen](images/compare-changes.png)
7. Click **Create pull request**.
8. Enter a title and description to give the approver the appropriate context about whats in the request.
9. Scroll to the bottom of the page, making sure that only your changed files are in this pull request. Otherwise, you could overwrite changes from other people.
10. Click **Create pull request**.
The pull request is sent to the writer of the topic and your edits are reviewed. If your request is accepted, updates are published to one of the following places:
- [Windows 10](https://technet.microsoft.com/itpro/windows)
- [Internet Explorer 11](https://technet.microsoft.com/itpro/internet-explorer)
- [Microsoft Edge](https://technet.microsoft.com/itpro/microsoft-edge)
- [Surface](https://technet.microsoft.com/itpro/surface)
- [Surface Hub](https://technet.microsoft.com/itpro/surface-hub)
- [Windows 10 for Education](https://technet.microsoft.com/edu/windows)
- [Microsoft Desktop Optimization Pack](https://technet.microsoft.com/itpro/mdop)
## Making more substantial changes ## Making more substantial changes

BIN
images/compare-changes.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
images/contribute-link.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
images/pencil-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
images/preview-changes.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB