deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-13 22:07:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Joey Caparas 2018-12-17 16:16:45 -08:00
commit a171986652
4 changed files with 16 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
education/index.md
View File

@ -44,7 +44,7 @@ ms.date: 10/30/2017
</a> </a>
</li> </li>
<li> <li>
<a href="/microsoft-365/education/get-started" target="_blank"> <a href="/microsoft-365/education/deploy/" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">

115
windows/configuration/wcd/wcd-hotspot.md
View File

@ -8,121 +8,10 @@ author: jdeckerMS
ms.localizationpriority: medium ms.localizationpriority: medium
ms.author: jdecker ms.author: jdecker
ms.topic: article ms.topic: article
ms.date: 04/30/2018 ms.date: 12/18/2018
--- ---
# HotSpot (Windows Configuration Designer reference) # HotSpot (Windows Configuration Designer reference)
Use HotSpot settings to configure Internet sharing. Do not use. Enterprise admins who want to configure settings for mobile hotspots should use [Policies > Wifi](#wcd-policies.md#wifi). Mobile operators should use the [Country and Operator Settings Asset (COSA) format](https://docs.microsoft.com/windows-hardware/drivers/mobilebroadband/cosa-overview).
## Applies to
| Setting groups | Desktop editions | Mobile editions | Surface Hub | HoloLens | IoT Core |
| --- | :---: | :---: | :---: | :---: | :---: |
| All settings | | X | | | |
>[!NOTE]
>Although the HotSpot settings are available in advanced editing for multiple editions, the settings are only supported on devices running Windows 10 Mobile.
## DedicatedConnections
(Optional) Set DedicatedConnections to a semicolon-separated list of connections.
Specifies the list of Connection Manager cellular connections that Internet sharing will use as public connections.
By default, any available connection will be used as a public connection. However, this node allows a mobile operator to specify one or more connection names to use as public connections.
Specified connections will be mapped, by policy, to the Internet sharing service. All attempts to enumerate Connection Manager connections for the Internet sharing service will return only the mapped connections.
The mapping policy will also include the connection specified in the TetheringNAIConnection value as well.
If the specified connections do not exist, Internet sharing will not start because it will not have any cellular connections available to share.
## Enabled
Specify **True** to enable Internet sharing on the device or **False** to disable Internet sharing.
If Enabled is initially set to **True**, the feature is turned off and the internet sharing screen is removed from Settings so that the user cannot access it. Configuration changes or connection sharing state changes will not be possible.
When Enabled is set to **False**, the internet sharing screen is added to Settings, although sharing is turned off by default until the user turns it on.
## EntitlementDll
Enter the path to the entitlement DLL used to make entitlement checks that verify that the device is entitled to use the Internet sharing service on a mobile operator's network.
## EntitlementInterval
Enter the time interval, in seconds, between entitlement checks.
## EntitlementRequired
Specify whether the device requires an entitlement check to determine if Internet sharing should be enabled.
## MaxBluetoothUsers
(Optional) Specify the maximum number of simultaneous Bluetooth users that can be connected to a device while sharing over Bluetooth. Set MaxBluetoothUsers to an integer value between 1 and 7 inclusive. The default value is 7.
## MaxUsers
(Optional) Specify the maximum number of simultaneous users that can be connected to a device while sharing. Set MaxUsers to an integer value between 1 and 8 inclusive. The default value is 5.
## MOAppLink
(Optional) Enter an application link that points to a pre-installed application, provided by the mobile operator. that will help a user to subscribe to the mobile operator's Internet sharing service when Internet sharing is not provisioned or entitlement fails.
Set MOAppLink to a valid app ID. The general format for the link is *app://MOappGUID*. For example, if your app ID is `12345678-9012-3456-7890-123456789012`, you must set the value to `app://12345678-9012-3456-7890-123456789012`.
## MOHelpMessage
(Optional) Enter a reference to a localized string, provided by the mobile operator, that is displayed when Internet sharing is not enabled due to entitlement failure. The node takes a language-neutral registry value string, which has the following form:
```
@<res_dll>,-<str_id>
```
Where `<res_dll>` is the resource dll that contains the string and `<str_id>` is the string identifier. For more information on language-neutral string resource registry values, see [Using Registry String Redirection](https://msdn.microsoft.com/library/windows/desktop/dd374120.aspx).
## MOHelpNumber
(Optional) Enter a mobile operator–specified phone number that is displayed to the user when the Internet sharing service fails to start. The user interface displays a message informing the user that they can call the specified number for help.
## MOInfoLink
(Optional) Enter a mobile operator–specified HTTP link that is displayed to the user when Internet sharing is disabled or the device is not entitled. The user interface displays a message informing the user that they can visit the specified link for more information about how to enable the feature.
## PeerlessTimeout
(Optional) Enter the time-out period, in minutes, after which Internet sharing should automatically turn off if there are no active clients.
Set PeerlessTimeout to any value between 1 and 120 inclusive. A value of 0 is not supported. The default value is 5 minutes.
## PublicConnectionTimeout
(Optional) Enter the time-out value, in minutes, after which Internet sharing is automatically turned off if a cellular connection is not available.
Set PublicConnectionTimeout to any value between 1 and 60 inclusive. The default value is 20 minutes. A value of 0 is not supported.
## TetheringNAIConnection
(Optional) Specify the CDMA TetheringNAI Connection Manager cellular connection that Internet sharing will use as a public connection. Set TetheringNAIConnection to the CDMA TetheringNAI Connection Manager cellular connection.
If a CDMA mobile operator requires using a Tethering NAI during Internet sharing, they must configure a TetheringNAI connection and then specify the connection in this node.
Specified connections will be mapped, by policy, to the Internet sharing service. All attempts to enumerate Connection Manager connections for the Internet sharing service will return only the mapped connections.The mapping policy will also include the connection specified in the TetheringNAIConnection value as well.
If the specified connections do not exist, Internet sharing will not start because it will not have any cellular connections available to share.
>[!NOTE]
>CDMA phones are limited to one active data connection at a time. This means any application or service (such as e-mail or MMS) that is bound to another connection may not work while Internet sharing is turned on.

2
windows/configuration/wcd/wcd.md
View File

@ -45,7 +45,7 @@ This section describes the settings that you can configure in [provisioning pack
| [FirewallConfiguration](wcd-firewallconfiguration.md) | | | | | X | | [FirewallConfiguration](wcd-firewallconfiguration.md) | | | | | X |
| [FirstExperience](wcd-firstexperience.md) | | | | X | | | [FirstExperience](wcd-firstexperience.md) | | | | X | |
| [Folders](wcd-folders.md) |X | X | X | X | | | [Folders](wcd-folders.md) |X | X | X | X | |
| [HotSpot](wcd-hotspot.md) | X | X | X | X | X | | [HotSpot](wcd-hotspot.md) | | | | | |
| [InitialSetup](wcd-initialsetup.md) | | X | | | | | [InitialSetup](wcd-initialsetup.md) | | X | | | |
| [InternetExplorer](wcd-internetexplorer.md) | | X | | | | | [InternetExplorer](wcd-internetexplorer.md) | | X | | | |
| [KioskBrowser](wcd-kioskbrowser.md) | | | | | X | | [KioskBrowser](wcd-kioskbrowser.md) | | | | | X |

32
windows/security/threat-protection/windows-defender-atp/configure-server-endpoints-windows-defender-advanced-threat-protection.md
View File

@ -10,7 +10,7 @@ ms.sitesec: library
ms.pagetype: security ms.pagetype: security
author: mjcaparas author: mjcaparas
ms.localizationpriority: medium ms.localizationpriority: medium
ms.date: 12/10/2018 ms.date: 12/14/2018
--- ---
# Onboard servers to the Windows Defender ATP service # Onboard servers to the Windows Defender ATP service
@ -41,30 +41,14 @@ For a practical guidance on what needs to be in place for licensing and infrastr
## Windows Server 2012 R2 and Windows Server 2016 ## Windows Server 2012 R2 and Windows Server 2016
There are two options to onboard Windows Server 2012 R2 and Windows Server 2016 to Windows Defender ATP: To onboard Windows Server 2012 R2 and Windows Server 2016 to Windows Defender ATP, you’ll need to:
- **Option 1**: Onboard through Azure Security Center (recommended)
- **Option 2** Onboard through Windows Defender Security Center
### Option 1: Onboard servers through Azure Security Center (recommended)
1. In the navigation pane, select **Settings** > **Machine management** > **Onboarding**.
2. Select Windows server 2012, 2012R2 and 2016 as the operating system.
3. Click **Go to Azure Security Center to onboard servers**.
4. Follow the onboarding steps in Azure Security Center.
### Option 2: Onboard servers through Windows Defender Security Center
You'll need to take the following steps if you opt to onboard servers through Windows Defender Security Center.
- For Windows Server 2012 R2: Configure and update System Center Endpoint Protection clients. - For Windows Server 2012 R2: Configure and update System Center Endpoint Protection clients.
>[!NOTE] >[!NOTE]
>This step is required only if your organization uses System Center Endpoint Protection (SCEP) and you're onboarding Windows Server 2012 R2. >This step is required only if your organization uses System Center Endpoint Protection (SCEP) and you're onboarding Windows Server 2012 R2.
- Go to Azure Security Center to onboard servers (recommended) or turn on server monitoring from Windows Defender Security Center. For more information on how to onboard servers in Azure Security Center - Turn on server monitoring from Windows Defender Security Center.
- If you're already leveraging System Center Operations Manager (SCOM) or Operations Management Suite (OMS), simply attach the Microsoft Monitoring Agent (MMA) to report to your Windows Defender ATP workspace through [Multi Homing support](https://blogs.technet.microsoft.com/msoms/2016/05/26/oms-log-analytics-agent-multi-homing-support/). Otherwise, install and configure MMA to report sensor data to Windows Defender ATP as instructed below. - If you're already leveraging System Center Operations Manager (SCOM) or Operations Management Suite (OMS), simply attach the Microsoft Monitoring Agent (MMA) to report to your Windows Defender ATP workspace through [Multi Homing support](https://blogs.technet.microsoft.com/msoms/2016/05/26/oms-log-analytics-agent-multi-homing-support/). Otherwise, install and configure MMA to report sensor data to Windows Defender ATP as instructed below.
>[!TIP] >[!TIP]
@ -125,7 +109,15 @@ Agent Resource | Ports
| winatp-gw-aue.microsoft.com |443 | | winatp-gw-aue.microsoft.com |443 |
## Windows Server, version 1803 and Windows Server 2019 ## Windows Server, version 1803 and Windows Server 2019
To onboard Windows Server, version 1803 or Windows Server 2019, use the same method used when onboarding Windows 10 machines. For more information, see [Onboard Windows 10 machines](configure-endpoints-windows-defender-advanced-threat-protection.md). Support for Windows Server, version 1803 and Windows 2019 provides deeper insight into activities happening on the server, coverage for kernel and memory attack detection, and enables response actions on Windows Server endpoint as well. To onboard Windows Server, version 1803 or Windows Server 2019, use the same method used when onboarding Windows 10 machines.
Supported tools include:
- Local script
- Group Policy
- System Center Configuration Manager 2012 / 2012 R2 1511 / 1602
- VDI onboarding scripts for non-persistent machines
For more information, see [Onboard Windows 10 machines](configure-endpoints-windows-defender-advanced-threat-protection.md). Support for Windows Server, version 1803 and Windows 2019 provides deeper insight into activities happening on the server, coverage for kernel and memory attack detection, and enables response actions on Windows Server endpoint as well.
1. Configure Windows Defender ATP onboarding settings on the server. For more information, see [Onboard Windows 10 machines](configure-endpoints-windows-defender-advanced-threat-protection.md). 1. Configure Windows Defender ATP onboarding settings on the server. For more information, see [Onboard Windows 10 machines](configure-endpoints-windows-defender-advanced-threat-protection.md).