Skip to content

Commit d858392

Browse files
authored
Merge pull request #89306 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 43e0d4b + ef6f119 commit d858392

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

articles/cognitive-services/personalizer/what-is-personalizer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For example, your client application can add Personalizer to:
4949
* Choose a chat bot's response to clarify user intent or suggest an action.
5050
* Prioritize suggestions of what a user should do as the next step in a business process.
5151

52-
Personalizer is not a service to persist and manage user profile information, or to log individual users' preferences or history. Personalizer learns from each interaction's features in the action a context a single model that can obtain maximum rewards when similar features occur.
52+
Personalizer is not a service to persist and manage user profile information, or to log individual users' preferences or history. Personalizer learns from each interaction's features in the action of a context in a single model that can obtain maximum rewards when similar features occur.
5353

5454
## Personalization for developers
5555

articles/hdinsight/hdinsight-apache-kafka-spark-structured-streaming.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,15 @@ This example demonstrates how to use Spark Structured Streaming with Kafka on HD
183183
184184
4. Load packages used by the Notebook by entering the following information in a Notebook cell. Run the command by using **CTRL + ENTER**.
185185
186+
Spark streaming has microbatching, which means data comes as batches and executers run on the batches of data. If the executor has idle timeout less than the time it takes to process the batch then the executors would be constantly added and removed. If the executors idle timeout is greater than the batch duration, the executor never gets removed. Hence **we recommend that you disable dynamic allocation by setting spark.dynamicAllocation.enabled to false when running streaming applications.**
187+
186188
```
187189
%%configure -f
188190
{
189191
"conf": {
190192
"spark.jars.packages": "org.apache.spark:spark-sql-kafka-0-10_2.11:2.2.0",
191-
"spark.jars.excludes": "org.scala-lang:scala-reflect,org.apache.spark:spark-tags_2.11"
193+
"spark.jars.excludes": "org.scala-lang:scala-reflect,org.apache.spark:spark-tags_2.11",
194+
"spark.dynamicAllocation.enabled": false
192195
}
193196
}
194197
```

