Skip to content

Commit c603c60

Browse files
authored
Merge pull request #109872 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 39edd3e + 3806942 commit c603c60

File tree

9 files changed

+91
-16
lines changed

9 files changed

+91
-16
lines changed

articles/active-directory-b2c/custom-policy-localization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
Language customization in Azure Active Directory B2C (Azure AD B2C) allows you to accommodate different languages to suit your customer' needs. Microsoft provides the translations for 36 languages, but you can also provide your own translations for any language. Even if your experience is provided for only a single language, you can customize any text on the pages.
20+
Language customization in Azure Active Directory B2C (Azure AD B2C) allows you to accommodate different languages to suit your customer' needs. Microsoft provides the translations for [36 languages](https://docs.microsoft.com/azure/active-directory-b2c/user-flow-language-customization#supported-languages), but you can also provide your own translations for any language. Even if your experience is provided for only a single language, you can customize any text on the pages.
2121

2222
This article shows you how to support multiple locales or languages in the policy for user journeys. Localization requires three steps: set-up the explicit list of supported languages, provide language-specific strings and collections, and edit the [content definition](contentdefinitions.md) for the page.
2323

articles/application-gateway/self-signed-certificates.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,13 @@ Add-AzApplicationGatewayRequestRoutingRule `
257257
258258
Set-AzApplicationGateway -ApplicationGateway $gw
259259
```
260+
260261
### Verify the application gateway backend health
261262

262263
1. Click the **Backend Health** view of your application gateway to check if the probe is healthy.
263-
1. You should see that the Status is **Healthy** for the HTTPS probe.
264-
![HTTPS probe](media/self-signed-certificates/https-probe.png)
264+
1. You should see that the Status is **Healthy** for the HTTPS probe.
265+
266+
![HTTPS probe](media/self-signed-certificates/https-probe.png)
265267

266268
## Next steps
267269

articles/asc-for-iot/how-to-deploy-edge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Complete each step to complete your IoT Edge deployment for Azure Security Cente
9393
1. On the **Module Twin Settings** tab, add the following configuration:
9494

9595
``` json
96-
"ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration":{}
96+
"ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration"
9797
```
9898

9999
1. Select **Update**.

