Skip to content

Commit 0cf0c88

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#2643 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents b22a418 + 005ba1b commit 0cf0c88

33 files changed

Lines changed: 40 additions & 40 deletions

docs/atl-mfc-shared/reference/crect-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ CRect rect(0, 0, 100, 50);
299299
ASSERT(rect.Width() == 100);
300300
ASSERT(rect.Height() == 50);
301301
302-
// Initialize from RECT stucture
302+
// Initialize from RECT structure
303303
RECT sdkRect;
304304
sdkRect.left = 0;
305305
sdkRect.top = 0;

docs/atl/reference/ccomapartment-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: dbc177d7-7ee4-45f2-b563-d578a467ca93
77
---
88
# CComApartment Class
99

10-
This class provides support for managing an appartment in a thread-pooled EXE module.
10+
This class provides support for managing an apartment in a thread-pooled EXE module.
1111

1212
> [!IMPORTANT]
1313
> This class and its members cannot be used in applications that execute in the Windows Runtime.

docs/atl/reference/ccomsafedeletecriticalsection-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Returns the result of [CComCriticalSection::Lock](../../atl/reference/ccomcritic
106106

107107
### Remarks
108108

109-
This method assumes the [m_bInitialized](#m_binitialized) data member is set to TRUE upon entry. An assertion is generated in Debug builds if this condidtion is not met.
109+
This method assumes the [m_bInitialized](#m_binitialized) data member is set to TRUE upon entry. An assertion is generated in Debug builds if this condition is not met.
110110

111111
For more information on the behavior of the function, refer to [CComCriticalSection::Lock](../../atl/reference/ccomcriticalsection-class.md#lock).
112112

docs/atl/reference/codesnippet/CPP/catlservicemodulet-class_1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public :
99
// your service
1010
// Suggested - PKT Level Authentication,
1111
// Impersonation Level of RPC_C_IMP_LEVEL_IDENTIFY
12-
// and an appropiate Non NULL Security Descriptor.
12+
// and an appropriate Non NULL Security Descriptor.
1313

1414
return S_OK;
1515
}

docs/atl/reference/codesnippet/CPP/catlservicemodulet-class_2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class CAttribServiceModule
1111
// your service
1212
// Suggested - PKT Level Authentication,
1313
// Impersonation Level of RPC_C_IMP_LEVEL_IDENTIFY
14-
// and an appropiate Non NULL Security Descriptor.
14+
// and an appropriate Non NULL Security Descriptor.
1515

1616
return S_OK;
1717
}

docs/c-runtime-library/floating-point-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Previous 16-bit versions of Microsoft C/C++ and Microsoft Visual C++ supported t
6262
[floor, floorf, floorl](../c-runtime-library/reference/floor-floorf-floorl.md)|Computes the floor
6363
[fma, fmaf, fmal](../c-runtime-library/reference/fma-fmaf-fmal.md)|Computes a fused multiply-add
6464
[fmax, fmaxf, fmaxl](../c-runtime-library/reference/fmax-fmaxf-fmaxl.md)|Computes the maximum of the arguments
65-
[fmin, fminf, fminl](../c-runtime-library/reference/fmin-fminf-fminl.md)|Computes the minumum of the arguments
65+
[fmin, fminf, fminl](../c-runtime-library/reference/fmin-fminf-fminl.md)|Computes the minimum of the arguments
6666
[fmod, fmodf, fmodl](../c-runtime-library/reference/fmod-fmodf.md)|Computes the floating-point remainder
6767
[_fpclass, _fpclassf](../c-runtime-library/reference/fpclass-fpclassf.md)|Returns the classification of a floating-point value
6868
[fpclassify](../c-runtime-library/reference/fpclassify.md)|Returns the classification of a floating-point value

docs/c-runtime-library/reference/alloca.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ int main()
9595
}
9696
}
9797

98-
// If an exception occured with the _alloca function
98+
// If an exception occurred with the _alloca function
9999
__except( GetExceptionCode() == STATUS_STACK_OVERFLOW )
100100
{
101101
printf_s("_alloca failed!\n");

docs/c-runtime-library/reference/write.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ int main( void )
100100
perror("Invalid parameter: buffer was NULL!");
101101
break;
102102
default:
103-
// An unrelated error occured
103+
// An unrelated error occurred
104104
perror("Unexpected error!");
105105
}
106106
}

docs/cppcx/enums-c-cx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.assetid: 99fbbe28-c1cd-43af-9ead-60f90eba6e68
55
---
66
# Enums (C++/CX)
77

8-
C++/CX supports the `public enum class` keyword, which is analagous to a standard C++ `scoped enum`. When you use an enumerator that's declared by using the `public enum class` keyword, you must use the enumeration identifier to scope each enumerator value.
8+
C++/CX supports the `public enum class` keyword, which is analogous to a standard C++ `scoped enum`. When you use an enumerator that's declared by using the `public enum class` keyword, you must use the enumeration identifier to scope each enumerator value.
99

1010
### Remarks
1111

docs/cppcx/wrl/agileeventsource-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AgileEventSource :
2727
The interface to a delegate that represents an event handler.
2828
2929
*TEventSourceOptions*<br/>
30-
An [InvokeModeOptions](invokemodeoptions-structure.md) stucture whose invokeMode field is set to `InvokeMode::StopOnFirstError` or `InvokeMode::FireAll`.
30+
An [InvokeModeOptions](invokemodeoptions-structure.md) structure whose invokeMode field is set to `InvokeMode::StopOnFirstError` or `InvokeMode::FireAll`.
3131
3232
## Remarks
3333

0 commit comments

Comments
 (0)