Fixing links and guidance around docs.microsoft.com

Author: VesaJuvonen

.github/CONTRIBUTING.md

@@ -105,14 +105,14 @@ remove: Total 10 (delta 1), reused 10 (delta 1)
 Unpacking objects: 100% (10/10), done.
 ```
 
-## Switch to `staging` branch
+## Switch to `master` branch
 
-In order to add your changes, you will need to do those in the `staging` branch.
+In order to add your changes, you will need to do those in the `master` branch.
 
-Type the following command in the console to switch to `staging` branch:
+Type the following command in the console to switch to `master` branch:
 
 ```
-git checkout staging
+git checkout master
 ```
 
 Now, you can update existing docs or add new docs to the docs repo.
@@ -130,13 +130,13 @@ Depending on the doc's intent, you can choose to add your doc into  `basics` or
 
 Once you have completed adding your changes, you can submit a pull request. 
 
-Navigate to the forked sp-dev-docs repo in your account. Make sure your current branch is `staging` branch.
+Navigate to the forked sp-dev-docs repo in your account. Make sure your current branch is `master` branch.
 
-Once you are in the staging branch, you should see a message to `Compare & pull request`
+Once you are in the `master` branch, you should see a message to `Compare & pull request`
 
 ![Submit a pull request to sp-dev-docs repo](../images/contribute-docs-submit-pr.png)
 
-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.
+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 `master` branch.
 
 Once you have all the information, click the `Create pull request` to submit your pull request.
 

README.md

@@ -2,14 +2,17 @@
 
 The SharePoint Framework (SPFx) is a page and part model that enables client-side development for building SharePoint experiences. It facilitates easy integration with the SharePoint data, and provides support for open source tooling development.
 
-* [Official SharePoint Framework Documentation](http://dev.office.com/sharepoint/docs/spfx/sharepoint-framework-overview)
+* [Official SharePoint Framework Documentation](http://aka.ms/spfx)
 
-This repository contains the raw documents published to dev.office.com site. Feel free to use [Issues]((https://github.com/SharePoint/sp-dev-docs/issues)) list to report us findings or also submit pull requests around the existing documentation. 
+This repository contains the raw documents published to docs.microsoft.com site. Feel free to use [Issues]((https://github.com/SharePoint/sp-dev-docs/issues)) list to report us findings or also submit pull requests around the existing documentation. 
 
 The SharePoint Framework now generally available. Please check more release details either from the [GA release notes](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-GA) or from the [Office Blog post](https://blogs.office.com/2017/02/23/sharepoint-framework-reaches-general-availability-build-and-deploy-engaging-web-parts-today/) around the GA release. If you find issues or have new ideas and suggestions for SharePoint Framework, make sure you submit them [here](https://github.com/SharePoint/sp-dev-docs/issues). We’ll also be monitoring [#spfx](http://sharepoint.stackexchange.com/tags/spfx/), [#spfx-webparts](http://sharepoint.stackexchange.com/tags/spfx-webparts/), and [#spfx-tooling](http://sharepoint.stackexchange.com/tags/spfx-tooling/) at [SharePoint StackExchange](http://sharepoint.stackexchange.com/) as well.
 
 ## SharePoint Framework Releases
 
+* **September 25, 2017**
+   *  **GA of Extensions and SPFx v1.3**.
+
 * **June 6, 2017**
    *  **Dev Preview of extensions is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes---Extensions-Dev-Preview-Drop-1)
 
@@ -19,29 +22,14 @@ The SharePoint Framework now generally available. Please check more release deta
 * **Jan 9, 2017**
    *  **RC0 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-RC0)
 
-* **Nov 22, 2016**
-   *  **Drop 6 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-Drop-6)
-
-* **Oct 17, 2016**
-   *  **Drop 5 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-Drop-5)
-
-* **Sept 21, 2016**
-   *  **Drop 4 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-Drop-4-and-MDL2)
-
-* **Sep 14, 2016**
-   *  **Drop 3 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-Drop-3)
-   
-* **Sep 1, 2016**
-   * **Drop 2 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Release-Notes-Drop-2)
-
 * **Aug 17, 2016**
    * **Drop 1 is available**.  [See the release notes here](https://github.com/SharePoint/sp-dev-docs/wiki/Drop-1)
 
 ## Get Started
 
-* [Setup your Office 365 Developer Tenant](http://dev.office.com/sharepoint/docs/spfx/set-up-your-developer-tenant)
-* [Setup your Machine](http://dev.office.com/sharepoint/docs/spfx/set-up-your-development-environment)
-* [Go build your first web part](http://dev.office.com/sharepoint/docs/spfx/web-parts/get-started/build-a-hello-world-web-part)
+* [Setup your Office 365 Developer Tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant)
+* [Setup your Machine](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-development-environment)
+* [Go build your first web part](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/build-a-hello-world-web-part)
 
 ## Reference
 * [sp-component-base](reference/spfx/sp-component-base-module.md)
@@ -54,15 +42,15 @@ The SharePoint Framework now generally available. Please check more release deta
 
 ## Learn More
 
-* [Background and Philosophy](http://dev.office.com/sharepoint/docs/spfx/sharepoint-framework-overview)
-* [Design Great Web Parts](http://dev.office.com/sharepoint/docs/spfx/web-parts/basics/design-considerations-for-web-parts)
-* [API Docs](https://sharepoint.github.io/)
+* [Background and Philosophy](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/sharepoint-framework-overview)
+* [Design Great Web Parts](https://docs.microsoft.com/en-us/sharepoint/dev/design/design-guidance-overview)
+* [API Docs](https://docs.microsoft.com/en-us/javascript/api/sp-application-base)
 
 ## Updates & Feedback
 
 To keep track of improvements to the Office 365 Framework, please take a look at:
 
-* [@SharePoint](https://twitter.com/sharepoint) and [@OfficeDev](https://twitter.com/officedev) on Twitter
+* [@SharePoint](https://twitter.com/sharepoint), [@OfficeDev](https://twitter.com/officedev) and [@OfficeDevPnP](https://twitter.com/officedevpnp) on Twitter
 * [Office Developer Blog](http://dev.office.com/blogs)
 
 Provide Feedback: