Skip to content

Commit 20645af

Browse files
committed
Merge branch 'master' of https://github.com/kraigb/azure-docs-pr
2 parents 3e0c5bf + 25f824c commit 20645af

File tree

14,104 files changed

+210720
-133969
lines changed

Some content is hidden

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

14,104 files changed

+210720
-133969
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ _themes.VS.Modern/
2121
articles/directories.txt
2222
AzureMigration.ps1
2323

24-
!/.vscode/extensions.json
24+
!/.vscode/extensions.json

.openpublishing.publish.config.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [],
11-
"open_to_public_contributors": false,
11+
"open_to_public_contributors": true,
1212
"type_mapping": {
1313
"Conceptual": "Content",
1414
"ManagedReference": "Content",
@@ -32,6 +32,12 @@
3232
"need_preview_pull_request": true,
3333
"contribution_branch_mappings": {},
3434
"dependent_repositories": [
35+
{
36+
"path_to_root": "quickstart-templates",
37+
"url": "https://github.com/Azure/azure-quickstart-templates",
38+
"branch": "master",
39+
"branch_mapping": {}
40+
},
3541
{
3642
"path_to_root": "_themes",
3743
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -314,11 +320,23 @@
314320
"branch": "master",
315321
"branch_mapping": {}
316322
},
323+
{
324+
"path_to_root": "samples-fbPageModeration",
325+
"url": "https://github.com/MicrosoftContentModerator/samples-fbPageModeration",
326+
"branch": "master",
327+
"branch_mapping": {}
328+
},
317329
{
318330
"path_to_root": "AIVisualProvision",
319331
"url": "https://github.com/Microsoft/AIVisualProvision",
320332
"branch": "master",
321333
"branch_mapping": {}
334+
},
335+
{
336+
"path_to_root": "VideoReviewConsoleApp",
337+
"url": "https://github.com/MicrosoftContentModerator/VideoReviewConsoleApp",
338+
"branch": "master",
339+
"branch_mapping": {}
322340
}
323341
],
324342
"branch_target_mapping": {

.openpublishing.redirection.json

Lines changed: 1358 additions & 738 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.

.github/LICENSE renamed to LICENSE

File renamed without changes.
File renamed without changes.

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Microsoft Azure Documentation
22

3-
> Between March 5th and March 9th 2019, the MicrosoftDocs/azure-docs repo will be undergoing a Migration from it's current Markdown engine to the [Markdig](https://github.com/lunet-io/markdig) markdown engine. During this time, we will be turning off the ability to suspending merging of public pull requests in order to complete the migration.
4-
53
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.
64

75
## Getting Started
86

9-
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](.github/CONTRIBUTING.md) to find out more.
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.
108

119
### Prerequisites
1210

File renamed without changes.

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
href: relyingparty.md
238238
- name: JavaScript samples
239239
href: javascript-samples.md
240-
- name: Release notes
240+
- name: Developer notes
241241
href: active-directory-b2c-developer-notes-custom.md
242242
- name: Trust Framework definition
243243
href: active-directory-b2c-reference-trustframeworks-defined-ief-custom.md
@@ -291,6 +291,8 @@
291291
items:
292292
- name: Code samples
293293
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
294+
- name: Cookie definitions
295+
href: cookie-definitions.md
294296
- name: Region availability & data residency
295297
href: active-directory-b2c-reference-tenant-type.md
296298
- name: Enable billing

0 commit comments

Comments
 (0)