Skip to content

Commit 19a108b

Browse files
authored
Merge pull request #815 from MicrosoftDocs/master
5/17 AM Publish
2 parents 4fc6869 + 7a204e8 commit 19a108b

36 files changed

+258
-834
lines changed

.openpublishing.redirection.json

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@
3131
"redirect_document_id": false
3232
},
3333
{
34-
"source_path": "docs/atl/reference/patlmodule.md",
35-
"redirect_url": "/cpp/atl/reference/atl-global-variables",
34+
"source_path": "docs/atl/reference/atl-archetypes.md",
35+
"redirect_url": "/cpp/atl/reference/worker-archetype",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "docs/atl/reference/atl-structures.md",
40+
"redirect_url": "/cpp/atl/reference/atl-classes",
3641
"redirect_document_id": false
3742
},
3843
{
@@ -202,7 +207,17 @@
202207
},
203208
{
204209
"source_path": "docs/cppcx/index.md",
205-
"redirect_url": "/cppcx/visual-c-language-reference-c-cx",
210+
"redirect_url": "/cpp/cppcx/visual-c-language-reference-c-cx",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path": "docs/cppcx/operator-subtracttype-hat.md",
215+
"redirect_url": "/cpp/cppcx/operator-type-hat",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path": "docs/cppcx/operator-subtractwindows-ui-xaml-interop-typename.md",
220+
"redirect_url": "/cpp/cppcx/operator-windows-ui-xaml-interop-typename",
206221
"redirect_document_id": false
207222
},
208223
{
@@ -370,6 +385,11 @@
370385
"redirect_url": "/cpp/mfc/mfc-library-versions#mfc-static-library-naming-conventions",
371386
"redirect_document_id": false
372387
},
388+
{
389+
"source_path": "docs/mfc/reference/button-styles.md",
390+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#button-styles",
391+
"redirect_document_id": false
392+
},
373393
{
374394
"source_path": "docs/mfc/reference/callback-function-for-cdc-enumobjects.md",
375395
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#enum_objects",
@@ -380,6 +400,11 @@
380400
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#graystring",
381401
"redirect_document_id": false
382402
},
403+
{
404+
"source_path": "docs/mfc/reference/combo-box-styles.md",
405+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#combo-box-styles",
406+
"redirect_document_id": false
407+
},
383408
{
384409
"source_path": "docs/mfc/reference/callback-function-for-cdc-setabortproc.md",
385410
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#setabortproc",
@@ -405,6 +430,11 @@
405430
"redirect_url": "/cpp/mfc/reference/mfc-classes",
406431
"redirect_document_id": false
407432
},
433+
{
434+
"source_path": "docs/mfc/reference/list-box-styles.md",
435+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#list-box-styles",
436+
"redirect_document_id": false
437+
},
408438
{
409439
"source_path": "docs/mfc/reference/message-box-styles.md",
410440
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#message-box-styles",
@@ -576,4 +606,4 @@
576606
"redirect_document_id": false
577607
}
578608
]
579-
}
609+
}

docs/atl-mfc-shared/reference/StructuredTOC.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/atl/atl-class-overview.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ Classes in the Active Template Library (ATL) can be categorized as follows:
3838
For additional classes that can be used in ATL projects, see [Shared Classes](../atl-mfc-shared/atl-mfc-shared-classes.md).
3939

4040
## See Also
41-
[Classes](../atl/reference/atl-classes.md)
42-
[ATL COM Desktop Components](../atl/atl-com-desktop-components.md)
41+
[Classes and structs](../atl/reference/atl-classes.md)
42+
[ATL COM Desktop Components](../atl/atl-com-desktop-components.md)
4343
[Functions](../atl/reference/atl-functions.md)
4444
[Global Variables](../atl/reference/atl-global-variables.md)
4545
[Macros](../atl/reference/atl-macros.md)
46-
[Structures](../atl/reference/atl-structures.md)
4746
[Typedefs](../atl/reference/atl-typedefs.md)
4847

docs/atl/atl-com-desktop-components.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ The ATL Reference documents the Active Template Library (ATL), a set of template
1818
[ATL Class Overview](../atl/atl-class-overview.md)
1919
Provides links to and brief descriptions of the ATL classes organized by category.
2020

21-
[ATL Classes](../atl/reference/atl-classes.md)
22-
Provides reference material on the classes organized alphabetically.
21+
[ATL Classes and structs](../atl/reference/atl-classes.md)
22+
Provides reference material on the classes and structs organized alphabetically.
2323

2424
[ATL Functions](../atl/reference/atl-functions.md)
2525
Provides reference material on the global functions organized alphabetically. Includes topics organizing the functions into categories.
@@ -30,14 +30,11 @@ The ATL Reference documents the Active Template Library (ATL), a set of template
3030
[ATL Macros](../atl/reference/atl-macros.md)
3131
Provides reference material on the macros organized alphabetically. Includes topics organizing the macros into categories.
3232

33-
[ATL Structures](../atl/reference/atl-structures.md)
34-
Provides reference material on the structures organized alphabetically.
35-
3633
[ATL Typedefs](../atl/reference/atl-typedefs.md)
3734
Provides reference material on the typedefs organized alphabetically
3835

39-
[Archetypes](../atl/reference/atl-archetypes.md)
40-
Provides links to the ATL archetypes, which are theoretical classes that supply a collection of methods, data members, static functions, typedefs, or other features, listed alphabetically.
36+
[Worker Archetype](../atl/reference/worker-archetype.md)
37+
Provides a links to the ATL Worker archetype.
4138

4239
[Obsolete ATL Topics](http://msdn.microsoft.com/en-us/7af0223d-148e-4a4c-bf9c-3e916a3b67ec)
4340
Provides reference material on the classes, macros, and functions that are obsolete or deprecated.

0 commit comments

Comments
 (0)