Skip to content

Commit b9883f0

Browse files
authored
Merge branch 'release-cred-free-java' into java-cred-free
2 parents eb347f7 + 3048002 commit b9883f0

File tree

2,486 files changed

+49405
-31072
lines changed

Some content is hidden

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

2,486 files changed

+49405
-31072
lines changed

.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,12 @@
458458
"branch": "main",
459459
"branch_mapping": {}
460460
},
461+
{
462+
"path_to_root": "azureml-examples-v2samplesreorg",
463+
"url": "https://github.com/azure/azureml-examples",
464+
"branch": "v2samplesreorg",
465+
"branch_mapping": {}
466+
},
461467
{
462468
"path_to_root": "azureml-examples-sdk-preview",
463469
"url": "https://github.com/azure/azureml-examples",
@@ -674,6 +680,12 @@
674680
"branch": "main",
675681
"branch_mapping": {}
676682
},
683+
{
684+
"path_to_root": "cosmos-db-sql-api-javascript-samples",
685+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-javascript-samples",
686+
"branch": "main",
687+
"branch_mapping": {}
688+
},
677689
{
678690
"path_to_root": "azure-cosmos-db-python-getting-started",
679691
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10880,6 +10880,11 @@
1088010880
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1088110881
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1088210882
"redirect_document_id": false
10883+
},
10884+
{
10885+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
10886+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
10887+
"redirect_document_id": false
1088310888
}
1088410889

1088510890
]

.openpublishing.redirection.azure-monitor.json

Lines changed: 4920 additions & 0 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 9261 additions & 14125 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.virtual-desktop.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/virtual-desktop/shortpath-public.md",
3030
"redirect_url": "/azure/virtual-desktop/rdp-shortpath",
3131
"redirect_document_id": false
32-
}
32+
},
33+
{
34+
"source_path_from_root": "/articles/virtual-machines/windows/using-visual-studio-vm.md",
35+
"redirect_url": "/visualstudio/install/using-visual-studio-vm",
36+
"redirect_document_id": false
37+
}
3338
]
3439
}

CONTRIBUTING.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to our [contributor guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to our [contributor guide](https://learn.microsoft.com/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

@@ -22,9 +22,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2222

2323
### Editing in GitHub
2424

25-
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-documentation) in our contributor guide.
25+
Follow the guidance for [Quick edits to existing documents](https://learn.microsoft.com/contribute/#quick-edits-to-documentation) in our contributor guide.
2626

2727
### Pull requests
2828

29-
Review the guidance for [pull requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) and the contribution workflow in our contributor guide.
30-
29+
Review the guidance for [pull requests](https://learn.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) and the contribution workflow in our contributor guide.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ You've decided to contribute, that's great! To contribute to the documentation,
1212

1313
#### Github
1414

15-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
15+
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1616

1717
#### Tools
1818

19-
To install necessary tools, follow the instructions for [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
19+
To install necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
2020

2121
## License
2222

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Content-type: application/json
144144
| -------------------------------------------------- | ----------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
145145
| version | String | Yes | The version of your API. |
146146
| action | String | Yes | Value must be `Continue`. |
147-
| \<builtInUserAttribute> | \<attribute-type> | No | They can returned in the token if selected as an **Application claim**. |
147+
| \<builtInUserAttribute> | \<attribute-type> | No | They can be returned in the token if selected as an **Application claim**. |
148148
| \<extension\_{extensions-app-id}\_CustomAttribute> | \<attribute-type> | No | The claim does not need to contain `_<extensions-app-id>_`, it is *optional*. They can returned in the token if selected as an **Application claim**. |
149149

150150
::: zone-end

articles/active-directory-b2c/enable-authentication-python-web-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Add the following templates under the templates folder. These templates extend t
241241
242242
{% block metadata %}
243243
{% if config.get("B2C_RESET_PASSWORD_AUTHORITY") and "AADB2C90118" in result.get("error_description") %}
244-
<!-- See also https://docs.microsoft.com/en-us/azure/active-directory-b2c/active-directory-b2c-reference-policies#linking-user-flows -->
244+
<!-- See also https://learn.microsoft.com/azure/active-directory-b2c/active-directory-b2c-reference-policies#linking-user-flows -->
245245
<meta http-equiv="refresh"
246246
content='0;{{_build_auth_code_flow(authority=config["B2C_RESET_PASSWORD_AUTHORITY"])["auth_uri"]}}'>
247247
{% endif %}

articles/active-directory-b2c/enable-authentication-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ To sign in the user, do the following:
243243
/**
244244
* For the purpose of setting an active account for UI update, we want to consider only the auth response resulting
245245
* from SUSI flow. "tfp" claim in the id token tells us the policy (NOTE: legacy policies may use "acr" instead of "tfp").
246-
* To learn more about B2C tokens, visit https://docs.microsoft.com/en-us/azure/active-directory-b2c/tokens-overview
246+
* To learn more about B2C tokens, visit https://learn.microsoft.com/azure/active-directory-b2c/tokens-overview
247247
*/
248248
if (response.idTokenClaims['tfp'].toUpperCase() === b2cPolicies.names.signUpSignIn.toUpperCase()) {
249249
handleResponse(response);

0 commit comments

Comments
 (0)