Skip to content

Commit 0f1b590

Browse files
authored
Merge pull request #49880 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 40d6a3f + c967c2d commit 0f1b590

File tree

7 files changed

+30
-21
lines changed

7 files changed

+30
-21
lines changed

articles/cognitive-services/Computer-vision/QuickStarts/python-hand-text.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,22 @@ operation_url = response.headers["Operation-Location"]
8686

8787
# The recognized text isn't immediately available, so poll to wait for completion.
8888
analysis = {}
89-
while "recognitionResult" not in analysis:
89+
poll = True
90+
while (poll):
9091
response_final = requests.get(
9192
response.headers["Operation-Location"], headers=headers)
9293
analysis = response_final.json()
9394
time.sleep(1)
95+
if ("recognitionResult" in analysis):
96+
poll= False
97+
if ("status" in analysis and analysis['status'] == 'Failed'):
98+
poll= False
9499

95-
# Extract the recognized text, with bounding boxes.
96-
polygons = [(line["boundingBox"], line["text"])
97-
for line in analysis["recognitionResult"]["lines"]]
100+
polygons=[]
101+
if ("recognitionResult" in analysis):
102+
# Extract the recognized text, with bounding boxes.
103+
polygons = [(line["boundingBox"], line["text"])
104+
for line in analysis["recognitionResult"]["lines"]]
98105

99106
# Display the image and overlay it with the extracted text.
100107
plt.figure(figsize=(15, 15))

articles/cognitive-services/Labs/Answer-Search/c-sharp-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Answers_csharp
4949
// Replace the accessKey string value with your valid access key.
5050
const string accessKey = "YOUR-SUBSCRIPTION-KEY";
5151
52-
const string uriBase = "https://api.labs.cognitive.microsoft.com/answerSearch/v7.0/search ";
52+
const string uriBase = "https://api.labs.cognitive.microsoft.com/answerSearch/v7.0/search";
5353
5454
const string searchTerm = "third law of calculus";
5555

articles/cognitive-services/Translator/languages.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ The following languages can be detected by the Detect method. Detect may detect
181181
| Bulgarian |
182182
| Catalan |
183183
| Chinese |
184-
| Chinese_Simplified |
185-
| Chinese_Traditional |
184+
| Chinese (Simplified) |
185+
| Chinese (Traditional) |
186186
| Croatian |
187187
| Czech |
188188
| Danish |
@@ -195,7 +195,7 @@ The following languages can be detected by the Detect method. Detect may detect
195195
| Galician |
196196
| German |
197197
| Greek |
198-
| Haitian_Creole |
198+
| Haitian Creole |
199199
| Hebrew |
200200
| Hindi |
201201
| Hungarian |
@@ -205,24 +205,24 @@ The following languages can be detected by the Detect method. Detect may detect
205205
| Italian |
206206
| Japanese |
207207
| Korean |
208-
| Kurdish_Arabic |
209-
| Kurdish_Latin |
208+
| Kurdish (Arabic) |
209+
| Kurdish (Latin) |
210210
| Latin |
211211
| Latvian |
212212
| Lithuanian |
213213
| Macedonian |
214214
| Malay |
215215
| Maltese |
216216
| Norwegian |
217-
| Norwegian_Nynorsk |
217+
| Norwegian (Nynorsk) |
218218
| Pashto |
219219
| Persian |
220220
| Polish |
221221
| Portuguese |
222222
| Romanian |
223223
| Russian |
224-
| Serbian_Cyrillic |
225-
| Serbian_Latin |
224+
| Serbian (Cyrillic) |
225+
| Serbian (Latin) |
226226
| Slovak |
227227
| Slovenian |
228228
| Somali |
@@ -234,8 +234,8 @@ The following languages can be detected by the Detect method. Detect may detect
234234
| Turkish |
235235
| Ukrainian |
236236
| Urdu |
237-
| Uzbek_Cyrillic |
238-
| Uzbek_Latin |
237+
| Uzbek (Cyrillic) |
238+
| Uzbek (Latin) |
239239
| Vietnamese |
240240
| Welsh |
241241
| Yiddish |

articles/service-fabric/virtual-machine-scale-set-scale-node-type-scale-out.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ ms.devlang: dotnet
1313
ms.topic: article
1414
ms.tgt_pltfrm: NA
1515
ms.workload: NA
16-
ms.date: 05/21/2018
16+
ms.date: 08/21/2018
1717
ms.author: ryanwi
1818

