Skip to content

Commit 7301222

Browse files
authored
Merge pull request #285948 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2a0b852 + eaac4b5 commit 7301222

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

articles/azure-functions/dedicated-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Using an App Service plan, you can manually scale out by adding more VM instance
4141
4242
## App Service Environments
4343

44-
Running in an App Service Environment (ASE) lets you fully isolate your functions and take advantage of higher numbers of instances than an App Service Plan. To get started, see [Introduction to the App Service Environments](../app-service/environment/intro.md).
44+
Running in an App Service Environment (ASE) lets you fully isolate your functions and take advantage of higher numbers of instances than an App Service Plan. To get started, see [Introduction to the App Service Environments](../app-service/environment/overview.md).
4545

4646
If you just want to run your function app in a virtual network, you can do this using the [Premium plan](functions-premium-plan.md). To learn more, see [Establish Azure Functions private site access](functions-create-private-site-access.md).
4747

articles/azure-functions/recover-python-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ There are several common build issues that can cause Python functions to not be
315315

316316
* The agent pool must be running on Ubuntu to guarantee that packages are restored correctly from the build step. Make sure your deployment template requires an Ubuntu environment for build and deployment.
317317

318-
* When the function app isn't at the root of the source repo, make sure that the `pip install` step references the correct location in which to create the `.python-packages` folder. Keep in mind that this location is case sensitive, such as in this command example:
318+
* When the function app isn't at the root of the source repo, make sure that the `pip install` step references the correct location in which to create the `.python_packages` folder. Keep in mind that this location is case sensitive, such as in this command example:
319319

320320
```
321321
pip install --target="./FunctionApp1/.python_packages/lib/site-packages" -r ./FunctionApp1/requirements.txt

articles/communication-services/concepts/voice-video-calling/call-recording.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ An Event Grid notification `Microsoft.Communication.RecordingFileStatusUpdated`
125125
"sampleRate": <number>, // sample rate for audio recording
126126
"bitRate": <number>, // bitrate for audio recording
127127
"channels": <number> // number of audio channels in output recording
128+
},
129+
"videoConfiguration": {
130+
"longerSideLength": <number>, // longerSideLength for video recording
131+
"shorterSideLength": <number>, // shorterSideLength for video recording
132+
"frameRate": <number>, // frameRate for video recording
133+
"bitRate": <number> // bitrate for video recording
128134
}
129135
},
130136
"participants": [

articles/migrate/vmware/how-to-set-up-appliance-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ After you create the appliance, check if the appliance can connect to Azure Migr
3333
To set up the appliance by using an OVA template, you'll complete these steps, which are described in detail in this section:
3434

3535
> [!NOTE]
36-
> OVA templates are not available for soverign clouds.
36+
> OVA templates are not available for sovereign clouds.
3737
3838
> [!NOTE]
3939
> Do not clone or create a VM template out of an appliance deployed using OVA template. This scenario is unsupported and may result in deployment failures within the Migrate Service.

includes/functions-install-core-tools.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,20 @@ The following steps use [APT](https://wiki.debian.org/Apt) to install Core Tools
5151
##### Ubuntu
5252

5353
```bash
54-
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list'
54+
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-$(lsb_release -cs 2>/dev/null)-prod $(lsb_release -cs 2>/dev/null) main" > /etc/apt/sources.list.d/dotnetdev.list'
5555
```
5656

5757
##### Debian
5858

5959
```bash
60-
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/debian/$(lsb_release -rs | cut -d'.' -f 1)/prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list'
60+
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/debian/$(lsb_release -rs 2>/dev/null | cut -d'.' -f 1)/prod $(lsb_release -cs 2>/dev/null) main" > /etc/apt/sources.list.d/dotnetdev.list'
6161
```
6262

6363
1. Check the `/etc/apt/sources.list.d/dotnetdev.list` file for one of the appropriate Linux version strings in the following table:
6464

6565
| Linux distribution | Version |
6666
| -------------------------- | ---------- |
67+
| Debian 12 | `bookworm` |
6768
| Debian 11 | `bullseye` |
6869
| Debian 10 | `buster` |
6970
| Debian 9 | `stretch` |

0 commit comments

Comments
 (0)