fix broken links from CATS report

craigcaseyMSFT · craigcaseyMSFT · commit 4dcac6b8d1e1 · 2019-10-22T20:27:16.000-07:00
diff --git a/articles/azure-australia/gateway-log-audit-visibility.md b/articles/azure-australia/gateway-log-audit-visibility.md
@@ -284,7 +284,7 @@ The use of Network Watcher is recommended by the ACSC to assist in understanding
 
 ## Log retention
 
-For Australian Government organisations, the logs captured within Azure must be retained in accordance with the National Archives of Australia [Administrative Functions Disposal Authority (AFDA)](http://www.naa.gov.au/information-management/records-authorities/types-of-records-authorities/AFDA/index.aspx), which specifies retaining logs up to seven years.
+For Australian Government organisations, the logs captured within Azure must be retained in accordance with the National Archives of Australia [Administrative Functions Disposal Authority (AFDA)](https://www.naa.gov.au/information-management/records-authorities/types-records-authorities/afda-express-version-2-functions), which specifies retaining logs up to seven years.
 
 |Log Location|Retention Period|
 |---|---|
diff --git a/articles/azure-monitor/insights/vminsights-overview.md b/articles/azure-monitor/insights/vminsights-overview.md
@@ -29,7 +29,8 @@ The features are organized into three perspectives:
 - Map
 
 >[!NOTE]
->We recently [announced changes](https://azure.microsoft.com/updates/upcoming-changes-for-azure-monitor-for-vms-as-we-prepare-for-ga) we are making changes to the Health feature based on the feedback we have received from our public preview customers. Given the number of changes we will be making, we are going to stop offering the Health feature for new customers. Existing customers can continue to use the health feature. For more details, please refer to our [General Availability FAQ](vminsights-ga-release-faq.md).  
+>We recently [announced changes](https://azure.microsoft.com/updates/updates-to-azure-monitor-for-virtual-machines-preview-before-general-availability-release/
+) we are making changes to the Health feature based on the feedback we have received from our public preview customers. Given the number of changes we will be making, we are going to stop offering the Health feature for new customers. Existing customers can continue to use the health feature. For more details, please refer to our [General Availability FAQ](vminsights-ga-release-faq.md).  
 
 Integration with Azure Monitor logs delivers powerful aggregation and filtering, and it can analyze data trends over time. Such comprehensive workload monitoring can't be achieved with Azure Monitor or Service Map alone.  
 
diff --git a/articles/cosmos-db/cosmosdb-migrationchoices.md b/articles/cosmos-db/cosmosdb-migrationchoices.md
@@ -68,7 +68,7 @@ For APIs other than the SQL API, Mongo API and the Cassandra API, there are vari
 * Learn more by trying out the sample applications consuming the bulk executor library in [.NET](bulk-executor-dot-net.md) and [Java](bulk-executor-java.md). 
 * The bulk executor library is integrated into the Cosmos DB Spark connector, to learn more, see [Azure Cosmos DB Spark connector](spark-connector.md) article.  
 * Contact the Azure Cosmos DB product team by opening  a support ticket under the "General Advisory" problem type and "Large (TB+) migrations" problem subtype for additional help with large scale migrations. 
-* Use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB.
+* Use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB.
 
 > [!div class="nextstepaction"]
-> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
+> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)
diff --git a/articles/cosmos-db/introduction.md b/articles/cosmos-db/introduction.md
@@ -20,10 +20,10 @@ You can [Try Azure Cosmos DB for Free](https://azure.microsoft.com/try/cosmosdb/
 > [!div class="nextstepaction"]
 > [Try Azure Cosmos DB for Free](https://azure.microsoft.com/try/cosmosdb/)
 
-You can also use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB. When you sign up for this program, the Azure Cosmos DB engineers are assigned to assist with your project and they can help you migrate your data to Azure Cosmos DB or building new apps on Azure Cosmos DB.
+You can also use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB. When you sign up for this program, the Azure Cosmos DB engineers are assigned to assist with your project and they can help you migrate your data to Azure Cosmos DB or building new apps on Azure Cosmos DB.
 
 > [!div class="nextstepaction"]
-> [Sign up for the Cosmos DB bootstrap program](https://azurecosmosdb.github.io/CosmosBootstrap/)
+> [Sign up for the Cosmos DB bootstrap program](https://gotcosmos.com/bootstrap)
 
 ![Azure Cosmos DB is Microsoft's globally distributed database service with elastic scale-out, guaranteed low latency, five consistency models, and comprehensive guaranteed SLAs](./media/introduction/azure-cosmos-db.png)
 
diff --git a/articles/cosmos-db/migrate-cosmosdb-data.md b/articles/cosmos-db/migrate-cosmosdb-data.md
@@ -16,10 +16,10 @@ Azure Cosmos DB can store terabytes of data. You can perform a large-scale data
 
 Before you migrate the entire workload to Azure Cosmos DB, you can migrate a subset of data to validate some of the aspects like partition key choice, query performance, and data modeling. After you validate the proof of concept, you can move the entire workload to Azure Cosmos DB.  
 
-You can also use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB. As a part of this program, engineers from the Azure Cosmos DB team would be assigned to your project and would help you migrate your data to Azure Cosmos DB. Click the below button to sign up for the Cosmos DB bootstrap program:
+You can also use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB. As a part of this program, engineers from the Azure Cosmos DB team would be assigned to your project and would help you migrate your data to Azure Cosmos DB. Click the below button to sign up for the Cosmos DB bootstrap program:
 
 > [!div class="nextstepaction"]
-> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
+> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)
 
 ## Tools for data migration 
 
@@ -154,7 +154,7 @@ To contact the Azure Cosmos DB team for assistance with large scale migrations,
 * Learn more by trying out the sample applications consuming the bulk executor library in [.NET](bulk-executor-dot-net.md) and [Java](bulk-executor-java.md). 
 * The bulk executor library is integrated into the Cosmos DB Spark connector, to learn more, see [Azure Cosmos DB Spark connector](spark-connector.md) article.  
 * Contact the Azure Cosmos DB product team by opening  a support ticket under the "General Advisory" problem type and "Large (TB+) migrations" problem subtype for additional help with large scale migrations. 
-* Use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB.
+* Use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB.
 
 > [!div class="nextstepaction"]
-> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
+> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)
diff --git a/articles/event-hubs/event-hubs-storm-getstarted-receive.md b/articles/event-hubs/event-hubs-storm-getstarted-receive.md
@@ -248,7 +248,7 @@ You can learn more about Event Hubs by visiting the following links:
 <!-- Links -->
 [Event Hubs overview]: event-hubs-what-is-event-hubs.md
 [HDInsight Storm]: ../hdinsight/storm/apache-storm-overview.md
-[HDInsight Storm with Event Hub example]: https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/
+[HDInsight Storm with Event Hub example]: https://github.com/Azure-Samples/hdinsight-java-storm-eventhub
 
 <!-- Images -->
 
diff --git a/articles/hdinsight/storm/apache-storm-develop-csharp-event-hub-topology.md b/articles/hdinsight/storm/apache-storm-develop-csharp-event-hub-topology.md
@@ -15,7 +15,7 @@ ROBOTS: NOINDEX
 Learn how to work with Azure Event Hubs from [Apache Storm](https://storm.apache.org/) on HDInsight. This document uses a C# Storm topology to read and write data from Event Hubs
 
 > [!NOTE]  
-> For a Java version of this project, see [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/).
+> For a Java version of this project, see [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub).
 
 ## SCP.NET
 
diff --git a/articles/hdinsight/storm/apache-storm-example-topology.md b/articles/hdinsight/storm/apache-storm-example-topology.md
@@ -21,7 +21,7 @@ The following is a list of examples created and maintained by Microsoft for use
 | [Develop Java-based topologies for Apache Storm on HDInsight][5797064f] |Maven |Java |
 | [Develop C# topologies for Apache Storm on HDInsight using Visual Studio][16fce2d1] |HDInsight Tools for Visual Studio |C#, Java |
 | [Process events from Azure Event Hubs with Apache Storm on HDInsight (C#)][844d1d81] |Event Hubs |C# and Java |
-| [Process events from Azure Event Hubs with Storm on HDInsight (Java)](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/) |Event Hubs |Java |
+| [Process events from Azure Event Hubs with Storm on HDInsight (Java)](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub) |Event Hubs |Java |
 | [Process vehicle sensor data from Event Hubs using Apache Storm on HDInsight][246ee964] |Event Hubs, Cosmos DB, Azure Storage Blob (WASB) |C#, Java |
 | [Extract, Transform, and Load (ETL) from Azure Event Hubs to Apache HBase, using Apache Storm on HDInsight][b4b68194] |Event Hubs, HBase |C# |
 | [Template C# Storm topology project for working with Azure services from Apache Storm on HDInsight][ce0c02a2] |Event Hubs, Cosmos DB, SQL Database, HBase, SignalR |C#, Java |
diff --git a/articles/hdinsight/storm/apache-storm-overview.md b/articles/hdinsight/storm/apache-storm-overview.md
@@ -37,7 +37,7 @@ Storm on HDInsight provides the following features:
 
 * **Create streaming pipelines using multiple Azure services**: Storm on HDInsight integrates with other Azure services such as Event Hubs, SQL Database, Azure Storage, and Azure Data Lake Storage.
 
-    For an example solution that integrates with Azure services, see [Process events from Event Hubs with Apache Storm on HDInsight](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/).
+    For an example solution that integrates with Azure services, see [Process events from Event Hubs with Apache Storm on HDInsight](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub).
 
 For a list of companies that are using Apache Storm for their real-time analytics solutions, see [Companies using Apache Storm](https://storm.apache.org/documentation/Powered-By.html).
 
@@ -89,7 +89,7 @@ You can create a new Storm cluster on HDInsight in minutes. For more information
 
 * __Event Hubs__: For an example of using Event Hubs with a Storm cluster, see the following examples:
 
-    * [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/)
+    * [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub)
 
     * [Process events from Azure Event Hubs with Apache Storm on HDInsight (C#)](apache-storm-develop-csharp-event-hub-topology.md)
 
diff --git a/articles/key-vault/about-keys-secrets-and-certificates.md b/articles/key-vault/about-keys-secrets-and-certificates.md
@@ -31,10 +31,10 @@ The following sections offer general information applicable across the implement
 
 The JavaScript Object Notation (JSON) and JavaScript Object Signing and Encryption (JOSE) specifications are important background information.  
 
--   [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key)  
--   [JSON Web Encryption (JWE)](http://tools.ietf.org/html/draft-ietf-jose-json-web-encryption)  
--   [JSON Web Algorithms (JWA)](http://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms)  
--   [JSON Web Signature (JWS)](https://tools.ietf.org/html/draft-ietf-jose-json-web-signature)  
+-   [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41)  
+-   [JSON Web Encryption (JWE)](https://tools.ietf.org/html/draft-ietf-jose-json-web-encryption-40)  
+-   [JSON Web Algorithms (JWA)](https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40)  
+-   [JSON Web Signature (JWS)](https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41)  
 
 ### Data types
 
@@ -159,7 +159,7 @@ Key Vault doesn't support EXPORT operations. Once a key is provisioned in the sy
 
 Users may restrict any of the cryptographic operations that Key Vault supports on a per-key basis using the key_ops property of the JWK object.  
 
-For more information on JWK objects, see [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key).  
+For more information on JWK objects, see [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41).  
 
 ###  Key attributes
 
@@ -182,7 +182,7 @@ Not-yet-valid and expired keys, outside the *nbf* / *exp* window, will work for
 
 For more information on data types, see [Data types](#data-types).
 
-For more information on other possible attributes, see the [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key).
+For more information on other possible attributes, see the [JSON Web Key (JWK)](https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41).
 
 ### Key tags
 
