Skip to content

Commit 174f9f2

Browse files
authored
Merge pull request #42267 from MicrosoftDocs/FromPublicRepo
From public repo
2 parents 4138fd7 + d30f5f1 commit 174f9f2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

articles/cdn/cdn-custom-ssl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Tutorial - Configure HTTPS on an Azure CDN custom domain | Microsoft Docs
33
description: In this tutorial, you learn how to enable and disable HTTPS on your Azure CDN endpoint custom domain.
44
services: cdn
@@ -122,7 +122,7 @@ Grant Azure CDN permission to access the certificates (secrets) in your Azure Ke
122122

123123
![Access policy settings](./media/cdn-custom-ssl/cdn-access-policy-settings.png)
124124

125-
2. In **Select principal**, search, and select **Azure CDN**.
125+
2. In **Select principal**, search for **205478c0-bd83-4e1b-a9d6-db63a3e1e1c8**, and select **Microsoft.Azure.Cdn**.
126126

127127
3. In **Secret permissions**, select **Get** to allow CDN to perform these permissions to get and list the certificates.
128128

articles/media-services/previous/media-services-manage-live-encoder-enabled-channels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ The following table shows how Channel states map to the billing mode.
331331
* You are only billed when your Channel is in the **Running** state. For more information, refer to [this](media-services-manage-live-encoder-enabled-channels.md#states) section.
332332
* Currently, the max recommended duration of a live event is 8 hours. Please contact [email protected] if you need to run a Channel for longer periods of time.
333333
* Make sure to have the streaming endpoint from which you want to stream content in the **Running** state.
334-
* The encoding preset uses the notion of "max frame rate" of 30 fps. So if the input is 60fps/59.97i, the input frames are dropped/de-interlaced to 30/29.97 fps. If the input is 50fps/50i, the input frames are dropped/de-interlaced to 25 fps. If the input is 25 fps, output remains at 25 fps.
334+
* The encoding preset uses the notion of "max frame rate" of 30 fps. So if the input is 60fps/59.94i, the input frames are dropped/de-interlaced to 30/29.97 fps. If the input is 50fps/50i, the input frames are dropped/de-interlaced to 25 fps. If the input is 25 fps, output remains at 25 fps.
335335
* Don't forget to STOP YOUR CHANNELS when done. If you don't, billing will continue.
336336

337337
## Known Issues

articles/virtual-machines/linux/suse-create-upload-vhd.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your
9595
ResourceDisk.SwapSizeMB=2048 ## NOTE: set this to whatever you need it to be.
9696
15. Run the following commands to deprovision the virtual machine and prepare it for provisioning on Azure:
9797

98-
# sudo waagent -force -deprovision
99-
# export HISTSIZE=0
100-
# logout
98+
# sudo waagent -force -deprovision
99+
# export HISTSIZE=0
100+
# logout
101101
16. Click **Action -> Shut Down** in Hyper-V Manager. Your Linux VHD is now ready to be uploaded to Azure.
102102

103103
- - -
@@ -130,7 +130,7 @@ As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your
130130
# sudo zypper update
131131
5. Install the Azure Linux Agent.
132132

133-
# sudo zypper install WALinuxAgent
133+
# sudo zypper install WALinuxAgent
134134
6. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this, open "/boot/grub/menu.lst" in a text editor and ensure that the default kernel includes the following parameters:
135135

136136
console=ttyS0 earlyprintk=ttyS0 rootdelay=300
@@ -157,9 +157,9 @@ As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your
157157
ResourceDisk.SwapSizeMB=2048 ## NOTE: set this to whatever you need it to be.
158158
11. Run the following commands to deprovision the virtual machine and prepare it for provisioning on Azure:
159159

160-
# sudo waagent -force -deprovision
161-
# export HISTSIZE=0
162-
# logout
160+
# sudo waagent -force -deprovision
161+
# export HISTSIZE=0
162+
# logout
163163
12. Ensure the Azure Linux Agent runs at startup:
164164

165165
# sudo systemctl enable waagent.service

0 commit comments

Comments
 (0)