Skip to content

Commit 6d65926

Browse files
author
ajburnle
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into aj-fundamentals-membership-updates
2 parents a620275 + a114330 commit 6d65926

30 files changed

+37
-37
lines changed

articles/active-directory/develop/msal-java-adfs-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.collection: M365-identity-device-management
2020

2121
# Active Directory Federation Services support in MSAL for Java
2222

23-
Active Directory Federation Services (AD FS) in Windows Server enables you to add OpenID Connect and OAuth 2.0 based authentication and authorization to your Microsoft Authentication Library for Java (MSAL for Java) app. Once integrated, your app can authenticate users in AD FS, federated through Azure AD. For more information about scenarios, see [AD FS Scenarios for Developers](https://docs.microsoft.com/windows-server/identity/ad-fs/overview/ad-fs-scenarios-for-developers).
23+
Active Directory Federation Services (AD FS) in Windows Server enables you to add OpenID Connect and OAuth 2.0 based authentication and authorization to your Microsoft Authentication Library for Java (MSAL for Java) app. Once integrated, your app can authenticate users in AD FS, federated through Azure AD. For more information about scenarios, see [AD FS Scenarios for Developers](/windows-server/identity/ad-fs/ad-fs-development).
2424

2525
An app that uses MSAL for Java will talk to Azure Active Directory (Azure AD), which then federates to AD FS.
2626

articles/active-directory/fundamentals/active-directory-ops-guide-ops.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Adopting best practices can help the optimal operation of on-premises agents. Co
102102
#### On-premises agents management recommended reading
103103

104104
- [Understand Azure AD Application Proxy connectors](https://docs.microsoft.com/azure/active-directory/manage-apps/application-proxy-connectors)
105-
- [Azure AD Pass-through Authentication - quickstart](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-connect-pta-quick-start#step-5-ensure-high-availability)
105+
- [Azure AD Pass-through Authentication - quickstart](../hybrid/how-to-connect-pta-quick-start.md#step-4-ensure-high-availability)
106106

107107
## Management at scale
108108

@@ -126,7 +126,7 @@ There are two "From" addresses used by Azure AD: <[email protected]>,
126126

127127
- [Azure AD Access Reviews](https://docs.microsoft.com/azure/active-directory/governance/access-reviews-overview)
128128
- [Azure AD Connect Health](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-connect-health-operations#enable-email-notifications)
129-
- [Azure AD Identity Protection](https://docs.microsoft.com/azure/active-directory/identity-protection/notifications)
129+
- [Azure AD Identity Protection](/azure/active-directory/identity-protection/howto-identity-protection-configure-notifications)
130130
- [Azure AD Privileged Identity Management](https://docs.microsoft.com/azure/active-directory/privileged-identity-management/pim-email-notifications)
131131
- [Enterprise App Expiring Certificate Notifications](https://docs.microsoft.com/azure/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on#add-email-notification-addresses-for-certificate-expiration)
132132
- Enterprise App Provisioning Service Notifications

articles/active-directory/manage-apps/plan-cloud-hr-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ It is common for a security review to be required as part of the deployment of a
353353

354354
If the Cloud HR user provisioning implementation fails to work as desired in the production environment, the following rollback steps below can assist you in reverting to a previous known good state:
355355

356-
1. Review the [provisioning summary report](https://docs.microsoft.com/azure/active-directory/active-directory-saas-provisioning-reporting#getting-provisioning-reports-from-the-azure-management-portal) and [provisioning logs](https://docs.microsoft.com/azure/active-directory/active-directory-saas-provisioning-reporting#provisioning-audit-logs) (see [Manage cloud HR app user provisioning](#manage-your-configuration)) to determine what the incorrect operations were performed on the affected users and/or groups.
356+
1. Review the [provisioning summary report](check-status-user-account-provisioning.md#getting-provisioning-reports-from-the-azure-portal) and [provisioning logs](check-status-user-account-provisioning.md#provisioning-logs-preview) (see [Manage cloud HR app user provisioning](#manage-your-configuration)) to determine what the incorrect operations were performed on the affected users and/or groups.
357357
2. The last known good state of the users and/or groups affected can be determined through the provisioning audit logs or by reviewing the target systems (Azure AD or AD).
358358
3. Work with the app owner to update the users and/or groups affected directly in the app using the last known good state values.
359359

articles/analysis-services/analysis-services-datasource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Connecting to on-premises data sources from an Azure Analysis Services server re
8282

8383
## Understanding providers
8484

85-
When creating tabular 1400 and higher model projects in Visual Studio, by default you do not specify a data provider when connecting to a data source by using **Get Data**. Tabular 1400 and higher models use [Power Query](/power-query/power-query-what-is-power-query.md) connectors to manage connections, data queries, and mashups between the data source and Analysis Services. These are sometimes referred to as *structured* data source connections in that connection property settings are set for you. You can, however, enable legacy data sources. When enabled, you can use **Table Import Wizard** to connect to certain data sources traditionally supported in tabular 1200 and lower models as *legacy*, or *provider* data sources. When specified as a provider data source, you can specify a particular data provider and other advanced connection properties. For example, you can connect to an on-premises SQL Server Data Warehouse or even an Azure SQL Database as a legacy data source. You can then select the OLE DB Driver for SQL Server MSOLEDBSQL data provider. In this case, selecting an OLE DB data provider may provide improved performance over the Power Query connector.
85+
When creating tabular 1400 and higher model projects in Visual Studio, by default you do not specify a data provider when connecting to a data source by using **Get Data**. Tabular 1400 and higher models use [Power Query](/power-query/power-query-what-is-power-query) connectors to manage connections, data queries, and mashups between the data source and Analysis Services. These are sometimes referred to as *structured* data source connections in that connection property settings are set for you. You can, however, enable legacy data sources. When enabled, you can use **Table Import Wizard** to connect to certain data sources traditionally supported in tabular 1200 and lower models as *legacy*, or *provider* data sources. When specified as a provider data source, you can specify a particular data provider and other advanced connection properties. For example, you can connect to an on-premises SQL Server Data Warehouse or even an Azure SQL Database as a legacy data source. You can then select the OLE DB Driver for SQL Server MSOLEDBSQL data provider. In this case, selecting an OLE DB data provider may provide improved performance over the Power Query connector.
8686

8787
When using the Table Import Wizard in Visual Studio, connections to any data source require a data provider. A default data provider is selected for you. You can change the data provider if needed. The type of provider you choose can depend on performance, whether or not the model is using in-memory storage or DirectQuery, and which Analysis Services platform you deploy your model to.
8888

articles/app-service/containers/configure-language-java.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ Additional configuration may be necessary for encrypting your JDBC connection. P
244244
- [SQL Server](https://docs.microsoft.com/sql/connect/jdbc/connecting-with-ssl-encryption?view=sql-server-ver15)
245245
- [MySQL](https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-using-ssl.html)
246246
- [MongoDB](https://mongodb.github.io/mongo-java-driver/3.4/driver/tutorials/ssl/)
247-
- [Cassandra](https://docs.datastax.com/developer/java-driver/4.3/)
248-
247+
- [Cassandra](https://docs.datastax.com/en/developer/java-driver/4.3/)
249248

250249
#### Manually initialize and load the key store
251250

articles/azure-australia/reference-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ This resource library contains additional links and references that are relevant
5656
* [Azure Paired Regions](https://docs.microsoft.com/azure/best-practices-availability-paired-regions)
5757
* [Azure Policy](https://docs.microsoft.com/azure/governance/policy/overview)
5858
* [Azure Storage Service Encryption](https://docs.microsoft.com/azure/storage/common/storage-service-encryption)
59-
* [Azure Backup Tutorials](https://docs.microsoft.com/azure/backup/#step-by-step-tutorials)
59+
* [Azure Backup Tutorials](https://docs.microsoft.com/azure/backup/)
6060
* [Azure Site Recovery Tutorials](/azure/site-recovery/)
6161

6262
## Role-based Access Controls and Privileged Identity Management (PIM)

articles/azure-functions/functions-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ Azure Functions integrates with various Azure and 3rd-party services. These serv
5858
## <a name="pricing"></a>How much does Functions cost?
5959
Azure Functions has two kinds of pricing plans. Choose the one that best fits your needs:
6060

61-
* **Consumption plan** - When your function runs, Azure provides all of the necessary computational resources. You don't have to worry about resource management, and you only pay for the time that your code runs.
61+
* **Consumption plan** - When your function runs, Azure provides all of the necessary computational resources. You don't have to worry about resource management, and you only pay for the time that your code runs.
62+
* **Premium plan** - You specify a number of pre-warmed instances that are always online and ready to respond immediately. When your function runs, Azure provides any additional computational resources that are needed. You pay for the pre-warmed instances running continuously and any additional instances you use as Azure scales your app in and out.
6263
* **App Service plan** - Run your functions just like your web apps. When you are already using App Service for your other applications, you can run your functions on the same plan at no additional cost.
6364

6465
For more information about hosting plans, see [Azure Functions hosting plan comparison](functions-scale.md). Full pricing details are available on the [Functions Pricing page](https://azure.microsoft.com/pricing/details/functions/).

articles/azure-government/documentation-government-csp-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Below you can find a list of all the authorized Cloud Solution Providers, which
236236
|[ProArch IT Solutions](https://www.proarch.com/)|
237237
|[Project Hosts Inc.](https://www.projecthosts.com)|
238238
|[Protected Trust](https://www.proarch.com/)|
239-
|[Pueo Business Solutions, LLC](https://www.pueobusinesssolutions.com)|
239+
|[Pueo Business Solutions, LLC](https://www.pueo.com/)|
240240
|[Quality Technology Services LLC](https://www.qtsdatacenters.com/)|
241241
|[Ravnur Inc.](https://www.ravnur.com)|
242242
|[Razor Technology, LLC](https://www.razor-tech.com)|

articles/cosmos-db/geospatial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ In addition to Point, LineString, and Polygon, GeoJSON also specifies the repres
8989
### Coordinate reference systems
9090
Since the shape of the earth is irregular, coordinates of geospatial data are represented in many coordinate reference systems (CRS), each with their own frames of reference and units of measurement. For example, the "National Grid of Britain" is a reference system is accurate for the United Kingdom, but not outside it.
9191

92-
The most popular CRS in use today is the World Geodetic System [WGS-84](http://earth-info.nga.mil/GandG/wgs84/). GPS devices, and many mapping services including Google Maps and Bing Maps APIs use WGS-84. Azure Cosmos DB supports indexing and querying of geospatial data using the WGS-84 CRS only.
92+
The most popular CRS in use today is the World Geodetic System [WGS-84](https://earth-info.nga.mil/GandG/update/index.php). GPS devices, and many mapping services including Google Maps and Bing Maps APIs use WGS-84. Azure Cosmos DB supports indexing and querying of geospatial data using the WGS-84 CRS only.
9393

9494
## Creating documents with spatial data
9595
When you create documents that contain GeoJSON values, they are automatically indexed with a spatial index in accordance to the indexing policy of the container. If you're working with an Azure Cosmos DB SDK in a dynamically typed language like Python or Node.js, you must create valid GeoJSON.

articles/expressroute/expressroute-locations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ The following table shows locations by service provider. If you want to view ava
139139
| **[Telefonica](https://www.business-solutions.telefonica.com/es/enterprise/solutions/efficient-infrastructure/managed-voice-data-connectivity/)** |Supported |Supported |Amsterdam, Sao Paulo |
140140
| **[Telehouse - KDDI](https://www.telehouse.net/solutions/cloud-services/cloud-link)** |Supported |Supported |London, London2 |
141141
| **Telenor** |Supported |Supported |Amsterdam, London, Oslo |
142-
| **[Telia Carrier](https://teliacarrier.com/our-services/connectivity/cloud-connect.html?title=Cloud%20Connect)** | Supported | Supported |Amsterdam, Chicago, Dallas, Frankfurt, Hong Kong, London, Paris, Silicon Valley, Stockholm, Washington DC |
142+
| **[Telia Carrier](https://www.teliacarrier.com/)** | Supported | Supported |Amsterdam, Chicago, Dallas, Frankfurt, Hong Kong, London, Paris, Silicon Valley, Stockholm, Washington DC |
143143
| **Telmex Uninet**| Supported | Supported | Dallas |
144144
| **[Telstra Corporation](https://www.telstra.com.au/business-enterprise/network-services/networks/cloud-direct-connect/)** |Supported |Supported |Melbourne, Singapore, Sydney |
145145
| **[Telus](https://www.telus.com)** |Supported |Supported |Montreal, Seattle, Toronto |

0 commit comments

Comments
 (0)