Skip to content

Commit f6909d4

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-role-definitions
2 parents 789e257 + 96953d3 commit f6909d4

File tree

14 files changed

+67
-25
lines changed

14 files changed

+67
-25
lines changed

articles/active-directory-domain-services/network-considerations.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ The following network security group rules are required for Azure AD DS to provi
105105
| 443 | TCP | AzureActiveDirectoryDomainServices | Any | Allow | Yes | Synchronization with your Azure AD tenant. |
106106
| 3389 | TCP | CorpNetSaw | Any | Allow | Yes | Management of your domain. |
107107
| 5986 | TCP | AzureActiveDirectoryDomainServices | Any | Allow | Yes | Management of your domain. |
108-
| 636 | TCP | Any | Any | Allow | No | Only enabled when you configure secure LDAP (LDAPS). |
109108

110109
> [!WARNING]
111110
> Don't manually edit these network resources and configurations. When you associate a misconfigured network security group or a user defined route table with the subnet in which Azure AD DS is deployed, you may disrupt Microsoft's ability to service and manage the domain. Synchronization between your Azure AD tenant and your Azure AD DS managed domain is also disrupted.
112111
>
112+
> If you use secure LDAP, you can add the required TCP port 636 rule to allow external traffic if needed. Adding this rule doesn't place your network security group rules in an unsupported state. For more information, see [Lock down secure LDAP access over the internet](tutorial-configure-ldaps.md#lock-down-secure-ldap-access-over-the-internet)
113+
>
113114
> Default rules for *AllowVnetInBound*, *AllowAzureLoadBalancerInBound*, *DenyAllInBound*, *AllowVnetOutBound*, *AllowInternetOutBound*, and *DenyAllOutBound* also exist for the network security group. Don't edit or delete these default rules.
114115
>
115116
> The Azure SLA doesn't apply to deployments where an improperly configured network security group and/or user defined route tables have been applied that blocks Azure AD DS from updating and managing your domain.

articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ For more information about the API server and other cluster components, see [Kub
3737
API server authorized IP ranges only work for new AKS clusters. Create a cluster using the [az aks create][az-aks-create] and specify the *--api-server-authorized-ip-ranges* parameter to provide a list of authorized IP address ranges. These IP address ranges are usually address ranges used by your on-premises networks or public IPs. When you specify a CIDR range, start with the first IP address in the range. For example, *137.117.106.90/29* is a valid range, but make sure you specify the first IP address in the range, such as *137.117.106.88/29*.
3838

3939
> [!IMPORTANT]
40-
> By default, your cluster uses the [Standard SKU load balancer][standard-sku-lb] which you can use to configure the outbound gateway. When you enable API server authorized IP ranges during cluster creation, the public IP for your cluster is also allowed by default in addition to the ranges you specify. If you specify *""* or no value for *--api-server-authorized-ip-ranges*, API server authorized IP ranges will be disabled.
40+
> By default, your cluster uses the [Standard SKU load balancer][standard-sku-lb] which you can use to configure the outbound gateway. When you enable API server authorized IP ranges during cluster creation, the public IP for your cluster is also allowed by default in addition to the ranges you specify. If you specify *""* or no value for *--api-server-authorized-ip-ranges*, API server authorized IP ranges will be disabled. Note that if you're using PowerShell, use *--api-server-authorized-ip-ranges=""* (with equals sign) to avoid any parsing issues.
4141
4242
The following example creates a single-node cluster named *myAKSCluster* in the resource group named *myResourceGroup* with API server authorized IP ranges enabled. The IP address ranges allowed are *73.140.245.0/24*:
4343

articles/cosmos-db/managed-identity-based-authentication.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ In this scenario, the function app will read the temperature of the aquarium, th
6161

6262
* **Role**: Select **DocumentDB Account Contributor**
6363
* **Assign access to**: Under the **Select system-assigned managed identity** subsection, select **Function App**.
64-
* **Select**: The pane will be populated with all the function apps in your subscription that have a **Managed System Identity**. In this case, select the **SummaryService** function app:
64+
* **Select**: The pane will be populated with all the function apps in your subscription that have a **Managed System Identity**. In this case, select the **FishTankTemperatureService** function app:
6565

6666
![Screenshot showing the Add role assignment pane populated with examples.](./media/managed-identity-based-authentication/cosmos-db-iam-tab-add-role-pane-filled.png)
6767

@@ -79,7 +79,7 @@ This sample uses the [List Keys API](https://docs.microsoft.com/rest/api/cosmos-
7979
The List Keys API returns the `DatabaseAccountListKeysResult` object. This type isn't defined in the C# libraries. The following code shows the implementation of this class:
8080

8181
```csharp
82-
namespace SummarizationService
82+
namespace Monitor
8383
{
8484
public class DatabaseAccountListKeysResult
8585
{
@@ -123,7 +123,7 @@ using Microsoft.Extensions.Logging;
123123

124124
namespace Monitor
125125
{
126-
public static class TemperatureMonitor
126+
public static class FishTankTemperatureService
127127
{
128128
private static string subscriptionId =
129129
"<azure subscription id>";
@@ -138,7 +138,7 @@ namespace Monitor
138138
private static string containerName =
139139
"<container to store the temperature in>";
140140

141-
[FunctionName("TemperatureMonitor")]
141+
[FunctionName("FishTankTemperatureService")]
142142
public static async Task Run([TimerTrigger("0 * * * * *")]TimerInfo myTimer, ILogger log)
143143
{
144144
log.LogInformation($"Starting temperature monitoring: {DateTime.Now}");
4.07 KB
Loading
5.27 KB
Loading
5.41 KB
Loading
6.88 KB
Loading

articles/cost-management-billing/manage/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
href: billing-troubleshoot-azure-payment-issues.md
108108
- name: Declined card
109109
href: troubleshoot-declined-card.md
110-
- name: Sign up issues
110+
- name: Issues in signing up a new account
111111
href: troubleshoot-azure-sign-up.md
112112
- name: Subscription sign-in issues
113113
href: troubleshoot-sign-in-issue.md

articles/cost-management-billing/manage/troubleshoot-azure-sign-up.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
---
2-
title: Troubleshoot Azure sign-up
3-
description: Resolving an issue when trying to sign-up for a new account in the Microsoft Azure portal account center.
2+
title: Unable to sign up a new Azure account
3+
description: Resolving an issue when trying to sign up for a new account in the Microsoft Azure portal account center.
4+
services: cost-management-billing
45
author: v-miegge
5-
ms.reviewer: dcscontentpm
6+
manager: dcscontentpm
67
tags: billing
78
ms.service: cost-management-billing
89
ms.topic: conceptual
910
ms.date: 02/12/2020
1011
ms.author: v-miegge
1112
---
1213

13-
# Troubleshoot Azure sign-up
14+
# Troubleshoot issues when you sign up a new account in Azure portal or Azure account center
1415

15-
You may experience an issue when you try to sign-up for a new account in the Microsoft Azure portal or Azure account center. Before you troubleshoot the issue, first verify the following:
16+
You may experience an issue when you try to sign up for a new account in the Microsoft Azure portal or Azure account center. Before you troubleshoot the issue, first verify the following:
1617

1718
- The information that you provided for your Azure account profile (including contact email address, street address, and telephone number) is correct.
1819
- The credit card information is correct.
19-
- You dont already have a Microsoft account that has the same information.
20+
- You don't already have a Microsoft account that has the same information.
2021

2122
## Resolutions
2223

23-
To resolve any errors, select the issue that you experience when you try to sign-up for Azure.
24+
To resolve any errors, select the issue that you experience when you try to sign up for Azure.
2425

2526
### Error: *We cannot proceed with sign-up due to an issue with your account. Please contact billing support.*
2627

@@ -32,9 +33,9 @@ To resolve the issue, follow these steps:
3233

3334
3. Make sure that all address fields are completed and valid.
3435

35-
4. When you sign-up for the Azure subscription, make sure that the billing address for the credit card registration matches your bank records.
36+
4. When you sign up for the Azure subscription, make sure that the billing address for the credit card registration matches your bank records.
3637

37-
If you continue to receive the error message, try to sign-up by using a different browser.
38+
If you continue to receive the error message, try to sign up by using a different browser.
3839

3940
### Progress bar hangs in *Identity verification by card* section.
4041

@@ -79,7 +80,7 @@ Have you used an Azure subscription in the past? The Azure Terms of Use agreemen
7980

8081
### I saw a charge on my Free Trial account
8182

82-
You may see a small verification hold on your credit card account after you sign-up. This is removed within three to five days. If you are worried about managing costs, read more about [preventing unexpected costs](getting-started.md).
83+
You may see a small verification hold on your credit card account after you sign up. This is removed within three to five days. If you are worried about managing costs, read more about [preventing unexpected costs](getting-started.md).
8384

8485
### Can't activate Azure benefit plan like MSDN, BizSpark, BizSparkPlus, or MPN
8586

@@ -105,13 +106,13 @@ To resolve this issue, double-check whether the following items are true:
105106

106107
- The information that you provided for your Azure account profile (including contact email address, street address, and telephone number) is correct.
107108
- The credit card information is correct.
108-
- You dont already have a Microsoft account that uses the same information.
109+
- You don't already have a Microsoft account that uses the same information.
109110

110111
### Error: *Your current account type is not supported*
111112

112-
This issue can occur if the account is registered in an [unmanaged Azure AD directory](../../active-directory/users-groups-roles/directory-self-service-signup.md), and it is not in your organizations Azure AD directory.
113+
This issue can occur if the account is registered in an [unmanaged Azure AD directory](../../active-directory/users-groups-roles/directory-self-service-signup.md), and it is not in your organization's Azure AD directory.
113114

114-
To resolve this issue, sign-up the Azure account by using another account, or take over the unmanaged AD directory. For more information, see [Take over an unmanaged directory as administrator in Azure Active Directory](../../active-directory/users-groups-roles/domains-admin-takeover.md).
115+
To resolve this issue, sign up the Azure account by using another account, or take over the unmanaged AD directory. For more information, see [Take over an unmanaged directory as administrator in Azure Active Directory](../../active-directory/users-groups-roles/domains-admin-takeover.md).
115116

116117
## Additional help resources
117118

articles/cost-management-billing/manage/troubleshoot-sign-in-issue.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
title: Troubleshoot Azure subscription sign-in issues
33
description: Helps to resolve the issues in which you can't sign-in the Azure portal or Azure account center.
4+
services: cost-management-billing
45
author: v-miegge
5-
ms.reviewer: dcscontentpm
6+
manager: dcscontentpm
67
tags: billing
78
ms.service: cost-management-billing
89
ms.topic: conceptual
@@ -31,12 +32,12 @@ This issue can occur if you use more than one user account in an internet browse
3132
To resolve the issue, try one of the following methods:
3233

3334
- Clear the cache and delete Internet cookies. In Internet Explorer, click **Tools** > **Internet Options** > **Delete**. Make sure that the check boxes for temporary files, cookies, password, and browsing history are selected, and then click Delete.
34-
- Reset the Internet Explorer settings to revert any personal settings that youve made. Click **Tools** > **Internet Options** > **Advanced** > select the **Delete personal settings** box > **Reset**.
35+
- Reset the Internet Explorer settings to revert any personal settings that you've made. Click **Tools** > **Internet Options** > **Advanced** > select the **Delete personal settings** box > **Reset**.
3536
- Use the private browsing mode for your browser. For Internet Explorer: Click **Tools** > **Safety** > **InPrivate Browsing**, and then browse and sign-in to the [Azure portal](https://portal.azure.com/) or [Azure account center](https://account.azure.com/Subscriptions).
3637

3738
### I can sign-in but I see *No subscriptions found*
3839

39-
This problem occurs if you selected at the wrong directory, or if your account doesnt have sufficient permissions.
40+
This problem occurs if you selected at the wrong directory, or if your account doesn't have sufficient permissions.
4041

4142
**Scenario 1:** Error message is received in the [Azure portal](https://portal.azure.com/)
4243

0 commit comments

Comments
 (0)