Skip to content

Commit cdadc6b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-build-iot-central
2 parents fcca69a + e3cd443 commit cdadc6b

File tree

242 files changed

+3288
-3567
lines changed

Some content is hidden

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

242 files changed

+3288
-3567
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@
233233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
234234
"branch": "master"
235235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
236241
{
237242
"path_to_root": "iot-samples-c",
238243
"url": "https://github.com/Azure/azure-iot-sdk-c",

.openpublishing.redirection.json

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5451,6 +5451,16 @@
54515451
"redirect_url": "/azure/event-grid/template-samples",
54525452
"redirect_document_id": false
54535453
},
5454+
{
5455+
"source_path": "articles/event-grid/premium-basic-tiers.md",
5456+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5457+
"redirect_document_id": false
5458+
},
5459+
{
5460+
"source_path": "articles/event-grid/update-tier.md",
5461+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5462+
"redirect_document_id": false
5463+
},
54545464
{
54555465
"source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
54565466
"redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -20700,9 +20710,59 @@
2070020710
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2070120711
"redirect_document_id": false
2070220712
},
20713+
{
20714+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-process-parts.md",
20715+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20716+
"redirect_document_id": false
20717+
},
20718+
{
20719+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-prerequisites.md",
20720+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20721+
"redirect_document_id": false
20722+
},
20723+
{
20724+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-offer.md",
20725+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20726+
"redirect_document_id": false
20727+
},
20728+
{
20729+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-settings-tab.md",
20730+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20731+
"redirect_document_id": false
20732+
},
20733+
{
20734+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-skus-tab.md",
20735+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20736+
"redirect_document_id": false
20737+
},
20738+
{
20739+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-marketplace-tab.md",
20740+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20741+
"redirect_document_id": false
20742+
},
20743+
{
20744+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-support-tab.md",
20745+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20746+
"redirect_document_id": false
20747+
},
20748+
{
20749+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-publish-offer.md",
20750+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20751+
"redirect_document_id": false
20752+
},
20753+
{
20754+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-update-existing-offer.md",
20755+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20756+
"redirect_document_id": false
20757+
},
20758+
{
20759+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-technical-assets.md",
20760+
"redirect_url": "/azure/marketplace/partner-center-portal/create-iot-edge-module-asset",
20761+
"redirect_document_id": false
20762+
},
2070320763
{
2070420764
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20705-
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20765+
"redirect_url": "/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
2070620766
"redirect_document_id": false
2070720767
},
2070820768
{
@@ -28220,6 +28280,16 @@
2822028280
"redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
2822128281
"redirect_document_id": true
2822228282
},
28283+
{
28284+
"source_path": "articles/storage/common/storage-designing-ha-apps-with-ragrs.md",
28285+
"redirect_url": "/azure/storage/common/geo-redundant-design",
28286+
"redirect_document_id": true
28287+
},
28288+
{
28289+
"source_path": "articles/storage/blobs/storage-simulate-failure-ragrs-account-app.md",
28290+
"redirect_url": "/azure/storage/common/simulate-primary-region-failure",
28291+
"redirect_document_id": false
28292+
},
2822328293
{
2822428294
"source_path": "articles/storage/common/storage-redundancy-lrs.md",
2822528295
"redirect_url": "/azure/storage/common/storage-redundancy",
@@ -49014,6 +49084,51 @@
4901449084
"source_path": "articles/azure-cache-for-redis/cache-howto-manage-redis-cache-powershell.md",
4901549085
"redirect_url": "/azure/azure-cache-for-redis/cache-how-to-manage-redis-cache-powershell",
4901649086
"redirect_document_id": false
49087+
},
49088+
{
49089+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-prerequisites.md",
49090+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49091+
"redirect_document_id": false
49092+
},
49093+
{
49094+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-create-offer.md",
49095+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49096+
"redirect_document_id": false
49097+
},
49098+
{
49099+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-offer-settings-tab.md",
49100+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49101+
"redirect_document_id": false
49102+
},
49103+
{
49104+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-technical-info-tab.md",
49105+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49106+
"redirect_document_id": false
49107+
},
49108+
{
49109+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-storefront-details-tab.md",
49110+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49111+
"redirect_document_id": false
49112+
},
49113+
{
49114+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-contacts-tab.md",
49115+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49116+
"redirect_document_id": false
49117+
},
49118+
{
49119+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-create-technical-assets.md",
49120+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49121+
"redirect_document_id": false
49122+
},
49123+
{
49124+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-publish-offer.md",
49125+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49126+
"redirect_document_id": false
49127+
},
49128+
{
49129+
"source_path": "articles/marketplace/cloud-partner-portal/power-bi/cpp-update-existing-offer.md",
49130+
"redirect_url": "/azure/marketplace/partner-center-portal/create-power-bi-app-offer",
49131+
"redirect_document_id": false
4901749132
},
4901849133
{
4901949134
"source_path": "articles/machine-learning/algorithm-module-reference/import-from-azure-blob-storage.md",
@@ -52208,6 +52323,12 @@
5220852323
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
5220952324
"redirect_url": "/articles/load-balancer/concepts",
5221052325
"redirect_document_id": false
52326+
},
52327+
{
52328+
"source_path": "articles/virtual-machines/troubleshooting/linux-virtual-machine-cannot-start-fstab-errors.md",
52329+
"redirect_url": "/articles/virtual-machines/troubleshooting",
52330+
"redirect_document_id": false
5221152331
}
52332+
5221252333
]
5221352334
}

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,8 +1198,8 @@ The SCIM spec does not define a SCIM-specific scheme for authentication and auth
11981198
[!NOTE] It's not recommended to leave the token field blank in the Azure AD provisioning configuration custom app UI. The token generated is primarily available for testing purposes.
11991199

