Skip to content

Commit 6b160a1

Browse files
authored
Merge pull request #113125 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 f9308b7 + 05c6cfe commit 6b160a1

File tree

16 files changed

+72
-61
lines changed

16 files changed

+72
-61
lines changed

articles/active-directory/users-groups-roles/groups-naming-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can enforce naming policy for groups in two different ways:
3737

3838
### Prefix-suffix naming policy
3939

40-
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings combined is 53 characters.
40+
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings including group name is 53 characters.
4141

4242
Prefixes and suffixes can contain special characters that are supported in group name and group alias. Any characters in the prefix or suffix that are not supported in the group alias are still applied in the group name, but removed from the group alias. Because of this restriction, the prefixes and suffixes applied to the group name might be different from the ones applied to the group alias.
4343

articles/application-gateway/rewrite-http-headers.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 08/08/2019
8+
ms.date: 04/27/2020
99
ms.author: absha
1010
---
1111

@@ -153,6 +153,8 @@ You can evaluate an HTTP request or response header for the presence of a header
153153

154154
- If a response has more than one header with the same name, then rewriting the value of one of those headers will result in dropping the other headers in the response. This can usually happen with Set-Cookie header since you can have more than one Set-Cookie header in a response. One such scenario is when you are using an app service with an application gateway and have configured cookie-based session affinity on the application gateway. In this case the response will contain two Set-Cookie headers: one used by the app service, for example: `Set-Cookie: ARRAffinity=ba127f1caf6ac822b2347cc18bba0364d699ca1ad44d20e0ec01ea80cda2a735;Path=/;HttpOnly;Domain=sitename.azurewebsites.net` and another for application gateway affinity, for example, `Set-Cookie: ApplicationGatewayAffinity=c1a2bd51lfd396387f96bl9cc3d2c516; Path=/`. Rewriting one of the Set-Cookie headers in this scenario can result in removing the other Set-Cookie header from the response.
155155

156+
- Rewrites are not supported when the application gateway is configured to redirect the requests or to show a custom error page.
157+
156158
- Rewriting the Connection, Upgrade, and Host headers isn't currently supported.
157159

