Merge pull request #50113 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 1932bd13bcd0 · 2018-08-27T14:38:12.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/active-directory/devices/hybrid-azuread-join-plan.md b/articles/active-directory/devices/hybrid-azuread-join-plan.md
@@ -128,6 +128,7 @@ Beginning with version 1.1.819.0, Azure AD Connect provides you with a wizard to
 
 - [Configure hybrid Azure Active Directory join for federated domains](hybrid-azuread-join-federated-domains.md)
 
+
 - [Configure hybrid Azure Active Directory join for managed domains](hybrid-azuread-join-managed-domains.md)
 
 
diff --git a/articles/aks/create-cluster.md b/articles/aks/create-cluster.md
@@ -44,7 +44,7 @@ The following options are available with the `az aks create` command. See the [A
 | `--enable-rbac` `-r` | Enable Kubernetes Role-Based Access Control. | no |
 | `--generate-ssh-keys` | Generate SSH public and private key files if missing. | no |
 | `--kubernetes-version` `-k` | The version of Kubernetes to use for creating the cluster, such as '1.7.9' or '1.9.6'. | no |
-| `--locaton` `-l` | Location for the auto-created resource group | no |
+| `--location` `-l` | Location for the auto-created resource group | no |
 | `--max-pods` `-m` | The maximum number of pods deployable to a node. | no |
 | `--network-plugin` | The Kubernetes network plugin to use. | no |
 | `--no-ssh-key` `-x` | Do not use or create a local SSH key. | no |
diff --git a/articles/aks/intro-kubernetes.md b/articles/aks/intro-kubernetes.md
@@ -50,7 +50,7 @@ For more information, see [Upgrade an Azure Kubernetes Service (AKS) cluster][ak
 
 ## HTTP application routing
 
-The HTTP Application Routing solution makes it easy to access applications deployed to your AKS cluster. When enabled, the HTTP application routing solution configures an ingress controller in your AKS cluster. As applications are deployed, publically accessible DNS names are auto configured.
+The HTTP Application Routing solution makes it easy to access applications deployed to your AKS cluster. When enabled, the HTTP application routing solution configures an ingress controller in your AKS cluster. As applications are deployed, publicly accessible DNS names are auto configured.
 
 For more information, see [HTTP application routing][aks-http-routing].
 
diff --git a/articles/aks/kubernetes-draft.md b/articles/aks/kubernetes-draft.md
@@ -12,7 +12,7 @@ ms.author: iainfou
 
 # Use Draft with Azure Kubernetes Service (AKS)
 
-Draft is an open-source tool that helps package and deploy application containers in a Kubernetes cluster, leaving you free to concentrate on the dev cycle -- the "inner loop" of concentrated development. Draft works as the code is being developed, but before committing to version control. With Draft, you can quickly redeploy an application to Kubernetes as code changes occur. For more information on Draft, see the [Draft documentation on Github][draft-documentation].
+Draft is an open-source tool that helps package and deploy application containers in a Kubernetes cluster, leaving you free to concentrate on the dev cycle - the "inner loop" of concentrated development. Draft works as the code is being developed, but before committing to version control. With Draft, you can quickly redeploy an application to Kubernetes as code changes occur. For more information on Draft, see the [Draft documentation on Github][draft-documentation].
 
 This article shows you how to use Draft with a Kubernetes cluster on AKS.
 
diff --git a/articles/aks/tutorial-kubernetes-prepare-app.md b/articles/aks/tutorial-kubernetes-prepare-app.md
@@ -94,7 +94,7 @@ To see the running application, enter http://localhost:8080 in a local web brows
 
 ## Clean up resources
 
-Now that application functionality has been validated, the running containers can be stopped and removed. Do not delete the container images - in the next tutorial, the *azure-vote-front* image is uploaded to an Azure Container Registry instance
+Now that the application's functionality has been validated, the running containers can be stopped and removed. Do not delete the container images - in the next tutorial, the *azure-vote-front* image is uploaded to an Azure Container Registry instance.
 
 Stop and remove the container instances and resources with the [docker-compose down][docker-compose-down] command:
 
@@ -130,4 +130,4 @@ Advance to the next tutorial to learn how to store container images in Azure Con
 [git]: https://git-scm.com/downloads
 
 <!-- LINKS - internal -->
-[aks-tutorial-prepare-acr]: ./tutorial-kubernetes-prepare-acr.md
+[aks-tutorial-prepare-acr]: ./tutorial-kubernetes-prepare-acr.md
diff --git a/articles/application-insights/app-insights-sampling.md b/articles/application-insights/app-insights-sampling.md
@@ -279,7 +279,7 @@ Instead of setting the sampling parameter in the .config file, you can programma
     using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel;
     ...
 
-    var builder = TelemetryConfiguration.Active.GetTelemetryProcessorChainBuilder();
+    var builder = TelemetryConfiguration.Active.TelemetryProcessorChainBuilder;
     builder.UseSampling(10.0); // percentage
 
     // If you have other telemetry processors:
diff --git a/articles/automation/automation-hrw-run-runbooks.md b/articles/automation/automation-hrw-run-runbooks.md
@@ -41,9 +41,9 @@ By default, runbooks run in the context of the Local System account for Windows
 
 You can use [Credential](automation-credentials.md) and [Certificate](automation-certificates.md) assets in your runbook with cmdlets that allow you to specify credentials so you can authenticate to different resources. The following example shows a portion of a runbook that restarts a computer. It retrieves credentials from a credential asset and the name of the computer from a variable asset and then uses these values with the Restart-Computer cmdlet.
 
-```azurepowershell-interactive
-$Cred = Get-AzureRmAutomationCredential -ResourceGroupName "ResourceGroup01" -Name "MyCredential"
-$Computer = Get-AzureRmAutomationVariable -ResourceGroupName "ResourceGroup01" -Name  "ComputerName"
+```powershell
+$Cred = Get-AutomationPSCredential -Name "MyCredential"
+$Computer = Get-AutomationVariable -Name "ComputerName"
 
 Restart-Computer -ComputerName $Computer -Credential $Cred
 ```
diff --git a/articles/cloud-shell/quickstart-powershell.md b/articles/cloud-shell/quickstart-powershell.md
@@ -115,7 +115,7 @@ TestVm2   westus     Succeeded         Standard_DS1_v2 WindowsServer 2016-Datace
 ```
 
 > [!NOTE]
-> You may notice that the second time when you type `dir`, the cloud shell is able to display the items much faster.
+> You may notice that the second time when you type `dir`, the Cloud Shell is able to display the items much faster.
 > This is because the child items are cached in memory for a better user experience.
 However, you can always use `dir -Force` to get fresh data.
 
@@ -254,7 +254,6 @@ mywebapp3       Running  MyResourceGroup3   {mywebapp3.azurewebsites.net...   So
 
 ## SSH
 
-[Win32-OpenSSH](https://github.com/PowerShell/Win32-OpenSSH) is available in PowerShell Cloud Shell.
 To authenticate to servers or VMs using SSH, generate the public-private key pair in Cloud Shell and
 publish the public key to `authorized_keys` on the remote machine, such as `/home/user/.ssh/authorized_keys`.
 
diff --git a/articles/logic-apps/workflow-definition-language-functions-reference.md b/articles/logic-apps/workflow-definition-language-functions-reference.md
@@ -3755,6 +3755,8 @@ And returns this string as an example result: `"http://feeds.reuters.com/reuters
 
 <a name="triggerMultipartBody"></a>
 
+### triggerMultipartBody
+
 Return the body for a specific part in a trigger's output that has multiple parts. 
 
 ```
diff --git a/articles/service-fabric/service-fabric-reliable-services-diagnostics.md b/articles/service-fabric/service-fabric-reliable-services-diagnostics.md
@@ -13,7 +13,7 @@ ms.devlang: dotnet
 ms.topic: conceptual
 ms.tgt_pltfrm: NA
 ms.workload: NA
-ms.date: 6/28/2018
+ms.date: 8/24/2018
 ms.author: dekapur
 
 ---
@@ -117,7 +117,10 @@ The Reliable Services runtime emits the following events under the `Service Fabr
 
  Counter name | Description |
 | --- | --- |
-| Item Count | The number of keys in the store.|
+| Item Count | The number of items in the store.|
+| Disk Size | The total disk size, in bytes, of checkpoint files for the store.|
+| Checkpoint File Write Bytes/sec | The number of bytes written per second for the most recent checkpoint file.|
+| Copy Disk Transfer Bytes/sec | The number of disk bytes read (on the primary replica) or written (on a secondary replica) per second during a store copy.|
 
 ## Next steps
 [EventSource providers in PerfView](https://blogs.msdn.microsoft.com/vancem/2012/07/09/introduction-tutorial-logging-etw-events-in-c-system-diagnostics-tracing-eventsource/)
diff --git a/articles/virtual-machines/linux/quick-create-portal.md b/articles/virtual-machines/linux/quick-create-portal.md
@@ -49,7 +49,7 @@ Log in to the Azure portal at http://portal.azure.com
 
 3. Provide a VM name, such as *myVM*, leave the disk type as *SSD*, then provide a username, such as *azureuser*.
 
-4. . For **Authentication type**, select **SSH public key**, then paste your public key into the text box. Take care to remove any leading or trailing white space in your public key.
+4. For **Authentication type**, select **SSH public key**, then paste your public key into the text box. Take care to remove any leading or trailing white space in your public key.
 
     ![Enter basic information about your VM in the portal blade](./media/quick-create-portal/create-vm-portal-basic-blade.png)
 
diff --git a/articles/virtual-machines/windows/run-command.md b/articles/virtual-machines/windows/run-command.md
@@ -11,7 +11,7 @@ manager: carmonm
 ---
 # Run PowerShell scripts in your Windows VM with Run Command
 
-Run Command uses the VM agent to run shell PowerShell scripts within an Azure Windows VM. These scripts can be used for general machine or application management, and can be used to quickly diagnose and remediate VM access and network issues and get the VM back to a good state.
+Run Command uses the VM agent to run PowerShell scripts within an Azure Windows VM. These scripts can be used for general machine or application management, and can be used to quickly diagnose and remediate VM access and network issues and get the VM back to a good state.
 
 ## Benefits
 
@@ -79,4 +79,4 @@ You can use one of the [built-in](../../role-based-access-control/built-in-roles
 
 ## Next steps
 
-See, [Run scripts in your Windows VM](run-scripts-in-vm.md) to learn about other ways to run scripts and commands remotely in your VM.
+See, [Run scripts in your Windows VM](run-scripts-in-vm.md) to learn about other ways to run scripts and commands remotely in your VM.

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ Beginning with version 1.1.819.0, Azure AD Connect provides you with a wizard to`
`128`	`128`
`129`	`129`	`- [Configure hybrid Azure Active Directory join for federated domains](hybrid-azuread-join-federated-domains.md)`
`130`	`130`
	`131`	`+`
`131`	`132`	`- [Configure hybrid Azure Active Directory join for managed domains](hybrid-azuread-join-managed-domains.md)`
`132`	`133`
`133`	`134`