Skip to content

Commit 1cb026b

Browse files
authored
Merge pull request #182939 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 7139cd2 + 738a91c commit 1cb026b

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

articles/azure-functions/functions-run-local.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ Version 1.x of the Core Tools isn't supported on macOS. Use version 2.x or a lat
149149
5. Install the Core Tools package:
150150
151151
```bash
152-
sudo apt-get update
153152
sudo apt-get install azure-functions-core-tools-4
154153
```
155154
@@ -160,7 +159,6 @@ Version 1.x of the Core Tools isn't supported on macOS. Use version 2.x or a lat
160159
5. Install the Core Tools package:
161160
162161
```bash
163-
sudo apt-get update
164162
sudo apt-get install azure-functions-core-tools-3
165163
```
166164
@@ -171,7 +169,6 @@ Version 1.x of the Core Tools isn't supported on macOS. Use version 2.x or a lat
171169
5. Install the Core Tools package:
172170
173171
```bash
174-
sudo apt-get update
175172
sudo apt-get install azure-functions-core-tools-2
176173
```
177174

articles/azure-resource-manager/bicep/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you get an error during installation, see [Troubleshoot Bicep installation](i
3131

3232
## Deployment environment
3333

34-
After setting up your development environment, you need to install Bicep CLI for your deployment environment. Depends on whether you want to use [Azure CLI](#azure-cli) or [Azure PowerShell](#azure-powershell), the steps to set up a local deployment environment are different. Those steps are shown in the next sections.
34+
After setting up your development environment, you need to install Bicep CLI for your deployment environment. Depending on whether you want to use [Azure CLI](#azure-cli) or [Azure PowerShell](#azure-powershell), the steps to set up a local deployment environment are different. Those steps are shown in the next sections.
3535

3636
To deploy Bicep files from an Azure Pipeline, see [Integrate Bicep with Azure Pipelines](add-template-to-azure-pipelines.md). To deploy Bicep files through GitHub Actions, see [Deploy Bicep files by using GitHub Actions](deploy-github-actions.md).
3737

@@ -49,7 +49,7 @@ To verify your current version, run:
4949
az --version
5050
```
5151

52-
You now have everything you need to [deploy](deploy-cli.md) and [decompile](decompile.md) Bicep files. You have everything because Azure CLI automatically installs the Bicep CLI when a command is executed that needs it.
52+
You now have everything you need to [deploy](deploy-cli.md) and [decompile](decompile.md) Bicep files. Azure CLI will automatically install the Bicep CLI when a command is executed that needs it.
5353

5454
To manually start the Bicep CLI installation, use:
5555

articles/cognitive-services/personalizer/concept-multi-slot-personalization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Whenever you display products and/or content to users, you may want to show more
3838
* **Search results or lists**: If your application search functionality, where you provide results as lists or tiles, you can use multi-slot personalization to choose which items to highlight at the top considering more metadata than traditional rankers.
3939
* **Dynamic channels and playlists**: Multi-slot personalization can help determine a short sequence for a list of videos or songs to play next in a dynamic channel.
4040

41-
Multi-slot personalization allows you to declare the "slots" in the user interface that actions need to be chosen for. It also allows you to provide more information about the slots, that Personalizer can use to improve product placement - such as is this a big box or a small box? does it display a caption or only a feature? is it in a footer or a sidebar?.
41+
Multi-slot personalization allows you to declare the "slots" in the user interface that actions need to be chosen for. It also allows you to provide more information about the slots so that Personalizer can use to improve product placement - such as is this a big box or a small box? Does it display a caption or only a feature? Is it in a footer or a sidebar?
4242

4343

4444
## How to use Multi-slot personalization

articles/data-share/supported-data-stores.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ In this article, you'll learn about the rich set of Azure data stores that Azure
1717

1818
The following table explains the data stores that Azure Data Share supports.
1919

20-
| Data store | Sharing based on full snapshots | Sharing based on incremental snapshots | Sharing in place
21-
|:--- |:--- |:--- |:--- |:--- |:--- |:--- |
20+
| Data store | Sharing based on full snapshots | Sharing based on incremental snapshots | Sharing in place |
21+
|:--- |:--- |:--- |:--- |
2222
| Azure Blob Storage ||| |
2323
| Azure Data Lake Storage Gen1 ||| |
2424
| Azure Data Lake Storage Gen2 ||||
@@ -50,6 +50,8 @@ When file systems, containers, or folders are shared in snapshot-based sharing,
5050

5151
An incremental snapshot is based on the last-modified time of the files. Existing files that have the same name as files in the received data are overwritten in a snapshot. Files that are deleted from the source aren't deleted on the target.
5252

53+
If a snapshot is interrupted and fails, for example, due to a cancel action, networking issue, or disaster, the next incremental snapshot copies files that have a last-modified time greater than the time of the last successful snapshot.
54+
5355
For more information, see [Share and receive data from Azure Blob Storage and Azure Data Lake Storage](how-to-share-from-storage.md).
5456

5557
## Share from a SQL-based source
@@ -59,6 +61,8 @@ Data consumers can choose to accept the data into Azure Data Lake Storage Gen2 o
5961

6062
When consumers accept data into Azure Data Lake Storage Gen2 or Azure Blob Storage, full snapshots overwrite the contents of the target file if the file already exists. When data is received into a table and the target table doesn't already exist, Azure Data Share creates an SQL table by using the source schema. If a target table already exists and it has the same name, it's dropped and overwritten with the latest full snapshot. Incremental snapshots aren't currently supported.
6163

64+
If a snapshot is interrupted and fails, for example, due to a cancel action, networking issue, or disaster, the next snapshot copies the entire table or view again.
65+
6266
For more information, see [Share and receive data from Azure SQL Database and Azure Synapse Analytics](how-to-share-from-sql.md).
6367

6468
## Share from Data Explorer

articles/virtual-desktop/language-packs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need the following things to customize your Windows 10 Enterprise multi-sess
3838
- [Windows 10, version 1903 or 1909 Inbox Apps ISO](https://software-download.microsoft.com/download/pr/18362.1.190318-1202.19h1_release_amd64fre_InboxApps.iso)
3939
- [Windows 10, version 2004 Inbox Apps ISO](https://software-download.microsoft.com/download/pr/19041.1.191206-1406.vb_release_amd64fre_InboxApps.iso)
4040
- [Windows 10, version 20H2 Inbox Apps ISO](https://software-download.microsoft.com/download/pr/19041.508.200905-1327.vb_release_svc_prod1_amd64fre_InboxApps.iso)
41-
- [Windows 10, version 21H1 Inbox Apps ISO](https://software-download.microsoft.com/download/sg/19041.928.210407-2138.vb_release_svc_prod1_amd64fre_InboxApps.iso)
41+
- [Windows 10, version 21H1 or 21H2 Inbox Apps ISO](https://software-download.microsoft.com/download/sg/19041.928.210407-2138.vb_release_svc_prod1_amd64fre_InboxApps.iso)
4242

4343
- If you use Local Experience Pack (LXP) ISO files to localize your images, you will also need to download the appropriate LXP ISO for the best language experience
4444
- If you're using Windows 10, version 1903 or 1909:

articles/virtual-desktop/overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ To learn more about URLs you must unblock to use the clients, see the [Safe URL
117117

118118
Azure Virtual Desktop follows the [Microsoft Lifecycle Policy](/lifecycle/) and supports the following x64 operating system images:
119119

120-
* Windows 11 Enterprise multi-session (Preview)
121-
* Windows 11 Enterprise (Preview)
120+
* Windows 11 Enterprise multi-session
121+
* Windows 11 Enterprise
122122
* Windows 10 Enterprise multi-session
123123
* Windows 10 Enterprise
124124
* Windows 7 Enterprise
@@ -133,8 +133,8 @@ Available automation and deployment options depend on which OS and version you c
133133

134134
|Operating system|Azure Image Gallery|Manual VM deployment|Azure Resource Manager template integration|Provision host pools on Azure Marketplace|
135135
|--------------------------------------|:------:|:------:|:------:|:------:|
136-
|Windows 11 Enterprise multi-session (Preview)|Yes|Yes|Yes|Yes|
137-
|Windows 11 Enterprise (Preview)|Yes|Yes|Yes|Yes|
136+
|Windows 11 Enterprise multi-session|Yes|Yes|Yes|Yes|
137+
|Windows 11 Enterprise|Yes|Yes|Yes|Yes|
138138
|Windows 10 Enterprise multi-session, version 1909 and later|Yes|Yes|Yes|Yes|
139139
|Windows 10 Enterprise, version 1909 and later|Yes|Yes|Yes|Yes|
140140
|Windows 7 Enterprise|Yes|Yes|No|No|

0 commit comments

Comments
 (0)