1919
---
2020
# Scale a Service Fabric cluster out by adding a Virtual Machine Scale Set
2121
This article describes how to scale an Azure Service Fabric cluster by adding a new virtual machine scale set to an existing cluster. A Service Fabric cluster is a network-connected set of virtual or physical machines into which your microservices are deployed and managed. A machine or VM that's part of a cluster is called a node. Virtual machine scale sets are an Azure compute resource that you use to deploy and manage a collection of virtual machines as a set. Every node type that is defined in an Azure cluster is [set up as a separate scale set](service-fabric-cluster-nodetypes.md). Each node type can then be managed separately. After creating a Service Fabric cluster, you can scale a cluster node type vertically (change the resources of the nodes), upgrade the operating system of the node type VMs, or add a new virtual machine scale set to an existing cluster. You can scale the cluster at any time, even when workloads are running on the cluster. As the cluster scales, your applications automatically scale as well.
2222

2323
> [!WARNING]
24+
> Do not start to change the primary nodetype VM SKU, if the cluster health is unhealthy. If the cluster health is unhealthy, you will only destabilize the cluster further, if you try to change the VM SKU.
25+
>
2426
> We recommend that you do not change the VM SKU of a scale set/node type unless it is running at [Silver durability or greater](service-fabric-cluster-capacity.md#the-durability-characteristics-of-the-cluster). Changing VM SKU Size is a data-destructive in-place infrastructure operation. Without some ability to delay or monitor this change, it is possible that the operation can cause data loss for stateful services or cause other unforeseen operational issues, even for stateless workloads. This means your primary node type, which is running stateful service fabric system services, or any node type that is running your stateful application work loads.
2527
>
2628

articles/storage/data-lake-storage/using-databricks-spark.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The next step is to create a [Databricks cluster](https://docs.azuredatabricks.n
6262
```bash
6363
spark.conf.set("fs.azure.account.key.<account_name>.dfs.core.windows.net", "<account_key>")
6464
spark.conf.set("fs.azure.createRemoteFileSystemDuringInitialization", "true")
65-
dbutils.fs.ls("abfs://<file_system>@<account_name>.dfs.core.windows.net/")
65+
dbutils.fs.ls("abfss://<file_system>@<account_name>.dfs.core.windows.net/")
6666
spark.conf.set("fs.azure.createRemoteFileSystemDuringInitialization", "false")
6767
```
6868

@@ -249,4 +249,4 @@ display(output)
249249
250250
## Next steps
251251
252-
* [Extract, transform, and load data using Apache Hive on Azure HDInsight](tutorial-extract-transform-load-hive.md)
252+
* [Extract, transform, and load data using Apache Hive on Azure HDInsight](tutorial-extract-transform-load-hive.md)

articles/virtual-machines/linux/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
href: use-remote-desktop.md
201201
- name: Join VM to Azure Active Directory
202202
items:
203-
- name: Red Hat Enteprise Linux
203+
- name: Red Hat Enterprise Linux
204204
href: ../../active-directory-domain-services/active-directory-ds-join-rhel-linux-vm.md
205205
- name: CentOS
206206
href: ../../active-directory-domain-services/active-directory-ds-join-centos-linux-vm.md

articles/virtual-machines/linux/tutorial-secure-web-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you choose to install and use the CLI locally, this tutorial requires that yo
3636

3737

3838
## Overview
39-
Azure Key Vault safeguards cryptographic keys and secrets, such certificates or passwords. Key Vault helps streamline the certificate management process and enables you to maintain control of keys that access those certificates. You can create a self-signed certificate inside Key Vault, or upload an existing, trusted certificate that you already own.
39+
Azure Key Vault safeguards cryptographic keys and secrets, such as certificates or passwords. Key Vault helps streamline the certificate management process and enables you to maintain control of keys that access those certificates. You can create a self-signed certificate inside Key Vault, or upload an existing, trusted certificate that you already own.
4040

4141
Rather than using a custom VM image that includes certificates baked-in, you inject certificates into a running VM. This process ensures that the most up-to-date certificates are installed on a web server during deployment. If you renew or replace a certificate, you don't also have to create a new custom VM image. The latest certificates are automatically injected as you create additional VMs. During the whole process, the certificates never leave the Azure platform or are exposed in a script, command-line history, or template.
4242

@@ -48,7 +48,7 @@ Before you can create a Key Vault and certificates, create a resource group with
4848
az group create --name myResourceGroupSecureWeb --location eastus
4949
```
5050

51-
Next, create a Key Vault with [az keyvault create](/cli/azure/keyvault#az_keyvault_create) and enable it for use when you deploy a VM. Each Key Vault requires a unique name, and should be all lower case. Replace *<mykeyvault>* in the following example with your own unique Key Vault name:
51+
Next, create a Key Vault with [az keyvault create](/cli/azure/keyvault#az_keyvault_create) and enable it for use when you deploy a VM. Each Key Vault requires a unique name, and should be all lowercase. Replace *<mykeyvault>* in the following example with your own unique Key Vault name:
5252

5353
```azurecli-interactive
5454
keyvault_name=<mykeyvault>

0 commit comments

Comments
 (0)