Skip to content

Commit b318948

Browse files
authored
Merge pull request #42183 from MicrosoftDocs/FromPublicRepo
From public repo
2 parents fd43593 + c79a1af commit b318948

File tree

5 files changed

+23
-18
lines changed

5 files changed

+23
-18
lines changed

articles/aks/ingress.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,11 @@ IP="51.145.155.210"
6565
# Name to associate with public IP address
6666
DNSNAME="demo-aks-ingress"
6767
68-
# Get resource group and public ip name
69-
RESOURCEGROUP=$(az network public-ip list --query "[?ipAddress!=null]|[?contains(ipAddress, '$IP')].[resourceGroup]" --output tsv)
70-
PUBLICIPNAME=$(az network public-ip list --query "[?ipAddress!=null]|[?contains(ipAddress, '$IP')].[name]" --output tsv)
68+
# Get the resource-id of the public ip
69+
PUBLICIPID=$(az network public-ip list --query "[?ipAddress!=null]|[?contains(ipAddress, '$IP')].[id]" --output tsv)
7170
7271
# Update public ip address with dns name
73-
az network public-ip update --resource-group $RESOURCEGROUP --name $PUBLICIPNAME --dns-name $DNSNAME
72+
az network public-ip update --ids $PUBLICIPID --dns-name $DNSNAME
7473
```
7574

7675
The ingress controller should now be accessible through the FQDN.

articles/aks/kubernetes-dashboard.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This command creates a proxy between your development system and the Kubernetes
3434

3535
## Run an application
3636

37-
In the Kubernetes dashboard, click the **Create** button in the upper right window. Give the deployment the name `nginx` and enter `nginx:latest` for the images name. Under **Service**, select **External** and enter `80` for both the port and target port.
37+
In the Kubernetes dashboard, click the **Create** button in the upper right window. Give the deployment the name `nginx` and enter `nginx:latest` for the container image name. Under **Service**, select **External** and enter `80` for both the port and target port.
3838

3939
When ready, click **Deploy** to create the deployment.
4040

@@ -80,4 +80,4 @@ For more information about the Kubernetes dashboard, see the Kubernetes document
8080

8181
<!-- LINKS - internal -->
8282
[aks-quickstart]: ./kubernetes-walkthrough.md
83-
[install-azure-cli]: /cli/azure/install-azure-cli
83+
[install-azure-cli]: /cli/azure/install-azure-cli

articles/application-gateway/application-gateway-faq.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Frequently asked questions for Azure Application Gateway
33
description: This page provides answers to frequently asked questions about Azure Application Gateway
44
services: application-gateway
@@ -81,6 +81,11 @@ No, Application Gateway does not support static public IP addresses, but it does
8181

8282
Only one public IP address is supported on an Application Gateway.
8383

84+
**Q. How big should I make my subnet for Application Gateway?**
85+
86+
Application Gateway consumes one private IP address per instance, plus another private IP address if a private frontend IP configuration is configured. Also, Azure reserves the first four and last IP address in each subnet for internal usage.
87+
For example, if Application Gateway is set to three instances and no private frontend IP, then a /29 subnet size or greater is needed. In this case, Application Gateway uses three IP addresses. If you have three instances and an IP address for the private frontend IP configuration, then a /28 subnet size or greater is needed as four IP addresses are required.
88+
8489
**Q. Does Application Gateway support x-forwarded-for headers?**
8590

8691
Yes, Application Gateway inserts x-forwarded-for, x-forwarded-proto, and x-forwarded-port headers into the request forwarded to the backend. The format for x-forwarded-for header is a comma-separated list of IP:Port. The valid values for x-forwarded-proto are http or https. X-forwarded-port specifies the port at which the request reached at the Application Gateway.

articles/cognitive-services/Speech-Service/samples.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ You can download compressed archives of the Windows and Linux samples and tutori
1818

1919
- [Download samples for Windows](https://aka.ms/csspeech/winsample)
2020
- [Download samples for Linux](https://aka.ms/csspeech/linuxsample)
21+
- [Download sample for Android (only for the Speech Devices SDK)](https://github.com/Azure-Samples/Cognitive-Services-Speech-Devices-SDK)
2122

2223
All samples are provided under the MIT License.
2324

articles/iot-accelerators/iot-accelerators-permissions.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 11/10/2017
1010
ms.author: dobett
1111
---
1212

13-
# Permissions on the azureiotsuite.com site
13+
# Permissions on the azureiotsolutions.com site
1414

1515
## What happens when you sign in
1616

@@ -26,7 +26,7 @@ The following sections describe the roles that control access to the solution ac
2626

2727
## AAD roles
2828

29-
The AAD roles control the ability provision solution accelerators and manage users in a solution accelerator.
29+
The AAD roles control the ability to provision solution accelerators, to manage users and some Azure services in a solution accelerator.
3030

3131
You can find more information about administrator roles in AAD in [Assigning administrator roles in Azure AD][lnk-aad-admin]. The current article focuses on the **Global Administrator** and the **User** directory roles as used by the solution accelerators.
3232

@@ -35,13 +35,13 @@ You can find more information about administrator roles in AAD in [Assigning adm
3535
There can be many global administrators per AAD tenant:
3636

3737
* When you create an AAD tenant, you are by default the global administrator of that tenant.
38-
* The global administrator can provision a basic and standard solution accelerators.
38+
* The global administrator can provision a basic and standard solution accelerators (a basic deployment uses a single Azure Virtual Machine).
3939

4040
### Domain user
4141

4242
There can be many domain users per AAD tenant:
4343

44-
* A domain user can provision a basic solution accelerator through the [azureiotsuite.com][lnk-azureiotsuite] site.
44+
* A domain user can provision a basic solution accelerator through the [azureiotsolutions.com][lnk-azureiotsolutions] site.
4545
* A domain user can create a basic solution accelerator using the CLI.
4646

4747
### Guest User
@@ -55,7 +55,7 @@ For more information about users and roles in AAD, see the following resources:
5555

5656
## Azure subscription administrator roles
5757

58-
The Azure admin roles control the ability to map an Azure subscription to an AD tenant.
58+
The Azure admin roles control the ability to map an Azure subscription to an AAD tenant.
5959

6060
Find out more about the Azure admin roles in the article [How to add or change Azure Co-Administrator, Service Administrator, and Account Administrator][lnk-admin-roles].
6161

@@ -65,9 +65,9 @@ Find out more about the Azure admin roles in the article [How to add or change A
6565

6666
See [To add an existing subscription to your Azure AD directory](../active-directory/active-directory-how-subscriptions-associated-directory.md#to-associate-an-existing-subscription-to-your-azure-ad-directory)
6767

68-
### I want to change a Service Administrator or Co-Administrator when logged in with an organisational account
68+
### I want to change a Service Administrator or Co-Administrator when logged in with an organizational account
6969

70-
See the support article [Changing Service Administrator and Co-Administrator when logged in with an organisational account][lnk-service-admins].
70+
See the support article [Changing Service Administrator and Co-Administrator when logged in with an organizational account][lnk-service-admins].
7171

7272
### Why am I seeing this error? "Your account does not have the proper permissions to create a solution. Please check with your account administrator or try with a different account."
7373

@@ -76,7 +76,7 @@ Look at the following diagram for guidance:
7676
![][img-flowchart]
7777

7878
> [!NOTE]
79-
> If you continue to see the error after validating you are a global administrator on the AAD tenant and a co-administrator on the subscription, have your account administrator remove the user and reassign necessary permissions in this order. First, add the user as a global administrator and then add user as a co-administrator on the Azure subscription. If issues persist, contact [Help & Support][lnk-help-support].
79+
> If you continue to see the error after validating you are a global administrator of the AAD tenant and a co-administrator of the subscription, have your account administrator remove the user and reassign necessary permissions in this order. First, add the user as a global administrator and then add user as a co-administrator of the Azure subscription. If issues persist, contact [Help & Support][lnk-help-support].
8080
8181
### Why am I seeing this error when I have an Azure subscription? "An Azure subscription is required to create pre-configured solutions. You can create a free trial account in just a couple of minutes."
8282

@@ -87,15 +87,15 @@ To continue learning about IoT solution accelerators, see how you can [customize
8787

8888
[img-flowchart]: media/iot-accelerators-permissions/flowchart.png
8989

90-
[lnk-azureiotsuite]: https://www.azureiotsuite.com/
90+
[lnk-azureiotsolutions]: https://www.azureiotsolutions.com
9191
[lnk-rm-github-repo]: https://github.com/Azure/azure-iot-remote-monitoring
9292
[lnk-pm-github-repo]: https://github.com/Azure/azure-iot-predictive-maintenance
9393
[lnk-cf-github-repo]: https://github.com/Azure/azure-iot-connected-factory
9494
[lnk-aad-admin]: ../active-directory/active-directory-assign-admin-roles-azure-portal.md
95-
[lnk-portal]: https://portal.azure.com/
95+
[lnk-portal]: https://portal.azure.com
9696
[lnk-create-edit-users]: ../active-directory/active-directory-users-profile-azure-portal.md
9797
[lnk-assign-app-roles]: ../active-directory/active-directory-coreapps-assign-user-azure-portal.md
98-
[lnk-service-admins]: https://azure.microsoft.com/support/changing-service-admin-and-co-admin/
98+
[lnk-service-admins]: https://azure.microsoft.com/support/changing-service-admin-and-co-admin
9999
[lnk-admin-roles]: ../billing/billing-add-change-azure-subscription-administrator.md
100100
[lnk-resource-cs]: https://github.com/Azure/azure-iot-remote-monitoring/blob/master/DeviceAdministration/Web/Security/RolePermissions.cs
101101
[lnk-help-support]: https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade

0 commit comments

Comments
 (0)