Skip to content

Commit 4eedbb1

Browse files
author
jimdial
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into security-overview-rename
2 parents 666e57d + 432d6b7 commit 4eedbb1

File tree

259 files changed

+2340
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+2340
-1036
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
{
165165
"path_to_root": "samples-cognitive-services-speech-sdk",
166166
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
167-
"branch": "docs",
167+
"branch": "docs-201807",
168168
"branch_mapping": {}
169169
},
170170
{

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25285,6 +25285,11 @@
2528525285
"redirect_url": "/azure/iot-accelerators/iot-accelerators-time-series-insights",
2528625286
"redirect_document_id": false
2528725287
},
25288+
{
25289+
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-overview.md",
25290+
"redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
25291+
"redirect_document_id": false
25292+
},
2528825293
{
2528925294
"source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
2529025295
"redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",

‎articles/aks/networking-overview.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ The following screenshot from the Azure portal shows an example of configuring t
121121

122122
The following questions and answers apply to the **Advanced** networking configuration.
123123

124-
* *Can I configure Advanced networking with the Azure CLI?*
125-
126-
No. Advanced networking is currently available only when deploying AKS clusters in the Azure portal or with a Resource Manager template.
127-
128124
* *Can I deploy VMs in my cluster subnet?*
129125

130126
No. Deploying VMs in the subnet used by your Kubernetes cluster is not supported. VMs may be deployed in the same VNet, but in a different subnet.

‎articles/analysis-services/analysis-services-data-providers.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: minewiskan
55
manager: kfile
66
ms.service: azure-analysis-services
77
ms.topic: conceptual
8-
ms.date: 07/03/2018
8+
ms.date: 07/16/2018
99
ms.author: owend
1010
ms.reviewer: minewiskan
1111

@@ -19,19 +19,19 @@ Client libraries are necessary for client applications and tools to connect to A
1919

2020
|Download |Product version |
2121
|---------|---------|
22-
|[MSOLAP (amd64)](https://go.microsoft.com/fwlink/?linkid=829576) | 15.0.1.492 |
23-
|[MSOLAP (x86)](https://go.microsoft.com/fwlink/?linkid=829575) | 15.0.1.492 |
24-
|[AMO](https://go.microsoft.com/fwlink/?linkid=829578) | 15.1.0.0 |
25-
|[ADOMD](https://go.microsoft.com/fwlink/?linkid=829577) | 15.1.0.0 |
22+
|[MSOLAP (amd64)](https://go.microsoft.com/fwlink/?linkid=829576) | 15.0.1.594 |
23+
|[MSOLAP (x86)](https://go.microsoft.com/fwlink/?linkid=829575) | 15.0.1.594 |
24+
|[AMO](https://go.microsoft.com/fwlink/?linkid=829578) | 15.3.1.0 |
25+
|[ADOMD](https://go.microsoft.com/fwlink/?linkid=829577) | 15.3.1.0 |
2626

2727
## AMO and ADOMD (NuGet packages)
2828

2929
Analysis Services Management Objects (AMO) and ADOMD client libraries are available as installable packages from [NuGet.org](https://www.nuget.org/). It's recommended you migrate to NuGet references instead of using Windows Installer.
3030

3131
|Package | Product version |
3232
|---------|---------|
33-
|[AMO](https://www.nuget.org/packages/Microsoft.AnalysisServices.retail.amd64/) | 15.1.0.0 |
34-
|[ADOMD](https://www.nuget.org/packages/Microsoft.AnalysisServices.AdomdClient.retail.amd64/) | 15.1.0.0 |
33+
|[AMO](https://www.nuget.org/packages/Microsoft.AnalysisServices.retail.amd64/) | 15.3.1 |
34+
|[ADOMD](https://www.nuget.org/packages/Microsoft.AnalysisServices.AdomdClient.retail.amd64/) | 15.3.1 |
3535

3636
NuGet package assemblies AssemblyVersion follow semantic versioning: MAJOR.MINOR.PATCH. NuGet references load the expected version even if there is a different version in the GAC (resulting from MSI install). PATCH is incremented for each release. AMO and ADOMD versions are kept in-sync.
3737

‎articles/azure-stack/azure-stack-updates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ ms.author: mabrigg
2121

2222
*Applies to: Azure Stack integrated systems*
2323

24-
New update packages for Azure Stack integrated systems typically release around the fourth Tuesday of each month. Ask your OEM about their specific notification process to ensure update notifications reach your organization. You can also check in this documentation library under under **Overview** > **Release notes** for information about releases that are in active support.
24+
Microsoft update packages for Azure Stack integrated systems typically release around the fourth Tuesday of each month. Ask your OEM about their specific notification process to ensure update notifications reach your organization. You can also check in this documentation library under under **Overview** > **Release notes** for information about releases that are in active support.
2525

2626
Each release of Microsoft software updates is bundled as a single update package. As an Azure Stack operator, you can import, install, and monitor the installation progress of these update packages from the administrator portal.
2727

28-
Your original equipment manufacturer (OEM) hardware vendor will also release updates, such as driver and firmware updates. These updates are delivered as separate packages by your OEM hardware vendor, and are managed separately from Microsoft updates.
28+
Your original equipment manufacturer (OEM) hardware vendor will also release updates, such as driver and firmware updates. While these updates are delivered as separate packages by your OEM hardware vendor, they are imported, installed, and managed the same way update packages from Microsoft update packages are imported, installed, and managed.
2929

3030
To keep your system under support, you must keep Azure Stack updated to a specific version level. Make sure that you review the [Azure Stack servicing policy](azure-stack-servicing-policy.md).
3131

‎articles/cognitive-services/Computer-vision/QuickStarts/go-analyze.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,47 +55,58 @@ import (
5555
)
5656

5757
func main() {
58+
// For example, subscriptionKey = "0123456789abcdef0123456789ABCDEF"
5859
const subscriptionKey = "<Subscription Key>"
5960

6061
// You must use the same location in your REST call as you used to get your
6162
// subscription keys. For example, if you got your subscription keys from
6263
// westus, replace "westcentralus" in the URL below with "westus".
6364
const uriBase =
64-
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/analyze"
65+
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/analyze"
6566
const imageUrl =
66-
"http://upload.wikimedia.org/wikipedia/commons/3/3c/Shaki_waterfall.jpg"
67+
"http://upload.wikimedia.org/wikipedia/commons/3/3c/Shaki_waterfall.jpg"
6768

6869
const params = "?visualFeatures=Description&details=Landmarks&language=en"
6970
const uri = uriBase + params
7071
const imageUrlEnc = "{\"url\":\"" + imageUrl + "\"}"
7172

72-
r := strings.NewReader(imageUrlEnc)
73+
reader := strings.NewReader(imageUrlEnc)
7374

75+
// Create the Http client
7476
client := &http.Client{
7577
Timeout: time.Second * 2,
7678
}
7779

78-
req, _ := http.NewRequest("POST", uri, r)
80+
// Create the Post request, passing the image URL in the request body
81+
req, err := http.NewRequest("POST", uri, reader)
82+
if err != nil {
83+
panic(err)
84+
}
7985

86+
// Add headers
8087
req.Header.Add("Content-Type", "application/json")
8188
req.Header.Add("Ocp-Apim-Subscription-Key", subscriptionKey)
8289

90+
// Send the request and retrieve the response
8391
resp, err := client.Do(req)
8492
if err != nil {
85-
fmt.Printf("Error on request: %v\n", err)
86-
return
93+
panic(err)
8794
}
95+
8896
defer resp.Body.Close()
8997

90-
body, err := ioutil.ReadAll(resp.Body)
98+
// Read the response body.
99+
// Note, data is a byte array
100+
data, err := ioutil.ReadAll(resp.Body)
91101
if err != nil {
92-
fmt.Printf("Error reading response body: %v\n", err)
93-
return
102+
panic(err)
94103
}
95104

105+
// Parse the Json data
96106
var f interface{}
97-
json.Unmarshal(body, &f)
107+
json.Unmarshal(data, &f)
98108

109+
// Format and display the Json result
99110
jsonFormatted, _ := json.MarshalIndent(f, "", " ")
100111
fmt.Println(string(jsonFormatted))
101112
}

‎articles/cognitive-services/Computer-vision/QuickStarts/go-print-text.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,47 +47,58 @@ import (
4747
)
4848

4949
func main() {
50+
// For example, subscriptionKey = "0123456789abcdef0123456789ABCDEF"
5051
const subscriptionKey = "<Subscription Key>"
5152

5253
// You must use the same location in your REST call as you used to get your
5354
// subscription keys. For example, if you got your subscription keys from
5455
// westus, replace "westcentralus" in the URL below with "westus".
5556
const uriBase =
56-
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/ocr"
57+
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/ocr"
5758
const imageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/" +
5859
"Atomist_quote_from_Democritus.png/338px-Atomist_quote_from_Democritus.png"
5960

6061
const params = "?language=unk&detectOrientation=true"
6162
const uri = uriBase + params
6263
const imageUrlEnc = "{\"url\":\"" + imageUrl + "\"}"
6364

64-
r := strings.NewReader(imageUrlEnc)
65+
reader := strings.NewReader(imageUrlEnc)
6566

67+
// Create the Http client
6668
client := &http.Client{
6769
Timeout: time.Second * 2,
6870
}
6971

70-
req, _ := http.NewRequest("POST", uri, r)
72+
// Create the Post request, passing the image URL in the request body
73+
req, err := http.NewRequest("POST", uri, reader)
74+
if err != nil {
75+
panic(err)
76+
}
7177

78+
// Add headers
7279
req.Header.Add("Content-Type", "application/json")
7380
req.Header.Add("Ocp-Apim-Subscription-Key", subscriptionKey)
7481

82+
// Send the request and retrieve the response
7583
resp, err := client.Do(req)
7684
if err != nil {
77-
fmt.Printf("Error on request: %v\n", err)
78-
return
85+
panic(err)
7986
}
87+
8088
defer resp.Body.Close()
8189

82-
body, err := ioutil.ReadAll(resp.Body)
90+
// Read the response body.
91+
// Note, data is a byte array
92+
data, err := ioutil.ReadAll(resp.Body)
8393
if err != nil {
84-
fmt.Printf("Error reading response body: %v\n", err)
85-
return
94+
panic(err)
8695
}
8796

97+
// Parse the Json data
8898
var f interface{}
89-
json.Unmarshal(body, &f)
99+
json.Unmarshal(data, &f)
90100

101+
// Format and display the Json result
91102
jsonFormatted, _ := json.MarshalIndent(f, "", " ")
92103
fmt.Println(string(jsonFormatted))
93104
}

‎articles/cognitive-services/Computer-vision/QuickStarts/go-thumb.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,47 +47,58 @@ import (
4747
)
4848

4949
func main() {
50+
// For example, subscriptionKey = "0123456789abcdef0123456789ABCDEF"
5051
const subscriptionKey = "<Subscription Key>"
5152

5253
// You must use the same location in your REST call as you used to get your
5354
// subscription keys. For example, if you got your subscription keys from
5455
// westus, replace "westcentralus" in the URL below with "westus".
5556
const uriBase =
56-
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/generateThumbnail"
57+
"https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/generateThumbnail"
5758
const imageUrl =
5859
"https://upload.wikimedia.org/wikipedia/commons/9/94/Bloodhound_Puppy.jpg"
5960

6061
const params = "?width=100&height=100&smartCropping=true"
6162
const uri = uriBase + params
6263
const imageUrlEnc = "{\"url\":\"" + imageUrl + "\"}"
6364

64-
r := strings.NewReader(imageUrlEnc)
65+
reader := strings.NewReader(imageUrlEnc)
6566

67+
// Create the Http client
6668
client := &http.Client{
6769
Timeout: time.Second * 2,
6870
}
6971

70-
req, _ := http.NewRequest("POST", uri, r)
72+
// Create the Post request, passing the image URL in the request body
73+
req, err := http.NewRequest("POST", uri, reader)
74+
if err != nil {
75+
panic(err)
76+
}
7177

78+
// Add headers
7279
req.Header.Add("Content-Type", "application/json")
7380
req.Header.Add("Ocp-Apim-Subscription-Key", subscriptionKey)
7481

82+
// Send the request and retrieve the response
7583
resp, err := client.Do(req)
7684
if err != nil {
77-
fmt.Printf("Error on request: %v\n", err)
78-
return
85+
panic(err)
7986
}
87+
8088
defer resp.Body.Close()
8189

82-
body, err := ioutil.ReadAll(resp.Body)
90+
// Read the response body.
91+
// Note, data is a byte array
92+
data, err := ioutil.ReadAll(resp.Body)
8393
if err != nil {
84-
fmt.Printf("Error reading response body: %v\n", err)
85-
return
94+
panic(err)
8695
}
8796

97+
// Parse the Json data
8898
var f interface{}
89-
json.Unmarshal(body, &f)
99+
json.Unmarshal(data, &f)
90100

101+
// Format and display the Json result
91102
jsonFormatted, _ := json.MarshalIndent(f, "", " ")
92103
fmt.Println(string(jsonFormatted))
93104
}

‎articles/cognitive-services/Computer-vision/QuickStarts/quickstart-summary.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ ms.author: nolachar
1414
---
1515
# Quickstart: Summary
1616

17-
These quickstarts provide information and code samples to help you quickly get started using the Computer Vision API to accomplish the following tasks:
17+
These quickstarts provide information and code samples to help you quickly get started using the Computer Vision service.
18+
19+
The samples make direct HTTP calls to the Computer Vision API. See the *SDK Quickstarts* section for samples using the Computer Vision client libraries, which provide convenience methods that wrap the HTTP calls.
20+
21+
To rapidly experiment with the Computer Vision APIs, try the [Open API testing console](https://westcentralus.dev.cognitive.microsoft.com/docs/services/5adf991815e1060e6355ad44/operations/56f91f2e778daf14a499e1fa/console).
22+
23+
You can use the Computer Vision service to accomplish the following tasks:
1824

1925
* Analyze a remote image
2026
* Analyze a local image
@@ -38,11 +44,7 @@ The code in each sample is similar. However, they highlight different Computer V
3844
| Detect celebrities | model=celebrities | JSON string |
3945
| Generate a thumbnail | width=200&height=150&smartCropping=true | byte array |
4046
| Extract printed text | language=unk&detectOrientation=true | JSON string |
41-
| Extract handwritten text | handwriting=true | URL, JSON string* |
42-
43-
&ast; Two API calls are required. The first call returns a URL, which is used by the second call to get the text.
44-
45-
To rapidly experiment with the Computer Vision APIs, try the [Open API testing console](https://westcentralus.dev.cognitive.microsoft.com/docs/services/5adf991815e1060e6355ad44/operations/56f91f2e778daf14a499e1fa/console).
47+
| Extract handwritten text | handwriting=true | URL, JSON string |
4648

4749
## Next steps
4850

‎articles/cognitive-services/Speech-Service/faq-stt.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ When the processing is complete, the status will be "Succeeded".
5252

5353
The old and new data sets must be combined in a single .zip (if it is acoustic data) or a .txt file if it is language data. Once adaptation is done the new updated model needs to be de-deployed to obtain a new endpoint
5454

55-
**Question**: What if I need higher concurrency for my deloyed model than what is offered in the portal.
55+
**Question**: What if I need higher concurrency for my deployed model than what is offered in the portal.
5656

5757
**Answer**: You can scale up your model in increments of 20 concurrent requests.
5858

@@ -85,7 +85,7 @@ If the vast majority of the utterances in an acoustic or language data set (for
8585

8686
**Question**: How much acoustic data do I need?
8787

88-
**Answer**: We recommend starting with 30 minutes to one hour of acoustic data
88+
**Answer**: We recommend starting with 30 minutes to one hour of acoustic data.
8989

9090
**Question**: What data should I collect?
9191

@@ -113,19 +113,19 @@ use crowdsourcing or do the transcriptions themselves.
113113

114114
**Answer**: Yes, just select the custom acoustic model in the drop-down menu when you set up the offline test.
115115

116-
**Question**: What is Word Error Rate and how is it computed?
116+
**Question**: What is Word Error Rate (WER) and how is it computed?
117117

118-
**Answer**: Word Error Rate is the evaluation metric for speech recognition. It is counted as the total number of errors,
119-
which includes insertions, deletions, and substitutions, divided by the total number of words in the reference transcription. Mode details [here](https://en.wikipedia.org/wiki/Word_error_rate)
118+
**Answer**: Word Error Rate (WER) is the evaluation metric for speech recognition. It is counted as the total number of errors,
119+
which includes insertions, deletions, and substitutions, divided by the total number of words in the reference transcription. More details [here](https://en.wikipedia.org/wiki/Word_error_rate).
120120

121121
**Question**: How do I determine if the results of an accuracy test is good?
122122

123123
**Answer**: The results show a comparison between the baseline model and the one you customized.
124-
You should aim to beat the baseline model to make the customization worthwhile
124+
You should aim to beat the baseline model to make the customization worthwhile.
125125

126-
**Question**: How do I figure out the WER of the base models, so I can see if there was improvement? 
126+
**Question**: How do I figure out the Word Error Rate of the base models, so I can see if there was improvement? 
127127

128-
**Answer**: The offline test results show accuracy of baseline accuracy of the custom model and the improvement over baseline
128+
**Answer**: The offline test results show accuracy of baseline accuracy of the custom model and the improvement over baseline.
129129

130130
## Creating LM
131131

0 commit comments

Comments
 (0)