Skip to content

Commit e232201

Browse files
author
Colin Robertson
committed
Merge link fixes from master
2 parents 33d415d + 3bde588 commit e232201

1,013 files changed

Lines changed: 5220 additions & 5257 deletions

File tree

Some content is hidden

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

‎.localization-config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"Filters": [
3+
{
4+
"Files": [
5+
"**/*.md"
6+
],
7+
"Priorities": [
8+
{
9+
"Priority": "ht",
10+
"Locales": [],
11+
"Type": "ht"
12+
}
13+
]
14+
}
15+
],
16+
"IncludeDependencies": true,
17+
"AutoPush": true,
18+
"XliffVersion": "1.2",
19+
"UseJavascriptMarkdownTransformer": true
20+
}

‎.openpublishing.publish.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"build_output_subfolder": "vcppdocs",
88
"locale": "en-us",
99
"monikers": [],
10-
"moniker_ranges": [],
10+
"moniker_ranges": [">= vs-2015"],
1111
"open_to_public_contributors": true,
1212
"type_mapping": {
1313
"Conceptual": "Content",

‎.openpublishing.redirection.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,51 @@
2525
"redirect_url": "/cpp/atl/atl-com-desktop-components",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path": "docs/atl/which-atl-classes-facilitate-activex-control-containment-q.md",
30+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "docs/atl/what-is-the-atl-control-hosting-api-q.md",
35+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "docs/atl/what-is-atlaxwin100-q.md",
40+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "docs/atl/when-do-i-need-to-call-atlaxwininit-q.md",
45+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "docs/atl/what-is-a-host-object-q.md",
50+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "docs/atl/can-i-host-more-than-one-control-in-a-single-window-q.md",
55+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "docs/atl/can-i-reuse-a-host-window-q.md",
60+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "docs/atl/when-do-i-need-to-call-atlaxwinterm-q.md",
65+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "docs/atl/hosting-activex-controls-using-atl-axhost.md",
70+
"redirect_url": "/cpp/atl/atl-control-containment-faq",
71+
"redirect_document_id": false
72+
},
2873
{
2974
"source_path": "docs/atl/reference/index.md",
3075
"redirect_url": "/cpp/atl/reference/atl-classes",
@@ -50,6 +95,11 @@
5095
"redirect_url": "/cpp/atl-mfc-shared/atl-mfc-shared-classes",
5196
"redirect_document_id": false
5297
},
98+
{
99+
"source_path": "docs/atl-mfc-shared/date-and-time-general-purpose-classes.md",
100+
"redirect_url": "/cpp/atl-mfc-shared/date-and-time",
101+
"redirect_document_id": false
102+
},
53103
{
54104
"source_path": "docs/atl-mfc-shared/reference/index.md",
55105
"redirect_url": "/cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl",

‎docs/assembler/masm/dot-fpo.md‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,48 @@ ms.assetid: 35f4cd61-32f9-4262-b657-73f04f775d09
1111
author: "corob-msft"
1212
ms.author: "corob"
1313
ms.workload: ["cplusplus"]
14-
---
15-
# .FPO
16-
The .FPO directive controls the emission of debug records to the .debug$F segment or section.
17-
18-
## Syntax
19-
20-
```
21-
22-
FPO (
23-
cdwLocals
24-
,
25-
cdwParams
26-
,
27-
cbProlog
28-
,
29-
cbRegs
30-
,
31-
fUseBP
32-
,
33-
cbFrame
34-
)
35-
36-
```
37-
38-
#### Parameters
39-
`cdwLocals`
40-
Number of local variables, an unsigned 32 bit value.
41-
42-
`cdwParams`
43-
Size of the parameters in DWORDS, an unsigned 16 bit value.
44-
45-
*cbProlog*
46-
Number of bytes in the function prolog code, an unsigned 8 bit value.
47-
48-
`cbRegs`
49-
Number registers saved.
50-
51-
`fUseBP`
52-
Indicates whether the EBP register has been allocated. either 0 or 1.
53-
54-
*cbFrame*
55-
Indicates the frame type. See [FPO_DATA](http://msdn.microsoft.com/library/windows/desktop/ms679352) for more information.
56-
57-
## See Also
14+
---
15+
# .FPO
16+
The .FPO directive controls the emission of debug records to the .debug$F segment or section.
17+
18+
## Syntax
19+
20+
```
21+
22+
FPO (
23+
cdwLocals
24+
,
25+
cdwParams
26+
,
27+
cbProlog
28+
,
29+
cbRegs
30+
,
31+
fUseBP
32+
,
33+
cbFrame
34+
)
35+
36+
```
37+
38+
#### Parameters
39+
`cdwLocals`
40+
Number of local variables, an unsigned 32 bit value.
41+
42+
`cdwParams`
43+
Size of the parameters in DWORDS, an unsigned 16 bit value.
44+
45+
*cbProlog*
46+
Number of bytes in the function prolog code, an unsigned 8 bit value.
47+
48+
`cbRegs`
49+
Number registers saved.
50+
51+
`fUseBP`
52+
Indicates whether the EBP register has been allocated. either 0 or 1.
53+
54+
*cbFrame*
55+
Indicates the frame type. See [FPO_DATA](/windows/desktop/api/winnt/ns-winnt-_fpo_data) for more information.
56+
57+
## See Also
5858
[Directives Reference](../../assembler/masm/directives-reference.md)

‎docs/atl-mfc-shared/TOC.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# [ATL-MFC Shared Classes](atl-mfc-shared-classes.md)
22
# [ATL-MFC Concepts](atl-mfc-concepts.md)
33
## [Date and Time](date-and-time.md)
4-
### [Date and Time: General-Purpose Classes](date-and-time-general-purpose-classes.md)
5-
#### [Current Time: General Purpose Classes](current-time-general-purpose-classes.md)
6-
#### [Elapsed Time: General-Purpose Classes](elapsed-time-general-purpose-classes.md)
7-
#### [Formatting Time Values: General-Purpose Classes](formatting-time-values-general-purpose-classes.md)
4+
### [Current Time: General Purpose Classes](current-time-general-purpose-classes.md)
5+
### [Elapsed Time: General-Purpose Classes](elapsed-time-general-purpose-classes.md)
6+
### [Formatting Time Values: General-Purpose Classes](formatting-time-values-general-purpose-classes.md)
87
### [Date and Time: SYSTEMTIME Support](date-and-time-systemtime-support.md)
98
### [Date and Time: Automation Support](date-and-time-automation-support.md)
109
#### [Current Time: Automation Classes](current-time-automation-classes.md)

‎docs/atl-mfc-shared/current-time-general-purpose-classes.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ The following procedure shows how to create a `CTime` object and initialize it w
3333

3434
[!code-cpp[NVC_ATLMFC_Utilities#173](../atl-mfc-shared/codesnippet/cpp/current-time-general-purpose-classes_3.cpp)]
3535

36-
## See Also
37-
[Date and Time: General-Purpose Classes](../atl-mfc-shared/date-and-time-general-purpose-classes.md)
36+
3837

3938

4039

‎docs/atl-mfc-shared/date-and-time-general-purpose-classes.md‎

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

‎docs/atl-mfc-shared/date-and-time-systemtime-support.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ The [CTime](../atl-mfc-shared/reference/ctime-class.md) class has constructors t
3737

3838
- [Automation support of date and time programming](../atl-mfc-shared/date-and-time-automation-support.md)
3939

40-
- [General-purpose classes for date and time programming](../atl-mfc-shared/date-and-time-general-purpose-classes.md)
41-
4240
## See Also
4341
[Date and Time](../atl-mfc-shared/date-and-time.md)
4442

‎docs/atl-mfc-shared/date-and-time.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ MFC supports several different ways of working with dates and times. These inclu
2222

2323
## What do you want to know more about
2424

25-
- [Date and Time: General-Purpose Classes](../atl-mfc-shared/date-and-time-general-purpose-classes.md)
26-
2725
- [Date and Time: SYSTEMTIME Support](../atl-mfc-shared/date-and-time-systemtime-support.md)
2826

2927
- [Date and Time: Automation Support](../atl-mfc-shared/date-and-time-automation-support.md)

‎docs/atl-mfc-shared/elapsed-time-general-purpose-classes.md‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@ ms.author: "mblome"
1212
ms.workload: ["cplusplus"]
1313
---
1414
# Elapsed Time: General-Purpose Classes
15-
The following procedure shows how to calculate the difference between two `CTime` objects and get a `CTimeSpan` result.
16-
17-
#### To calculate elapsed time
18-
19-
1. Use the `CTime` and `CTimeSpan` objects to calculate the elapsed time, as follows:
15+
The following procedure shows how to calculate the difference between two `CTime` objects and get a `CTimeSpan` result. Use the `CTime` and `CTimeSpan` objects to calculate the elapsed time, as follows:
2016

2117
[!code-cpp[NVC_ATLMFC_Utilities#174](../atl-mfc-shared/codesnippet/cpp/elapsed-time-general-purpose-classes_1.cpp)]
2218

23-
Once you have calculated `elapsedTime`, you can use the member functions of `CTimeSpan` to extract the components of the elapsed-time value.
24-
25-
## See Also
26-
[Date and Time: General-Purpose Classes](../atl-mfc-shared/date-and-time-general-purpose-classes.md)
19+
Once you have calculated `elapsedTime`, you can use the member functions of `CTimeSpan` to extract the components of the elapsed-time value.
2720

0 commit comments

Comments
 (0)