articles/azure-signalr/signalr-quickstart-rest-api.md

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,17 @@ API | `1.0-preview` | `1.0`
125125
[Broadcast to all](#broadcast) | **✓** | **✓**
126126
[Broadcast to a group](#broadcast-group) | **✓** | **✓**
127127
Broadcast to some groups | **✓** (Deprecated) | `N / A`
128-
[Send to specific users](#send-user) | **✓** | **✓**
128+
[Send to a user](#send-user) | **✓** | **✓**
129129
Send to some users | **✓** (Deprecated) | `N / A`
130130
[Adding a user to a group](#add-user-to-group) | `N / A` | **✓**
131131
[Removing a user from a group](#remove-user-from-group) | `N / A` | **✓**
132+
[Check user existence](#check-user-existence) | `N / A` | **✓**
133+
[Remove a user from all groups](#remove-user-from-all-groups) | `N / A` | **✓**
134+
[Send to a connection](#send-connection) | `N / A` | **✓**
135+
[Add a connection to a group](#add-connection-to-group) | `N / A` | **✓**
136+
[Remove a connection from a group](#remove-connection-from-group) | `N / A` | **✓**
137+
[Close a client connection](#close-connection) | `N / A` | **✓**
138+
[Service Health](#service-health) | `N / A` | **✓**
132139
133140
<a name="broadcast"> </a>
134141
### Broadcast to everyone
@@ -147,7 +154,7 @@ Version | API HTTP Method | Request URL | Request body
147154
`1.0` | `POST` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>` | Same as above
148155
149156
<a name="send-user"> </a>
150-
### Sending to specific users
157+
### Sending to a user
151158
152159
Version | API HTTP Method | Request URL | Request body
153160
--- | --- | --- | ---
@@ -159,14 +166,77 @@ Version | API HTTP Method | Request URL | Request body
159166
160167
Version | API HTTP Method | Request URL
161168
--- | --- | ---
162-
`1.0` | `PUT` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/users/<userid>`
169+
`1.0` | `PUT` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/users/<user-id>`
163170
164171
<a name="remove-user-from-group"> </a>
165172
### Removing a user from a group
166173
167174
Version | API HTTP Method | Request URL
168175
--- | --- | ---
169-
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/users/<userid>`
176+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/users/<user-id>`
177+
178+
<a name="check-user-existence"> </a>
179+
### Check user existence in a group
180+
181+
API Version | API HTTP Method | Request URL
182+
---|---|---
183+
`1.0` | `GET` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/users/<user-id>/groups/<group-name>`
184+
`1.0` | `GET` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/users/<user-id>`
185+
186+
Response Status Code | Description
187+
---|---
188+
`200` | User exists
189+
`404` | User not exists
190+
191+
<a name="remove-user-from-all-groups"> </a>
192+
### Remove a user from all groups
193+
194+
API Version | API HTTP Method | Request URL
195+
---|---|---
196+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/users/<user-id>/groups`
197+
198+
<a name="send-connection"> </a>
199+
### Send message to a connection
200+
201+
API Version | API HTTP Method | Request URL | Request Body
202+
---|---|---|---
203+
`1.0` | `POST` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/connections/<connection-id>` | `{ "target":"<method-name>", "arguments":[ ... ] }`
204+
205+
<a name="add-connection-to-group"> </a>
206+
### Add a connection to a group
207+
208+
API Version | API HTTP Method | Request URL
209+
---|---|---
210+
`1.0` | `PUT` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/connections/<connection-id>`
211+
`1.0` | `PUT` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/connections/<connection-id>/groups/<group-name>`
212+
213+
<a name="remove-connection-from-group"> </a>
214+
### Remove a connection from a group
215+
216+
API Version | API HTTP Method | Request URL
217+
---|---|---
218+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/groups/<group-name>/connections/<connection-id>`
219+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/connections/<connection-id>/groups/<group-name>`
220+
221+
<a name="close-connection"> </a>
222+
### Close a client connection
223+
224+
API Version | API HTTP Method | Request URL
225+
---|---|---
226+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/connections/<connection-id>`
227+
`1.0` | `DELETE` | `https://<instance-name>.service.signalr.net/api/v1/hubs/<hub-name>/connections/<connection-id>?reason=<close-reason>`
228+
229+
<a name="service-health"> </a>
230+
### Service Health
231+
232+
API Version | API HTTP Method | Request URL
233+
---|---|---
234+
`1.0` | `GET` | `https://<instance-name>.service.signalr.net/api/v1/health`
235+
236+
Response Status Code | Description
237+
---|---
238+
`200` | Service Good
239+
`503` | Service Unavailable
170240
171241
[!INCLUDE [Cleanup](includes/signalr-quickstart-cleanup.md)]
172242

articles/data-factory/data-flow-expression-functions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ Returns the first not null value from a set of inputs. All inputs should be of t
115115
* ``coalesce(10, 20) -> 10``
116116
* ``coalesce(toString(null), toString(null), 'dumbo', 'bo', 'go') -> 'dumbo'``
117117
___
118+
### <code>columnNames</code>
119+
<code><b>columnNames(<i>&lt;value1&gt;</i> : string) => array</b></code><br/><br/>
120+
Gets all output columns for a stream. You can pass a optional stream name as the second argument.
121+
* ``columnNames()``
122+
* ``columnNames('DeriveStream')``
123+
___
118124
### <code>compare</code>
119125
<code><b>compare(<i>&lt;value1&gt;</i> : any, <i>&lt;value2&gt;</i> : any) => integer</b></code><br/><br/>
120126
Compares two values of the same type. Returns negative integer if value1 < value2, 0 if value1 == value2, positive value if value1 > value2

articles/event-hubs/get-started-dotnet-standard-send-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ In this quickstart, you use Azure Storage as the checkpoint store. Follow these
202202
static Task ProcessEventHandler(ProcessEventArgs eventArgs)
203203
{
204204
// Write the body of the event to the console window
205-
Console.WriteLine("\tRecevied event: {0}", Encoding.UTF8.GetString(eventArgs.Data.Body.ToArray()));
205+
Console.WriteLine("\tReceived event: {0}", Encoding.UTF8.GetString(eventArgs.Data.Body.ToArray()));
206206
return Task.CompletedTask;
207207
}
208208

articles/iot-accelerators/iot-accelerators-remote-monitoring-sample-walkthrough.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ The ASA jobs deliver the telemetry from the connected devices to Time Series Ins
121121

122122
[Azure Time Series Insights](https://docs.microsoft.com/azure/time-series-insights/) stores the telemetry from the devices connected to the solution accelerator. It also enables visualizing and querying device telemetry in the solution web UI.
123123

124-
> [!NOTE]
125-
> Time Series Insights is not currently available in the Azure China cloud. New Remote Monitoring solution accelerator deployments in the Azure China cloud use Cosmos DB for all storage.
126-
127124
### Configuration microservice
128125

129126
The [configuration microservice](https://github.com/Azure/remote-monitoring-services-dotnet/tree/master/config) provides a RESTful endpoint for CRUD operations on device groups, solution settings, and user-settings in the solution accelerator. It works with the storage adapter microservice to persist the configuration data.

articles/marketplace/marketplace-saas-applications-technical-publishing-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ SaaS applications are available in both Azure Storefronts The following table de
2020

2121
| Storefront option | Listing | Trial/Transact |
2222
| --- | --- | --- |
23-
| AppSource | Yes (Contact Me) | Yes (PowerBI/Dynamics) |
24-
| Azure marketplace | No | Yes (SaaS Apps) |
23+
| AppSource | Yes | Yes |
24+
| Azure marketplace | No | Yes |
2525

2626
**List:** The Listing publishing option consists of a Contact Me offer type and is used when a Trial- or Transaction-level participation is not feasible. The benefit of this approach is that it enables publishers with a solution in-market to immediately begin receiving leads that can be turned into deals to increase your business.
2727
**Trial/Transaction:** The customer has the option to directly buy or request a trial for your solution. Providing a Trial experience increases the engagement level offered to customers and enables customers to explore your solution before buying. With a Trial experience, you will have better chances of promotion in the storefronts, and you should expect more and richer leads from customer engagements. Trials must include free support at least for the duration of the trial period.

articles/storsimple/storsimple-ova-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ Keep in mind the following best practices when provisioning shares or volumes on
157157

158158
* The file sizes relative to the provisioned size of a tiered share can impact the tiering performance. Working with large files could result in a slow tier out. When working with large files, we recommend that the largest file is smaller than 3% of the share size.
159159
* A maximum of 16 volumes/shares can be created on the virtual array. For the size limits of the locally pinned and tiered volumes/shares, always refer to the [StorSimple Virtual Array limits](storsimple-ova-limits.md).
160-
* When creating a volume, factor in the expected data consumption as well as future growth. The volume cannot be expanded later.
161-
* Once the volume has been created, you cannot shrink the size of the volume on StorSimple.
160+
* When creating a volume, factor in the expected data consumption as well as future growth. The volume or share cannot be expanded later.
161+
* Once the volume/share has been created, you cannot shrink the size of the volume/share on StorSimple.
162162
* When writing to a tiered volume on StorSimple, when the volume data reaches a certain threshold (relative to the local space reserved for the volume), the IO is throttled. Continuing to write to this volume slows down the IO significantly. Though you can write to a tiered volume beyond its provisioned capacity (we do not actively stop the user from writing beyond the provisioned capacity), you see an alert notification to the effect that you have oversubscribed. Once you see the alert, it is imperative that you take remedial measures such as delete the volume data (volume expansion is currently not supported).
163163
* For disaster recovery use cases, as the number of allowable shares/volumes is 16 and the maximum number of shares/volumes that can be processed in parallel is also 16, the number of shares/volumes does not have a bearing on your RPO and RTOs.
164164

0 commit comments

Comments
 (0)