Skip to content

Commit

Permalink
Merge pull request MicrosoftDocs#82125 from MicrosoftDocs/repo_sync_w…
Browse files Browse the repository at this point in the history
…orking_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
  • Loading branch information
huypub committed Jul 15, 2019
2 parents 1bbf6b7 + 3fb1da0 commit fd15e58
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ The Network Policy Server (NPS) extension for Azure MFA adds cloud-based MFA cap
* With the CHAPv2 protocol, only authenticator app push notifications and voice call are supported.
* Conditional Access policies cannot be applied.

The NPS extension acts as an adapter between RADIUS and cloud-based Azure MFA to provide a second factor of authentication to protect [VPN](howto-mfa-nps-extension-vpn.md), [Remote Desktop Gateway connections](howto-mfa-nps-extension-rdg.md), or other RADIUS capable applications. Users that register for Azure MFA in this environment will be challenged for all authentication attempts, the lack of Conditional Access policies mean MFA is always required.
The NPS extension acts as an adapter between RADIUS and cloud-based Azure MFA to provide a second factor of authentication to protect [VPN](howto-mfa-nps-extension-vpn.md), [Remote Desktop Gateway connections](howto-mfa-nps-extension-rdg.md), or other RADIUS capable applications. Users that register for Azure MFA in this environment will be challenged for all authentication attempts, the lack of Conditional Access policies means MFA is always required.

#### Implementing your NPS server

Expand Down
2 changes: 1 addition & 1 deletion articles/active-directory/devices/assign-local-admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Windows Autopilot provides you with an option to prevent primary user performing

In addition to using the Azure AD join process, you can also manually elevate a regular user to become a local administrator on one specific device. This step requires you to already be a member of the local administrators group.

Starting with the **Windows 10 1709** release, you can do perform this task from **Settings -> Accounts -> Other users**. Select **Add a work or school user**, enter the user's UPN under **User account** and select *Administrator* under **Account type**
Starting with the **Windows 10 1709** release, you can perform this task from **Settings -> Accounts -> Other users**. Select **Add a work or school user**, enter the user's UPN under **User account** and select *Administrator* under **Account type**

Additionally, you can also add users using the command prompt:

Expand Down
4 changes: 2 additions & 2 deletions articles/active-directory/saas-apps/ascentis-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ When you click the Ascentis tile in the Access Panel, you should be automaticall

## Additional resources

- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
- [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)

- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
- [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)

- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)

1 change: 1 addition & 0 deletions articles/azure-monitor/app/api-custom-events-metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ If you don't have a reference on Application Insights SDK yet:
* Add the Application Insights SDK to your project:

* [ASP.NET project](../../azure-monitor/app/asp-net.md)
* [ASP.NET Core project](../../azure-monitor/app/asp-net-core.md)
* [Java project](../../azure-monitor/app/java-get-started.md)
* [Node.js project](../../azure-monitor/app/nodejs.md)
* [JavaScript in each webpage](../../azure-monitor/app/javascript.md)
Expand Down
2 changes: 2 additions & 0 deletions articles/dns/dns-zones-records.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ A SOA record set is created automatically at the apex of each zone (name = '\@')

You can modify all properties of the SOA record except for the 'host' property, which is pre-configured to refer to the primary name server name provided by Azure DNS.

The zone serial number in the SOA record is not updated automatically when changes are made to the records in the zone. It can be updated manually by editing the SOA record, if necessary.

### SPF records

