Skip to content

Commit 7c31f59

Browse files
authored
Merge pull request #98853 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 fb1a399 + 8592518 commit 7c31f59

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

articles/azure-signalr/signalr-concept-messages-and-connections.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ Messages larger than 2 KB are counted as multiple messages of 2 KB each. The mes
3232

3333
For example, imagine that you have three clients and one application server. One client sends a 4-KB message to let the server broadcast to all clients. The message count is eight: one message from the service to the application server and three messages from the service to the clients. Each message is counted as two 2-KB messages.
3434

35-
The message count shown in the Azure portal will remain 0 until it accumulates to be more than 100.
36-
3735
## How connections are counted
3836

3937
There are server connections and client connections with Azure SignalR Service. By default, each application server starts with five initial connections per hub, and each client has one client connection.
@@ -48,7 +46,7 @@ During the lifetime of the application server, the service and the application s
4846

4947
## How inbound/outbound traffic is counted
5048

51-
The distinction between inbound traffic and outbound traffic is based on the perspective of Azure SignalR Service. Traffic is calculated in bytes. Like the message count, traffic also has a sampling rate. The inbound/outbound chart in the Azure portal is updated every 100 KB per hub.
49+
The distinction between inbound traffic and outbound traffic is based on the perspective of Azure SignalR Service. Traffic is calculated in bytes.
5250

5351
## Related resources
5452

articles/cosmos-db/sql-query-linq-to-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The LINQ provider included with the SQL .NET SDK supports the following operator
5959
- **OrderBy** and **OrderByDescending**: Translate to ORDER BY with ASC or DESC.
6060
- **Count**, **Sum**, **Min**, **Max**, and **Average** operators for aggregation, and their async equivalents **CountAsync**, **SumAsync**, **MinAsync**, **MaxAsync**, and **AverageAsync**.
6161
- **CompareTo**: Translates to range comparisons. Commonly used for strings, since they’re not comparable in .NET.
62-
- **Take**: Translates to SQL TOP for limiting results from a query.
62+
- **Skip** and **Take**: Translates to SQL OFFSET and LIMIT for limiting results from a query and doing pagination.
6363
- **Math functions**: Supports translation from .NET `Abs`, `Acos`, `Asin`, `Atan`, `Ceiling`, `Cos`, `Exp`, `Floor`, `Log`, `Log10`, `Pow`, `Round`, `Sign`, `Sin`, `Sqrt`, `Tan`, and `Truncate` to the equivalent SQL built-in functions.
6464
- **String functions**: Supports translation from .NET `Concat`, `Contains`, `Count`, `EndsWith`,`IndexOf`, `Replace`, `Reverse`, `StartsWith`, `SubString`, `ToLower`, `ToUpper`, `TrimEnd`, and `TrimStart` to the equivalent SQL built-in functions.
6565
- **Array functions**: Supports translation from .NET `Concat`, `Contains`, and `Count` to the equivalent SQL built-in functions.

articles/storage/blobs/data-lake-storage-use-power-bi.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Before you begin this tutorial, you must have the following:
2222
> * An Azure subscription. See [Get Azure free trial](https://azure.microsoft.com/pricing/free-trial/).
2323
> * A storage account that has a hierarchical namespace. Follow [these](data-lake-storage-quickstart-create-account.md) instructions to create one.
2424
> This article assumes that you've created an account named `myadlsg2`.
25+
> * You are granted one of the following roles for the storage account: **Blob Data Reader**, **Blob Data Contributor**, or **Blob Data Owner**.
2526
> * A sample data file named `Drivers.txt` located in your storage account.
2627
> You can download this sample from [Azure Data Lake Git Repository](https://github.com/Azure/usql/tree/master/Examples/Samples/Data/AmbulanceData/Drivers.txt), and then upload that file to your storage account.
2728
> * **Power BI Desktop**. You can download this from [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=45331).

articles/storage/common/storage-ref-azcopy-sync.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ Sync a single blob:
101101

102102
```azcopy
103103
azcopy sync "https://[account].blob.core.windows.net/[container]/[path/to/blob]?[SAS]" "https://[account].blob.core.windows.net/[container]/[path/to/blob]"
104+
```
104105

105106
Sync a virtual directory:
106107

@@ -133,6 +134,8 @@ azcopy sync "https://[account].file.core.windows.net/[share]/[path/to/dir]?[SAS]
133134

134135
**--exclude-attributes** string (Windows only) Exclude files whose attributes match the attribute list. For example: A;S;R
135136

137+
**--exclude-path** string Exclude these paths when copying. This option does not support wildcard characters (*). Checks relative path prefix(For example: myFolder;myFolder/subDirName/file.pdf). When used in combination with account traversal, paths do not include the container name.
138+
136139
**--exclude-pattern** string Exclude files where the name matches the pattern list. For example: *.jpg;*.pdf;exactName
137140

138141
**-h, --help** help for sync

articles/virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,22 +188,16 @@ When you are using your own DNS servers, Azure provides the ability to specify m
188188

189189
> [!NOTE]
190190
> Network connection properties, such as DNS server IPs, should not be edited directly within VMs. This is because they might get erased during service heal when the virtual network adaptor gets replaced. This applies to both Windows and Linux VMs.
191-
>
192-
>
193191
194192
When you are using the Azure Resource Manager deployment model, you can specify DNS servers for a virtual network and a network interface. For details, see [Manage a virtual network](manage-virtual-network.md) and [Manage a network interface](virtual-network-network-interface.md).
195193

196194
> [!NOTE]
197195
> If you opt for custom DNS server for your virtual network, you must specify at least one DNS server IP address; otherwise, virtual network will ignore the configuration and use Azure-provided DNS instead.
198-
>
199-
>
200196
201197
When you are using the classic deployment model, you can specify DNS servers for the virtual network in the Azure portal or the [Network Configuration file](https://msdn.microsoft.com/library/azure/jj157100). For cloud services, you can specify DNS servers via the [Service Configuration file](https://msdn.microsoft.com/library/azure/ee758710) or by using PowerShell, with [New-AzureVM](/powershell/module/servicemanagement/azure/new-azurevm).
202198

203199
> [!NOTE]
204-
> If you change the DNS settings for a virtual network or virtual machine that is already deployed, for the new DNS settings to take effect, you must perform a DHCP lease renewal on all affected VMs in the virtual network. For VMs running the Windows OS, you can do this by typing `ipconfig /renew` directly in the VM. The steps vary depending on the OS. See the relevant documentation for your OS type.
205-
>
206-
>
200+
> If you change the DNS settings for a virtual network or virtual machine that is already deployed, for the new DNS settings to take effect, you must perform a DHCP lease renewal on all affected VMs in the virtual network. For VMs running the Windows OS, you can do this by typing `ipconfig /renew` directly in the VM. The steps vary depending on the OS. See the relevant documentation for your OS type.
207201
208202
## Next steps
209203

0 commit comments

Comments
 (0)