Skip to content

Commit cee99a4

Browse files
authored
Merge pull request #14046 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch main)
2 parents cf992fa + 8a4f178 commit cee99a4

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

docs/ide/reference/options-text-editor-csharp-advanced.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Select these check boxes to display dotted vertical lines between the curly brac
149149

150150
- Don't put ref or out on custom struct
151151

152-
Uncheck this checkbox to avoid potentionally unintended cloning of structs by refencing existing struct objects when extracting an expression into a method call.
152+
Uncheck this checkbox to avoid potentially unintended cloning of structs by refencing existing struct objects when extracting an expression into a method call.
153153

154154
### Example
155155

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_DrawClient/cpp/PropertiesViewBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ int CPropertiesViewBar::OnCreate(LPCREATESTRUCT lpCreateStruct)
7373

7474
if (!m_wndPropList.Create (WS_VISIBLE | WS_CHILD, rectDummy, this, 2))
7575
{
76-
TRACE0("Failed to create Properies Grid \n");
76+
TRACE0("Failed to create Properties Grid \n");
7777
return -1; // fail to create
7878
}
7979

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_DrawClient/cpp/drawobj.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ CPoint CDrawObj::GetHandle(int nHandle)
232232
return CPoint(x, y);
233233
}
234234

235-
// return rectange of handle in logical coords
235+
// return rectangle of handle in logical coords
236236
CRect CDrawObj::GetHandleRect(int nHandleID, CDrawView* pView)
237237
{
238238
ASSERT_VALID(this);

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_MDITabsDemo/cpp/WorkspaceBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ int CWorkspaceBar::OnCreate(LPCREATESTRUCT lpCreateStruct)
7575

7676
if (!m_wndPropList.Create (WS_VISIBLE | WS_CHILD, rectDummy, this, 1))
7777
{
78-
TRACE0("Failed to create Properies Grid \n");
78+
TRACE0("Failed to create Properties Grid \n");
7979
return -1; // fail to create
8080
}
8181

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_OutlookDemo/cpp/OutlookDemo.rc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
451451
BEGIN
452452
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
453453
LTEXT "OutlookDemo Application Version 1.0",IDC_STATIC,40,10,119,8
454-
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
454+
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
455455
IDC_STATIC,40,25,122,19
456456
DEFPUSHBUTTON "OK",IDOK,176,6,32,14,WS_GROUP
457457
END
@@ -473,11 +473,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
473473
CAPTION "Application Look"
474474
FONT 8, "MS Sans Serif", 0, 0, 0x1
475475
BEGIN
476-
LTEXT "Welcome to MFC! The library supports various application looks such as Microsoft� Office 2000/XP/2003, Microsoft� Visual Studio� 97/.NET and more.",IDC_STATIC,7,12,278,19
476+
LTEXT "Welcome to MFC! The library supports various application looks such as Microsoft� Office 2000/XP/2003, Microsoft� Visual Studio� 97/.NET and more.",IDC_STATIC,7,12,278,19
477477
LTEXT "Please choose the preferred look and click OK to continue.",IDC_STATIC,17,36,214,8
478-
CONTROL "Microsoft� Office XP",IDC_APP_LOOK1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,50,56,83,10
479-
CONTROL "Microsoft� Office 2003",IDC_APP_LOOK2,"Button",BS_AUTORADIOBUTTON,50,71,89,10
480-
CONTROL "Microsoft� Office 2007:",IDC_APP_LOOK3,"Button",BS_AUTORADIOBUTTON,50,86,91,10
478+
CONTROL "Microsoft� Office XP",IDC_APP_LOOK1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,50,56,83,10
479+
CONTROL "Microsoft� Office 2003",IDC_APP_LOOK2,"Button",BS_AUTORADIOBUTTON,50,71,89,10
480+
CONTROL "Microsoft� Office 2007:",IDC_APP_LOOK3,"Button",BS_AUTORADIOBUTTON,50,86,91,10
481481
COMBOBOX IDC_STYLE2007,158,86,102,131,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
482482
CONTROL "OutlookBar Office 2003-style",IDC_OUTLOOKBAR2003,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,101,106,10
483483
LTEXT "Note: you may change the application look in ""View | Application Look..."" dialog.",IDC_STATIC,17,123,268,8
@@ -814,7 +814,7 @@ BEGIN
814814
ID_MAIL_SIGNATURE "Insert signature\nSignature"
815815
ID_MAIL_ATTACHMENT "Insert file\nAttachment"
816816
ID_MAIL_CHECK_NAMES "Check names\nCheck Names"
817-
ID_MAIL_HIGHT_PRIORITY "Mail high priority\nHigh Priotity"
817+
ID_MAIL_HIGHT_PRIORITY "Mail high priority\nHigh Priority"
818818
ID_MAIL_LOW_PRIORITY "Mail low priority\nLow Priority"
819819
ID_MAIL_FLAG "Flag mail\nFlag"
820820
ID_MAIL_OPTIONS "Set mail options\nOptions"

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_StatusBarDemo/cpp/StatusBarDemo.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
204204
BEGIN
205205
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
206206
LTEXT "StatusBarDemo Application Version 1.0",IDC_STATIC,40,10,119,8
207-
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
207+
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
208208
IDC_STATIC,40,25,122,19
209209
DEFPUSHBUTTON "OK",IDOK,176,6,32,14,WS_GROUP
210210
END
@@ -225,7 +225,7 @@ BEGIN
225225
PUSHBUTTON "Start Animation",IDC_START_ANIMATION,23,148,62,14
226226
GROUPBOX "Statusbar Pane Icons: ",IDC_STATIC,186,7,149,79,0,
227227
WS_EX_TRANSPARENT
228-
LTEXT "Developer can assign an icon to the staus bar pane. Please choose an icon to be displayed in the status bar pane:",
228+
LTEXT "Developer can assign an icon to the status bar pane. Please choose an icon to be displayed in the status bar pane:",
229229
IDC_STATIC,200,22,125,26
230230
CONTROL "Icon 1",IDC_ICON1,"Button",BS_AUTORADIOBUTTON |
231231
WS_GROUP,220,55,36,10

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_VisualStudioDemo/cpp/MainFrm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ LRESULT CMainFrame::OnToolbarReset(WPARAM wp,LPARAM)
336336

337337
case IDR_BUILD:
338338
{
339-
// Replace "Confoguration..." button by combobox:
339+
// Replace "Configuration..." button by combobox:
340340
CMFCToolBarComboBoxButton comboButton(ID_DUMMY_SELECT_ACTIVE_CONFIGURATION, GetCmdMgr()->GetCmdImage(ID_DUMMY_SELECT_ACTIVE_CONFIGURATION, FALSE), CBS_DROPDOWNLIST);
341341
comboButton.AddItem(_T("Win32 Debug"));
342342
comboButton.AddItem(_T("Win32 Release"));

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_VisualStudioDemo/cpp/PropertiesViewBar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int CPropertiesViewBar::OnCreate(LPCREATESTRUCT lpCreateStruct)
8181

8282
if (!m_wndObjectCombo.Create(dwViewStyle, rectDummy, this, 1))
8383
{
84-
TRACE0("Failed to create Properies Combo \n");
84+
TRACE0("Failed to create Properties Combo \n");
8585
return -1; // fail to create
8686
}
8787

@@ -91,7 +91,7 @@ int CPropertiesViewBar::OnCreate(LPCREATESTRUCT lpCreateStruct)
9191

9292
if (!m_wndPropList.Create(WS_VISIBLE | WS_CHILD, rectDummy, this, 2))
9393
{
94-
TRACE0("Failed to create Properies Grid \n");
94+
TRACE0("Failed to create Properties Grid \n");
9595
return -1; // fail to create
9696
}
9797

docs/snippets/cpp/VS_Snippets_Misc/startpagecustom/common/startpagebing.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<!--</snippet03>-->
106106

107107
<!-- Get Started Content Area
108-
The purpose of this content area is to highlight some of the usefull places where users can get help/information/resources for their projects
108+
The purpose of this content area is to highlight some of the useful places where users can get help/information/resources for their projects
109109
-->
110110

111111
<TabItem Header="Get Started" Height="Auto" x:Uid="GetStarted_Tab" DataContext="{Binding Links.Content, Converter={StaticResource StringToXmlDataProviderConverter}}">

docs/snippets/cpp/VS_Snippets_Misc/wrl-classic-com-component/cpp/wrlclassiccom/calculatorcomponent/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CalculatorComponent.cpp
2929
to be a project dependency of some other project, you will either need to
3030
add code to export some symbols from the DLL so that an export library
3131
will be produced, or you can set the Ignore Input Library property to Yes
32-
on the General propert page of the Linker folder in the project's Property
32+
on the General property page of the Linker folder in the project's Property
3333
Pages dialog box.
3434

3535
/////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)