articles/iot-hub/iot-hub-scaling.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Only one type of [edition](https://azure.microsoft.com/pricing/details/iot-hub/)
4141
| [Device twins](iot-hub-devguide-device-twins.md), [Module twins](iot-hub-devguide-module-twins.md), and [Device management](iot-hub-device-management-overview.md) | | Yes |
4242
| [Device streams (preview)](iot-hub-device-streams-overview.md) | | Yes |
4343
| [Azure IoT Edge](../iot-edge/about-iot-edge.md) | | Yes |
44+
| [IoT Plug and Play Preview](../iot-pnp/overview-iot-plug-and-play.md) | | Yes |
4445

4546
IoT Hub also offers a free tier that is meant for testing and evaluation. It has all the capabilities of the standard tier, but limited messaging allowances. You cannot upgrade from the free tier to either basic or standard.
4647

articles/service-fabric/service-fabric-cluster-nodetypes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following are the property descriptions:
7474
| **Name** | **Allowed Values** | ** --- ** | **Guidance or Short Description** |
7575
| --- | --- | --- | --- |
7676
| name | string | --- | unique name for extension |
77-
| type | "ServiceFabricLinuxNode" or "ServiceFabricWindowsNode | --- | Identifies OS Service Fabric is bootstrapping to |
77+
| type | "ServiceFabricLinuxNode" or "ServiceFabricWindowsNode" | --- | Identifies OS Service Fabric is bootstrapping to |
7878
| autoUpgradeMinorVersion | true or false | --- | Enable Auto Upgrade of SF Runtime Minor Versions |
7979
| publisher | Microsoft.Azure.ServiceFabric | --- | name of the Service Fabric extention publisher |
8080
| clusterEndpont | string | --- | URI:PORT to Management endpoint |

articles/site-recovery/hyper-v-azure-powershell-resource-manager.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,14 @@ Before you start, note that the storage account specified should be in the same
140140
$protectionContainer = Get-AsrProtectionContainer
141141
3. Associate the protection container with the replication policy, as follows:
142142
143-
$Policy = Get-AsrPolicy -FriendlyName $PolicyName
144-
$associationJob = New-AsrProtectionContainerMapping -Name $mappingName -Policy $Policy -PrimaryProtectionContainer $protectionContainer[0]
145-
143+
$Policy = Get-AsrPolicy -FriendlyName $PolicyName
144+
$associationJob = New-AsrProtectionContainerMapping -Name $mappingName -Policy $Policy -PrimaryProtectionContainer $protectionContainer[0]
146145
4. Wait for the association job to complete successfully.
147146
147+
5. Retrieve the protection container mapping.
148+
149+
$ProtectionContainerMapping = Get-ASRProtectionContainerMapping -ProtectionContainer $protectionContainer
150+
148151
## Step 7: Enable VM protection
149152
150153
1. Retrieve the protectable item that corresponds to the VM you want to protect, as follows:
@@ -153,8 +156,8 @@ Before you start, note that the storage account specified should be in the same
153156
$ProtectableItem = Get-AsrProtectableItem -ProtectionContainer $protectionContainer -FriendlyName $VMFriendlyName
154157
2. Protect the VM. If the VM you are protecting has more than one disk attached to it, specify the operating system disk by using the *OSDiskName* parameter.
155158
156-
$Ostype = "Windows" # "Windows" or "Linux"
157-
$DRjob = New-AsrReplicationProtectedItem -ProtectableItem $VM -Name $VM.Name -ProtectionContainerMapping $ProtectionContainerMapping -RecoveryAzureStorageAccountId $StorageAccountID -OSDiskName $OSDiskNameList[$i] -OS Windows -RecoveryResourceGroupId
159+
$OSType = "Windows" # "Windows" or "Linux"
160+
$DRjob = New-AsrReplicationProtectedItem -ProtectableItem $VM -Name $VM.Name -ProtectionContainerMapping $ProtectionContainerMapping -RecoveryAzureStorageAccountId $StorageAccountID -OSDiskName $OSDiskNameList[$i] -OS $OSType -RecoveryResourceGroupId $ResourceGroupID
158161
159162
3. Wait for the VMs to reach a protected state after the initial replication. This can take a while, depending on factors such as the amount of data to be replicated, and the available upstream bandwidth to Azure. When a protected state is in place, the job State and StateDescription are updated as follows:
160163

articles/virtual-machines/windows/prepare-for-upload-vhd-image.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Set-Service -Name RemoteRegistry -StartupType Automatic
150150
Make sure the following settings are configured correctly for remote access:
151151

152152
>[!NOTE]
153-
>You might receive an error message when you run `Set-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services -name <object name> -value <value>`. You can safely ignore this message. It means only that the domain isn't pushing that configuration through a Group Policy Object.
153+
>You might receive an error message when you run `Set-ItemProperty -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services -name <object name> -value <value>`. You can safely ignore this message. It means only that the domain isn't pushing that configuration through a Group Policy Object.
154154
155155
1. Remote Desktop Protocol (RDP) is enabled:
156156

@@ -269,23 +269,19 @@ Make sure the VM is healthy, secure, and RDP accessible:
269269
> Use an elevated PowerShell window to run these commands.
270270
271271
```powershell
272-
cmd
273-
274-
bcdedit /set {bootmgr} integrityservices enable
275-
bcdedit /set {default} device partition=C:
276-
bcdedit /set {default} integrityservices enable
277-
bcdedit /set {default} recoveryenabled Off
278-
bcdedit /set {default} osdevice partition=C:
279-
bcdedit /set {default} bootstatuspolicy IgnoreAllFailures
272+
bcdedit /set "{bootmgr}" integrityservices enable
273+
bcdedit /set "{default}" device partition=C:
274+
bcdedit /set "{default}" integrityservices enable
275+
bcdedit /set "{default}" recoveryenabled Off
276+
bcdedit /set "{default}" osdevice partition=C:
277+
bcdedit /set "{default}" bootstatuspolicy IgnoreAllFailures
280278
281279
#Enable Serial Console Feature
282-
bcdedit /set {bootmgr} displaybootmenu yes
283-
bcdedit /set {bootmgr} timeout 5
284-
bcdedit /set {bootmgr} bootems yes
285-
bcdedit /ems {current} ON
280+
bcdedit /set "{bootmgr}" displaybootmenu yes
281+
bcdedit /set "{bootmgr}" timeout 5
282+
bcdedit /set "{bootmgr}" bootems yes
283+
bcdedit /ems "{current}" ON
286284
bcdedit /emssettings EMSPORT:1 EMSBAUDRATE:115200
287-
288-
exit
289285
```
290286
3. The dump log can be helpful in troubleshooting Windows crash issues. Enable the dump log collection:
291287

0 commit comments

Comments
 (0)