12001200
**OAuth authorization code grant flow:** The provisioning service supports the [authorization code grant](https://tools.ietf.org/html/rfc6749#page-24). After submitting your request for publishing your app in the gallery, our team will work with you to collect the following information:
1201-
* Authorization URL: A URL by the client to obtain authorization from the resource owner via user-agent redirection. The user is redirected to this URL to authorize access.
1202-
* Token exchange URL: A URL by the client to exchange an authorization grant for an access token, typically with client authentication.
1201+
* Authorization URL: A URL by the client to obtain authorization from the resource owner via user-agent redirection. The user is redirected to this URL to authorize access. Note that this URL is currently not configurable per tenant.
1202+
* Token exchange URL: A URL by the client to exchange an authorization grant for an access token, typically with client authentication. Note that this URL is currently not configurable per tenant.
12031203
* Client ID: The authorization server issues the registered client a client identifier, which is a unique string representing the registration information provided by the client. The client identifier is not a secret; it is exposed to the resource owner and **must not** be used alone for client authentication.
12041204
* Client secret: The client secret is a secret generated by the authorization server. It should be a unique value known only to the authorization server.
12051205

articles/active-directory/develop/v2-oauth2-auth-code-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ At a high level, the entire authentication flow for a native/mobile application
3131

3232
## Request an authorization code
3333

34-
The authorization code flow begins with the client directing the user to the `/authorize` endpoint. In this request, the client requests the `openid`, `offline_access`, and `https://graph.microsoft.com/mail.read ` permissions from from the user. Some permissions are admin-restricted, for example writing data to an organization's directory by using `Directory.ReadWrite.All`. If your application requests access to one of these permissions from an organizational user, the user receives an error message that says they're not authorized to consent to your app's permissions. To request access to admin-restricted scopes, you should request them directly from a company administrator. For more information, read [Admin-restricted permissions](v2-permissions-and-consent.md#admin-restricted-permissions).
34+
The authorization code flow begins with the client directing the user to the `/authorize` endpoint. In this request, the client requests the `openid`, `offline_access`, and `https://graph.microsoft.com/mail.read ` permissions from the user. Some permissions are admin-restricted, for example writing data to an organization's directory by using `Directory.ReadWrite.All`. If your application requests access to one of these permissions from an organizational user, the user receives an error message that says they're not authorized to consent to your app's permissions. To request access to admin-restricted scopes, you should request them directly from a company administrator. For more information, read [Admin-restricted permissions](v2-permissions-and-consent.md#admin-restricted-permissions).
3535

3636
```
3737
// Line breaks for legibility only

articles/active-directory/hybrid/how-to-connect-fed-group-claims.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ author: billmath
1818

1919
Azure Active Directory can provide a users group membership information in tokens for use within applications. Two main patterns are supported:
2020

21-
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22-
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
21+
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22+
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
2323

2424
> [!IMPORTANT]
2525
> There are a number of caveats to note for this functionality:
-184 Bytes
Loading
-26.4 KB
Loading
-30.6 KB
Loading

articles/active-directory/saas-apps/google-apps-tutorial.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.subservice: saas-app-tutorial
1313
ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.topic: tutorial
16-
ms.date: 02/14/2020
16+
ms.date: 05/06/2020
1717
ms.author: jeedes
1818

1919
ms.collection: M365-identity-device-management
@@ -137,8 +137,8 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
137137

138138
| |
139139
|--|
140-
| `https://google.com` |
141-
| `https://google.com/a/<yourdomain.com>` |
140+
| `https://www.google.com` |
141+
| `https://www.google.com/a/<yourdomain.com>` |
142142

143143

144144
1. On the **Basic SAML Configuration** section, if you want to configure for the **Google Cloud Platform** perform the following steps:
@@ -158,8 +158,8 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
158158

159159
| |
160160
|--|
161-
| `https://google.com` |
162-
| `https://google.com/a/<yourdomain.com>` |
161+
| `https://www.google.com` |
162+
| `https://www.google.com/a/<yourdomain.com>` |
163163

164164
> [!NOTE]
165165
> These values are not real. Update these values with the actual Sign-On URL and Identifier. Google Cloud (G Suite) Connector doesn't provide Entity ID/Identifier value on Single Sign On configuration so when you uncheck the **domain specific issuer** option the Identifier value will be `google.com`. If you check the **domain specific issuer** option it will be `google.com/a/<yourdomainname.com>`. To check/uncheck the **domain specific issuer** option you need to go to the **Configure Google Cloud (G Suite) Connector SSO** section which is explained later in the tutorial. For more information contact [Google Cloud (G Suite) Connector Client support team](https://www.google.com/contact/).

articles/aks/faq.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Label: ```"admissions.enforcer/disabled": "true"``` or Annotation: ```"admission
113113

114114
## Is Azure Key Vault integrated with AKS?
115115

116-
AKS isn't currently natively integrated with Azure Key Vault. However, the [Azure Key Vault FlexVolume for Kubernetes project][keyvault-flexvolume] enables direct integration from Kubernetes pods to Key Vault secrets.
116+
AKS isn't currently natively integrated with Azure Key Vault. However, the [Azure Key Vault provider for CSI Secrets Store][csi-driver] enables direct integration from Kubernetes pods to Key Vault secrets.
117117

118118
## Can I run Windows Server containers on AKS?
119119

@@ -210,7 +210,6 @@ No AKS is a managed service, and manipulation of the IaaS resources is not suppo
210210
[aks-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service
211211
[auto-scaler]: https://github.com/kubernetes/autoscaler
212212
[cordon-drain]: https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/
213-
[hexadite]: https://github.com/Hexadite/acs-keyvault-agent
214213
[admission-controllers]: https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/
215-
[keyvault-flexvolume]: https://github.com/Azure/kubernetes-keyvault-flexvol
216214
[private-clusters-github-issue]: https://github.com/Azure/AKS/issues/948
215+
[csi-driver]: https://github.com/Azure/secrets-store-csi-driver-provider-azure

0 commit comments

Comments
 (0)