[Release 6.0.1] Merge release --> master

CONTRIBUTING.md

@@ -117,7 +117,7 @@ For the Storage data plane project, this change log is located at `src\Storage\C
 
 #### Breaking Changes
 
-Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](documentation/breaking-changes/breaking-changes-definition.md).
+Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell and how to declare them in the code using the [various breaking change attributes](documentation/breaking-changes/breaking-changes-attribute-help.md), see [here](documentation/breaking-changes/breaking-changes-definition.md).
 
 Whenever a service team announces a breaking change, they must add it to the `upcoming-breaking-changes.md` file in their respective service folder. When the service team is ready to release the module with the breaking change, they must move the corresponding information from `upcoming-breaking-changes.md` into the `current-breaking-changes.md` file located in their service folder.
 

appveyor.yml

@@ -20,8 +20,8 @@ build_script:
 
 test: off
 on_success:
-  - git clone -q --branch=%target_branch% %content_repo% %TEMP%\Azure
+  - git clone -q --branch=%source_branch% %content_repo% %TEMP%\Azure
   - cd %TEMP%\Azure
   - ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
   - git add -A
-  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% && appveyor AddMessage "Content Updated"
+  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% -f && appveyor AddMessage "Content Updated"