Skip to content

Commit 9405aad

Browse files
authored
Merge pull request #97971 from MicrosoftDocs/master
12/05 AM Publish
2 parents c38a1f5 + d72f773 commit 9405aad

File tree

198 files changed

+945
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+945
-417
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12442,6 +12442,11 @@
1244212442
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1244312443
"redirect_document_id": false
1244412444
},
12445+
{
12446+
"source_path": "articles/cosmos-db/create-firewall-cli.md",
12447+
"redirect_url": "/azure/cosmos-db/scripts/cli/common/ipfirewall",
12448+
"redirect_document_id": false
12449+
},
1244512450
{
1244612451
"source_path": "articles/iot-suite/iot-suite-v1-connecting-devices-linux.md",
1244712452
"redirect_url": "https://docs.microsoft.com/previous-versions/azure/iot-suite/iot-suite-v1-connecting-devices-linux",

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
12
# Microsoft Azure Documentation
23

34
Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
45

56
## Getting Started
67

7-
Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
8+
Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
89

910
### Prerequisites
1011

articles/active-directory/b2b/add-users-administrator.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Make sure your organization's external collaboration settings are configured suc
3535
To add B2B collaboration users to the directory, follow these steps:
3636

3737
1. Sign in to the [Azure portal](https://portal.azure.com) as a user who is assigned a limited administrator directory role or the Guest Inviter role.
38-
2. In the navigation pane, select **Azure Active Directory**.
38+
2. Search for and select **Azure Active Directory** from any page.
3939
3. Under **Manage**, select **Users**.
4040
4. Select **New guest user**.
4141

42-
![Shows where New guest user is in the UI](./media/add-users-administrator/NewGuestUser-Directory.png)
42+
![Shows where New guest user is in the UI](./media/add-users-administrator/new-guest-user-in-all-users.png)
4343

4444
> [!NOTE]
4545
> The **New guest user** option is also available on the **Organizational relationships** page. In **Azure Active Directory**, under **Manage**, select **Organizational relationships**.
@@ -66,7 +66,7 @@ After you send the invitation, the user account is automatically added to the di
6666
If you need to manually add B2B collaboration users to a group, follow these steps:
6767

6868
1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
69-
2. In the navigation pane, select **Azure Active Directory**.
69+
2. Search for and select **Azure Active Directory** from any page.
7070
3. Under **Manage**, select **Groups**.
7171
4. Select a group (or click **New group** to create a new one). It's a good idea to include in the group description that the group contains B2B guest users.
7272
5. Select **Members**.
@@ -83,7 +83,7 @@ You can also use dynamic groups with Azure AD B2B collaboration. For more inform
8383
To add B2B collaboration users to an application, follow these steps:
8484

8585
1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
86-
2. In the navigation pane, select **Azure Active Directory**.
86+
2. Search for and select **Azure Active Directory** from any page.
8787
3. Under **Manage**, select **Enterprise applications** > **All applications**.
8888
4. Select the application to which you want to add guest users.
8989
5. On the application's dashboard, select **Total Users** to open the **Users and groups** pane.
@@ -111,13 +111,13 @@ To add B2B collaboration users to an application, follow these steps:
111111
If a guest user has not yet redeemed their invitation, you can resend the invitation email.
112112

113113
1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
114-
2. In the navigation pane, select **Azure Active Directory**.
114+
2. Search for and select **Azure Active Directory** from any page.
115115
3. Under **Manage**, select **Users**.
116116
5. Select the user account.
117117
6. Under **Manage**, select **Profile**.
118118
7. If the user has not yet accepted the invitation, a **Resend invitation** option is available. Select this button to resend.
119119

120-
![Resend invitation option in the user profile](./media/add-users-administrator/Resend-Invitation.png)
120+
![Resend invitation option in the user profile](./media/add-users-administrator/b2b-user-resend-invitation.png)
121121

122122
> [!NOTE]
123123
> If you resend an invitation that originally directed the user to a specific app, understand that the link in the new invitation takes the user to the top-level Access Panel instead.

articles/active-directory/b2b/licensing-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ With Azure Active Directory (Azure AD) business-to-business (B2B) collaboration,
2323
> [!NOTE]
2424
> Refer to [Azure Active Directory pricing](https://azure.microsoft.com/pricing/details/active-directory/) for details about Azure AD pricing and B2B collaboration features.
2525
26-
B2B guest user licensing is automatically calculated and reported based on the 1:5 ratio. Currently, it’s not possible to assign B2B guest user licenses directly to guest users.
26+
B2B guest user licensing is automatically calculated and reported based on the 1:5 ratio.
2727

2828
Additionally, guest users can use free Azure AD features with no additional licensing requirements. Guest users have access to free Azure AD features even if you don’t have any paid Azure AD licenses.
2929

50.5 KB
Loading
83.5 KB
Loading
46.8 KB
Loading

articles/active-directory/b2b/what-is-b2b.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ As an administrator, you can easily add guest users to your organization in the
5858
- The guest user immediately receives a customizable invitation that lets them sign in to their Access Panel.
5959
- Guest users in the directory can be assigned to apps or groups.
6060

61-
![Screenshot showing the New Guest User invitation entry page](media/what-is-b2b/adding-b2b-users-admin.png)
61+
![Screenshot showing the New Guest User invitation entry page](media/what-is-b2b/add-a-b2b-user-to-azure-portal.png)
6262

6363
## Let application and group owners manage their own guest users
6464

articles/active-directory/cloud-provisioning/tutorial-existing-forest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: daveba
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 12/02/2019
10+
ms.date: 12/05/2019
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -40,7 +40,7 @@ In this scenario, there is an existing forest synced using Azure AD Connect sync
4040
| --- | --- |
4141
| **80** | Downloads the certificate revocation lists (CRLs) while validating the SSL certificate |
4242
| **443** | Handles all outbound communication with the service |
43-
| **8080** (optional) | Agents report their status every 10 minutes over port 8080, if port 443 is unavailable. This status is displayed on the Azure AD portal. Port 8080 is _not_ used for user sign-ins. |
43+
| **8080** (optional) | Agents report their status every 10 minutes over port 8080, if port 443 is unavailable. This status is displayed on the Azure AD portal. |
4444
4545
If your firewall enforces rules according to the originating users, open these ports for traffic from Windows services that run as a network service.
4646
- If your firewall or proxy allows you to specify safe suffixes, then add connections to **\*.msappproxy.net** and **\*.servicebus.windows.net**. If not, allow access to the [Azure datacenter IP ranges](https://www.microsoft.com/download/details.aspx?id=41653), which are updated weekly.

articles/active-directory/cloud-provisioning/tutorial-pilot-aadc-aadccp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: daveba
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 12/03/2019
10+
ms.date: 12/05/2019
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management

0 commit comments

Comments
 (0)