Skip to content

Commit 4b8d5c1

Browse files
author
Owen Duncan
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aas-0413
2 parents 02b82b4 + 45ed37d commit 4b8d5c1

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

articles/machine-learning/how-to-manage-workspace.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ In this article, you'll create, view, and delete [**Azure Machine Learning works
2121

2222
## Create a workspace
2323

24-
To create a workspace, you need an Azure subscription. If you dont have an Azure subscription, create a free account before you begin. Try the [free or paid version of Azure Machine Learning](https://aka.ms/AMLFree) today.
24+
To create a workspace, you need an Azure subscription. If you don't have an Azure subscription, create a free account before you begin. Try the [free or paid version of Azure Machine Learning](https://aka.ms/AMLFree) today.
2525

2626
1. Sign in to the [Azure portal](https://portal.azure.com/) by using the credentials for your Azure subscription.
2727

@@ -43,12 +43,12 @@ To create a workspace, you need an Azure subscription. If you don’t have an Az
4343
Subscription |Select the Azure subscription that you want to use.
4444
Resource group | Use an existing resource group in your subscription or enter a name to create a new resource group. A resource group holds related resources for an Azure solution. In this example, we use **docs-aml**.
4545
Location | Select the location closest to your users and the data resources to create your workspace.
46-
Workspace edition | Select **Basic** or **Enterprise**. This workspace edition determines the features to which youll have access and pricing. Learn more about [Basic and Enterprise edition offerings](overview-what-is-azure-ml.md#sku).
46+
Workspace edition | Select **Basic** or **Enterprise**. This workspace edition determines the features to which you'll have access and pricing. Learn more about [Basic and Enterprise edition offerings](overview-what-is-azure-ml.md#sku).
4747

4848
![Configure your workspace](./media/how-to-manage-workspace/select-edition.png)
4949

5050
1. When you're finished configuring the workspace, select **Review + Create**.
51-
2. Review the settings and make any additional changes or corrections. When you're satisified with the settings, select **Create**.
51+
2. Review the settings and make any additional changes or corrections. When you're satisfied with the settings, select **Create**.
5252

5353
> [!Warning]
5454
> It can take several minutes to create your workspace in the cloud.
@@ -87,6 +87,8 @@ You can upgrade your workspace from Basic edition to Enterprise edition to take
8787
8888
## <a name="view"></a>Find a workspace
8989

90+
1. Sign in to the [Azure portal](https://portal.azure.com/).
91+
9092
1. In the top search field, type **Machine Learning**.
9193

9294
1. Select **Machine Learning**.
@@ -99,9 +101,9 @@ You can upgrade your workspace from Basic edition to Enterprise edition to take
99101

100102
## Delete a workspace
101103

102-
Use the Delete button at the top of the workspace you wish to delete.
104+
In the [Azure portal](https://portal.azure.com/), select **Delete** at the top of the workspace you wish to delete.
103105

104-
![Delete button](./media/how-to-manage-workspace/delete-workspace.png)
106+
:::image type="content" source="./media/how-to-manage-workspace/delete-workspace.png" alt-text="Delete workspace":::
105107

106108
## Clean up resources
107109

-29.6 KB
Loading

articles/service-fabric/service-fabric-cluster-change-cert-thumbprint-to-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ No two certificates can have the same thumbprint, which makes cluster certificat
1515
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
1616

1717
## Get a certificate
18-
First, get a certificate from a [certificate authority (CA)](https://wikipedia.org/wiki/Certificate_authority). The common name of the certificate should be the host name of the cluster. For example, "myclustername.southcentralus.cloudapp.azure.com".
18+
First, get a certificate from a [certificate authority (CA)](https://wikipedia.org/wiki/Certificate_authority). The common name of the certificate should be for the custom domain you own, and bought from a domain registrar. For example, "azureservicefabricbestpractices.com"; those whom are not Microsoft employees can not provision certs for MS domains, so you can not use the DNS names of your LB or Traffic Manager as common names for your certificate, and you will need to provision a [Azure DNS Zone](https://docs.microsoft.com/azure/dns/dns-delegate-domain-azure-dns) if your custom domain to be resolvable in Azure. You will also want to declare your custom domain you own as your cluster's "managementEndpoint" if you want portal to reflect the custom domain alias for your cluster.
1919

2020
For testing purposes, you could get a CA signed certificate from a free or open certificate authority.
2121

2222
> [!NOTE]
23-
> Self-signed certificates, including those generated when deploying a Service Fabric cluster in the Azure portal, are not supported.
23+
> Self-signed certificates, including those generated when deploying a Service Fabric cluster in the Azure portal, are not supported.
2424
2525
## Upload the certificate and install it in the scale set
2626
In Azure, a Service Fabric cluster is deployed on a virtual machine scale set. Upload the certificate to a key vault and then install it on the virtual machine scale set that the cluster is running on.

articles/time-series-insights/time-series-insights-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: dpalled
88
manager: cshankar
99
ms.workload: big-data
1010
ms.topic: overview
11-
ms.date: 02/04/2020
11+
ms.date: 04/13/2020
1212
ms.custom: seodec18
1313
---
1414

articles/time-series-insights/time-series-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: cshankar
99
ms.topic: quickstart
1010
ms.workload: big-data
1111
ms.custom: mvc seodec18
12-
ms.date: 01/06/2020
12+
ms.date: 04/13/2020
1313
# Customer intent: As a data analyst or developer, I want to quickly learn about the Time Series insights visualization explorer.
1414
---
1515

articles/virtual-machines/windows/sql/virtual-machines-windows-sql-server-iaas-faq.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@ This article provides answers to some of the most common questions about running
4848

4949
Yes, by using PowerShell. For more information about deploying SQL Server VMs using PowerShell, see [How to provision SQL Server virtual machines with Azure PowerShell](virtual-machines-windows-ps-sql-create.md).
5050

51-
1. **Can I create a generalized Azure SQL Server Marketplace image of my SQL Server VM and use it to deploy VMs?**
51+
1. **How can I generalize SQL Server on Azure VM and use it to deploy new VMs?**
5252

53-
Yes, but you must then [register each SQL Server VM with the SQL Server VM resource provider](virtual-machines-windows-sql-register-with-resource-provider.md) to manage your SQL Server VM in the portal, as well as utilize features such as automated patching and automatic backups. When registering with the resource provider, you will also need to specify the license type for each SQL Server VM.
53+
You can deploy a Windows Server VM (without any SQL Server installed on it) and use the [SQL sysprep](/sql/database-engine/install-windows/install-sql-server-using-sysprep?view=sql-server-ver15) process to generalize SQL Server on Azure VM (Windows) with the SQL Server installation media. Customers who have [software assurance](https://www.microsoft.com/licensing/licensing-programs/software-assurance-default?rtc=1&activetab=software-assurance-default-pivot%3aprimaryr3) can obtain their installation media from the [Volume Licensing Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). Customers who don't have software assurance can use the setup media from a Marketplace SQL Server VM image that has the desired edition.
54+
55+
Alternatively, use one of the SQL Server images form Azure marketplace to generalize SQL Server on Azure VM. Note that you must delete the following registry key in the source image before creating your own image. Failure to do so can result in the bloating of the SQL Server setup bootstrap folder and/or SQL IaaS extension in failed state.
56+
57+
Registry Key path:
58+
`Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\SysPrepExternal\Specialize`
59+
60+
> [!NOTE]
61+
> We recommend that all SQL Server Azure VMs, including those deployed from custom generalized images, be [registered with a SQL VM recourse provider](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-register-with-resource-provider?tabs=azure-cli%2Cbash) to meet the compliance requirements and to utilize optional features such as automated patching and automatic backups. It will also allow you to [specify the license type](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-ahb?tabs=azure-portal) for each SQL Server VM.
5462
5563
1. **Can I use my own VHD to deploy a SQL Server VM?**
5664

@@ -112,13 +120,13 @@ This article provides answers to some of the most common questions about running
112120
The passive SQL Server instance does not serve SQL Server data to clients or run active SQL Server workloads. It is only used to synchronize with the primary server and otherwise maintain the passive database in a warm standby state. If it is serving data, such as reports to clients running active SQL Server workloads, or performing any work other than what is specified in the product terms, it must be a paid licensed SQL Server instance. The following activity is permitted on the secondary instance: database consistency checks or CheckDB, full backups, transaction log backups, and monitoring resource usage data. You may also run the primary and corresponding disaster recovery instance simultaneously for brief periods of disaster recovery testing every 90 days.
113121

114122

115-
1. **What scenarios can utilize the Distaster Recovery (DR) benefit?**
123+
1. **What scenarios can utilize the Disaster Recovery (DR) benefit?**
116124

117125
The [licensing guide](https://aka.ms/sql2019licenseguide) provides scenarios in which the Disaster Recovery Benefit can be utilized. Refer to your Product Terms and talk to your licensing contacts or account manager for more information.
118126

119127
1. **Which subscriptions support the Disaster Recovery (DR) benefit?**
120128

121-
Comprehensive programs that offer Software Assurance equivalent subscription rights as a fixed benefit support the DR benefit. This includes. but is not limited to, the Open Value (OV), Open Value Subscription (OVS), Enterprise Agreement (EA), Enterprise Subscription Agreement (EAS), and the Server and Cloud Enrollment (SCE). Refer to the [product terms](https://www.microsoft.com/licensing/product-licensing/products) and talk to your licensing contacts or acocunt manager for more information.
129+
Comprehensive programs that offer Software Assurance equivalent subscription rights as a fixed benefit support the DR benefit. This includes. but is not limited to, the Open Value (OV), Open Value Subscription (OVS), Enterprise Agreement (EA), Enterprise Subscription Agreement (EAS), and the Server and Cloud Enrollment (SCE). Refer to the [product terms](https://www.microsoft.com/licensing/product-licensing/products) and talk to your licensing contacts or account manager for more information.
122130

123131

124132
## Resource provider

0 commit comments

Comments
 (0)