Merge branch 'master' into includes

.acrolinx-config.edn

@@ -1,2 +1,33 @@
 {:allowed-branchname-matches ["master" "release-.*" "sandbox-.*"]
- :allowed-filename-matches ["articles" "includes"]}
+ :allowed-filename-matches ["articles" "includes"]
+
+ :template-header
+   "
+## Acrolinx Scorecards
+
+**Starting Wednesday, 7/26, a minimum Acrolinx score of 80 will be required for merging PRs that require human review.** 
+ 
+ Click the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
+
+| Article | Score | Issues | Scorecard |
+| ------- | ----- | ------ | --------- |
+"
+
+   ;; do not remove the spaces at the end of lines! That is markdown for
+   ;; linebreak
+   :template-change
+   "| **${github/filename}** | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | [link](${acrolinx/scorecard}) |
+"
+
+ :template-footer
+"
+**More info about Acrolinx**
+
+- [Install Acrolinx locally for VSCode](https://review.docs.microsoft.com/en-us/help/contribute/contribute-acrolinx-vscode)
+- The scorecard links are good for one hour. If you're prompted to authenticate, you can close and reopen the PR to get new links. Or, use these credentials:
+  Account: report-viewer
+  Password: kermit$
+
+- [False positives or issues](https://aka.ms/acrolinxbug)
+
+"}

.openpublishing.publish.config.json

@@ -70,6 +70,46 @@
 			"release-build-postgresql": "release-build",
 			"release-build-stellar": "release-build" 
 		}
-	}
+	},
+    {
+		"path_to_root": "samples-mediaservices-integration",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-encryptiondrm",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-encryptionfairplay",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-encryptionaes",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-copyblob",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-deliverplayready",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
+		"branch": "master"
+    },
+    {
+		"path_to_root": "samples-mediaservices-livestream",
+		"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
+		"branch": "master"
+    },
+    {
+        "path_to_root": "samples-mediaservices-encoderstandard",
+        "url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
+        "branch":"master"
+    }
 	]
 }