158160
- Header names can contain any alphanumeric characters and specific symbols as defined in [RFC 7230](https://tools.ietf.org/html/rfc7230#page-27). We don't currently support the underscore (\_) special character in Header names.

articles/azure-functions/functions-bindings-mobile-apps.md

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ Here's the binding data in the *function.json* file:
4646
{
4747
"bindings": [
4848
{
49-
"name": "myQueueItem",
50-
"queueName": "myqueue-items",
51-
"connection":"",
52-
"type": "queueTrigger",
53-
"direction": "in"
49+
"name": "myQueueItem",
50+
"queueName": "myqueue-items",
51+
"connection": "",
52+
"type": "queueTrigger",
53+
"direction": "in"
5454
},
5555
{
5656
"name": "record",
5757
"type": "mobileTable",
5858
"tableName": "MyTable",
59-
"id" : "{queueTrigger}",
59+
"id": "{queueTrigger}",
6060
"connection": "My_MobileApp_Url",
6161
"apiKey": "My_MobileApp_Key",
6262
"direction": "in"
@@ -91,17 +91,17 @@ Here's the binding data in the *function.json* file:
9191
{
9292
"bindings": [
9393
{
94-
"name": "myQueueItem",
95-
"queueName": "myqueue-items",
96-
"connection":"",
97-
"type": "queueTrigger",
98-
"direction": "in"
94+
"name": "myQueueItem",
95+
"queueName": "myqueue-items",
96+
"connection": "",
97+
"type": "queueTrigger",
98+
"direction": "in"
9999
},
100100
{
101101
"name": "record",
102102
"type": "mobileTable",
103103
"tableName": "MyTable",
104-
"id" : "{queueTrigger}",
104+
"id": "{queueTrigger}",
105105
"connection": "My_MobileApp_Url",
106106
"apiKey": "My_MobileApp_Key",
107107
"direction": "in"
@@ -191,19 +191,19 @@ Here's the binding data in the *function.json* file:
191191
{
192192
"bindings": [
193193
{
194-
"name": "myQueueItem",
195-
"queueName": "myqueue-items",
196-
"connection":"",
197-
"type": "queueTrigger",
198-
"direction": "in"
194+
"name": "myQueueItem",
195+
"queueName": "myqueue-items",
196+
"connection": "",
197+
"type": "queueTrigger",
198+
"direction": "in"
199199
},
200200
{
201-
"name": "record",
202-
"type": "mobileTable",
203-
"tableName": "MyTable",
204-
"connection": "My_MobileApp_Url",
205-
"apiKey": "My_MobileApp_Key",
206-
"direction": "out"
201+
"name": "record",
202+
"type": "mobileTable",
203+
"tableName": "MyTable",
204+
"connection": "My_MobileApp_Url",
205+
"apiKey": "My_MobileApp_Key",
206+
"direction": "out"
207207
}
208208
]
209209
}
@@ -232,19 +232,19 @@ Here's the binding data in the *function.json* file:
232232
{
233233
"bindings": [
234234
{
235-
"name": "myQueueItem",
236-
"queueName": "myqueue-items",
237-
"connection":"",
238-
"type": "queueTrigger",
239-
"direction": "in"
235+
"name": "myQueueItem",
236+
"queueName": "myqueue-items",
237+
"connection": "",
238+
"type": "queueTrigger",
239+
"direction": "in"
240240
},
241241
{
242-
"name": "record",
243-
"type": "mobileTable",
244-
"tableName": "MyTable",
245-
"connection": "My_MobileApp_Url",
246-
"apiKey": "My_MobileApp_Key",
247-
"direction": "out"
242+
"name": "record",
243+
"type": "mobileTable",
244+
"tableName": "MyTable",
245+
"connection": "My_MobileApp_Url",
246+
"apiKey": "My_MobileApp_Key",
247+
"direction": "out"
248248
}
249249
],
250250
"disabled": false

articles/azure-functions/functions-bindings-warmup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ No additional information is provided to a warmup triggered function when it is
236236
## Trigger - limits
237237

238238
* The warmup trigger is only available to apps running on the [Premium plan](./functions-premium-plan.md).
239-
* The warmup trigger is only called during scale up operations, not during restarts or other non-scale startups. You must ensure your logic can load all necessary dependencies without using the warmup trigger. Lazy loading is a good pattern to achieve this.
239+
* The warmup trigger is only called during scale-out operations, not during restarts or other non-scale startups. You must ensure your logic can load all necessary dependencies without using the warmup trigger. Lazy loading is a good pattern to achieve this.
240240
* The warmup trigger cannot be invoked once an instance is already running.
241241
* There can only be one warmup trigger function per function app.
242242

articles/azure-functions/functions-proxies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ Proxies read all strings out of a JSON file, using \ as an escape symbol. Proxie
180180
The requestOverrides object defines changes made to the request when the back-end resource is called. The object is defined by the following properties:
181181

182182
* **backend.request.method**: The HTTP method that's used to call the back-end.
183-
* **backend.request.querystring.\<ParameterName\>**: A query string parameter that can be set for the call to the back-end. Replace *\<ParameterName\>* with the name of the parameter that you want to set. Please note that if the empty string is provided, the parameter is still included on the back-end request.
184-
* **backend.request.headers.\<HeaderName\>**: A header that can be set for the call to the back-end. Replace *\<HeaderName\>* with the name of the header that you want to set. If you provide the empty string, the header is not included on the back-end request.
183+
* **backend.request.querystring.\<ParameterName\>**: A query string parameter that can be set for the call to the back-end. Replace *\<ParameterName\>* with the name of the parameter that you want to set. Note that if an empty string is provided, the parameter is still included on the back-end request.
184+
* **backend.request.headers.\<HeaderName\>**: A header that can be set for the call to the back-end. Replace *\<HeaderName\>* with the name of the header that you want to set. Note that if an empty string is provided, the parameter is still included on the back-end request.
185185

186186
Values can reference application settings and parameters from the original client request.
187187

articles/cognitive-services/Face/includes/quickstarts/face-client-library-go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Your workspace will contain three folders:
108108
Next, install the client library for Go:
109109

110110
```bash
111-
go get -u https://github.com/Azure/azure-sdk-for-go/tree/master/services/cognitiveservices/v1.0/face
111+
go get -u github.com/Azure/azure-sdk-for-go/tree/master/services/cognitiveservices/v1.0/face
112112
```
113113

114114
or if you use dep, within your repo run:

articles/cognitive-services/Speech-Service/quickstarts/text-to-speech/async-synthesis-long-form-audio.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ These modules are used to parse arguments, construct the HTTP request, and call
5454
This code gets a list of available voices that you can use to convert text-to-speech. Add the code to `voice_synthesis_client.py`:
5555

5656
```python
57-
parser = argparse.ArgumentParser(description='Cris client tool to submit voice synthesis requests.')
57+
parser = argparse.ArgumentParser(description='Text-to-speech client tool to submit voice synthesis requests.')
5858
parser.add_argument('--voices', action="store_true", default=False, help='print voice list')
59-
parser.add_argument('-key', action="store", dest="key", required=True, help='the cris subscription key, like ff1eb62d06d34767bda0207acb1da7d7 ')
59+
parser.add_argument('-key', action="store", dest="key", required=True, help='the speech subscription key, like fg1f763i01d94768bda32u7a******** ')
6060
parser.add_argument('-region', action="store", dest="region", required=True, help='the region information, could be centralindia, canadacentral or uksouth')
6161
args = parser.parse_args()
62-
baseAddress = 'https://%s.cris.ai/api/texttospeech/v3.0-beta1/' % args.region
62+
baseAddress = 'https://%s.customvoice.api.speech.microsoft.com/api/texttospeech/v3.0-beta1/' % args.region
6363

6464
def getVoices():
6565
response=requests.get(baseAddress+"voicesynthesis/voices", headers={"Ocp-Apim-Subscription-Key":args.key}, verify=False)

articles/data-factory/concepts-pipeline-execution-triggers.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ Tumbling window triggers are a type of trigger that fires at a periodic time int
322322

323323
For more information about tumbling window triggers and, for examples, see [Create a tumbling window trigger](how-to-create-tumbling-window-trigger.md).
324324

325+
> [!NOTE]
326+
> The tumbling window trigger run *waits for the triggered pipeline run* to finish. Its run state reflects the state of the triggered pipeline run. For example, if a triggered pipeline run is cancelled, the corresponding tumbling window trigger run is marked cancelled. This is different from the "fire and forget" behavior of the schedule trigger, which is marked successful as long as a pipeline run started.
327+
325328
## Event-based trigger
326329

327330
An event-based trigger runs pipelines in response to an event, such as the arrival of a file, or the deletion of a file, in Azure Blob Storage.

articles/data-factory/tumbling-window-trigger-dependency.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ This article provides steps to create a dependency on a tumbling window trigger.
2020

2121
In order to build a dependency chain and make sure that a trigger is executed only after the successful execution of another trigger in the data factory, use this advanced feature to create a tumbling window dependency.
2222

23+
For a demonstration on how to create dependent pipelines in your Azure Data Factory using tumbling window trigger, watch the following video:
24+
25+
> [!VIDEO https://channel9.msdn.com/Shows/Azure-Friday/Create-dependent-pipelines-in-your-Azure-Data-Factory/player]
26+
2327
## Create a dependency in the Data Factory UI
2428

2529
To create dependency on a trigger, select **Trigger > Advanced > New**, and then choose the trigger to depend on with the appropriate offset and size. Select **Finish** and publish the data factory changes for the dependencies to take effect.
@@ -77,7 +81,7 @@ The following table provides the list of attributes needed to define a Tumbling
7781
| size | Size of the dependency tumbling window. Provide a positive timespan value. This property is optional. | Timespan<br/>(hh:mm:ss) | No |
7882

7983
> [!NOTE]
80-
> A tumbling window trigger can depend on a maximum of two other triggers.
84+
> A tumbling window trigger can depend on a maximum of five other triggers.
8185
8286
## Tumbling window self-dependency properties
8387

@@ -143,10 +147,6 @@ A daily job with no gaps in the output streams of the job:
143147

144148
![Self-dependency example](media/tumbling-window-trigger-dependency/tumbling-window-dependency06.png "Self-dependency example")
145149

146-
For a demonstration on how to create dependent pipelines in your Azure Data Factory using tumbling window trigger, watch the following video:
147-
148-
> [!VIDEO https://channel9.msdn.com/Shows/Azure-Friday/Create-dependent-pipelines-in-your-Azure-Data-Factory/player]
149-
150150
## Monitor dependencies
151151

152152
You can monitor the dependency chain and the corresponding windows from the trigger run monitoring page. Navigate to **Monitoring > Trigger Runs**. Under the actions column, you can rerun the trigger or view its dependencies.

articles/iot-edge/how-to-ci-cd.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In this section, you create a new build pipeline. Configure the pipeline to run
4949
>
5050
>For more information, see [Create a build pipeline](https://docs.microsoft.com/azure/devops/pipelines/create-first-pipeline).
5151
52-
1. Sign into your Azure DevOps organization (**https:\//dev.azure.com/{your organization}/**) and open the project that contains your IoT Edge solution repository.
52+
1. Sign in to your Azure DevOps organization (**https:\//dev.azure.com/{your organization}/**) and open the project that contains your IoT Edge solution repository.
5353

5454
For this article, we created a repository called **IoTEdgeRepo**. That repository contains **IoTEdgeSolution** which has the code for a module named **filtermodule**.
5555

@@ -95,6 +95,13 @@ In this section, you create a new build pipeline. Configure the pipeline to run
9595
* **Default platform**: Select the appropriate platform for your modules based on your target IoT Edge device.
9696
* **Output variables**: The output variables include a reference name that you can use to configure the file path where your deployment.json file will be generated. Set the reference name to something memorable like **edge**.
9797

98+
99+
These configurations use the image repository and tag that are defined in the `module.json` file to name and tag the module image. **Build module images** also helps replace the variables with the exact value you define in the `module.json` file. In Visual Studio or Visual Studio Code, you are specifying the actual value in a `.env` file. In Azure Pipelines, you set the value on the **Pipeline Variables** tab. Select the **Variables** tab and configure the name and value as following:
100+
101+
* **ACR_ADDRESS**: Your Azure Container Registry address.
102+
103+
If you have other variables in your project, you can specify the name and value on this tab. **Build module images** recognizes only variables that are in `${VARIABLE}` format. Make sure you use this format in your `**/module.json` files.
104+
98105
7. Select the second **Azure IoT Edge** task to edit it. This task pushes all module images to the container registry that you select.
99106

100107
* **Display name**: The display name is automatically updated when the action field changes.

0 commit comments

Comments
 (0)