[!INCLUDE [dns-spf-include](../../includes/dns-spf-include.md)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ These are the current limitations to the Hyperscale service tier as of GA. We a
| Managed Instance | Azure SQL Database Managed Instance is not currently supported with Hyperscale databases. |
| Elastic Pools | Elastic Pools are not currently supported with SQL Database Hyperscale.|
| Migration to Hyperscale is currently a one-way operation | Once a database is migrated to Hyperscale, it cannot be migrated directly to a non-Hyperscale service tier. At present, the only way to migrate a database from Hyperscale to non-Hyperscale is to export/import using a BACPAC file.|
| Migration of databases with in-memory objects | In-Memory objects must be dropped and recreated as non-In-Memory objects before migrating a database to the Hyperscale service tier.|
| Migration of databases with persistent in-memory objects | Hyperscale only supports non persistent In-Memory objects (table types, native SPs and functions). Persistent In-Memory tables and other objects must be dropped and recreated as non-In-Memory objects before migrating a database to the Hyperscale service tier.|
| Change Data Tracking | You will not be able to use Change Data Tracking with Hyperscale databases. |
| Geo Replication | You cannot yet configure geo-replication for Azure SQL Database Hyperscale. You can perform geo-restores (restoring the database in a different geography, for DR or other purposes) |
| TDE/AKV Integration | Transparent Database Encryption using Azure Key Vault (commonly referred to as Bring-Your-Own-Key or BYOK) is not yet supported for Azure SQL Database Hyperscale, however TDE with Service Managed Keys is fully supported. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ The upsert behavior is *insert or replace*.

**1.2 level:** DateTimeOffset is no longer adjusted.

### Long when writing to SQL output

**Previous levels:** Values were truncated based on the target type.

**1.2 level:** Values that do not fit into the target type are handled according to the output error policy.

### Strict validation of prefix of functions

**Previous levels:** There was no strict validation of function prefixes.
Expand Down
4 changes: 2 additions & 2 deletions includes/iot-hub-tutorials-create-free-hub.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

To create an IoT Hub using the Azure portal:

1. Sign in to the [Azure portal](http:https://portal.azure.com).
1. Sign in to the [Azure portal](https:https://portal.azure.com).

1. Select **Create a resource** > **Internet of Things** > **IoT Hub**.

Expand Down Expand Up @@ -40,4 +40,4 @@ To create an IoT Hub using the Azure portal:

![Hub settings 3](media/iot-hub-tutorials-create-free-hub/hubdefinition-3.png)

1. Make a note of the IoT hub name you chose. You use this value later in the tutorial.
1. Make a note of the IoT hub name you chose. You use this value later in the tutorial.
4 changes: 2 additions & 2 deletions includes/notification-hubs-aspnet-backend-notifyusers.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ In this section, you add a new controller to the WebAPI backend to handle reques

3. In the results list, select **Microsoft Azure Notification Hubs**, and then select **Install**. Complete the installation, and then close the NuGet Package Manager window.

This action adds a reference to the Azure Notification Hubs SDK by using the [Microsoft.Azure.Notification Hubs NuGet package](http:https://www.nuget.org/packages/Microsoft.Azure.NotificationHubs/).
This action adds a reference to the Azure Notification Hubs SDK by using the [Microsoft.Azure.Notification Hubs NuGet package](https:https://www.nuget.org/packages/Microsoft.Azure.NotificationHubs/).

4. Create a new class file that represents the connection with the notification hub that's used to send notifications. In Solution Explorer, right-click the **Models** folder, select **Add**, and then select **Class**. Name the new class **Notifications.cs**, and then select **Add** to generate the class.

Expand All @@ -165,7 +165,7 @@ In this section, you add a new controller to the WebAPI backend to handle reques
using Microsoft.Azure.NotificationHubs;
```

6. Replace the `Notifications` class definition with the following code, and replace the two placeholders with the connection string (with full access) for your notification hub and the hub name (available at [Azure portal](http:https://portal.azure.com)):
6. Replace the `Notifications` class definition with the following code, and replace the two placeholders with the connection string (with full access) for your notification hub and the hub name (available at [Azure portal](https:https://portal.azure.com)):

```csharp
public class Notifications
Expand Down
2 changes: 1 addition & 1 deletion includes/notification-hubs-aspnet-backend-securepush.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ms.author: spelluru
---
## WebAPI Project
1. In Visual Studio, open the **AppBackend** project that you created in the **Notify Users** tutorial.
2. In Notifications.cs, replace the whole **Notifications** class with the following code. Be sure to replace the placeholders with your connection string (with full access) for your notification hub, and the hub name. You can obtain these values from the [Azure portal](http:https://portal.azure.com). This module now represents the different secure notifications that will be sent. In a complete implementation, the notifications will be stored in a database; for simplicity, in this case we store them in memory.
2. In Notifications.cs, replace the whole **Notifications** class with the following code. Be sure to replace the placeholders with your connection string (with full access) for your notification hub, and the hub name. You can obtain these values from the [Azure portal](https:https://portal.azure.com). This module now represents the different secure notifications that will be sent. In a complete implementation, the notifications will be stored in a database; for simplicity, in this case we store them in memory.

public class Notification
{
Expand Down

0 comments on commit fd15e58

Please sign in to comment.