Skip to content

Commit f116ec4

Browse files
authored
Merge pull request #13954 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 20dc9ae + 4ac0275 commit f116ec4

File tree

16 files changed

+23
-23
lines changed

16 files changed

+23
-23
lines changed

docs/debugger/debug-interface-access/idiainputassemblyfile-get-filename.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
description: Retrieves the orginal assembly file name.
2+
description: Retrieves the original assembly file name.
33
title: "IDiaInputAssemblyFile::get_fileName"
44
ms.date: "07/18/2024"
55
ms.topic: "reference"
@@ -15,7 +15,7 @@ ms.subservice: debug-diagnostics
1515

1616
# IDiaInputAssemblyFile::get_fileName
1717

18-
Retrieves the orginal assembly file name.
18+
Retrieves the original assembly file name.
1919

2020
## Syntax
2121

docs/debugger/debug-interface-access/idiainputassemblyfile-get-version.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
description: Retrieves the version of the orginal assembly.
2+
description: Retrieves the version of the original assembly.
33
title: "IDiaInputAssemblyFile::get_version"
44
ms.date: "07/18/2024"
55
ms.topic: "reference"
@@ -15,7 +15,7 @@ ms.subservice: debug-diagnostics
1515

1616
# IDiaInputAssemblyFile::get_version
1717

18-
Retrieves the version of the orginal assembly.
18+
Retrieves the version of the original assembly.
1919

2020
## Syntax
2121

docs/debugger/debug-interface-access/idiainputassemblyfile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ The following table shows the methods of `IDiaInputAssemblyFile`.
3131
|[`IDiaInputAssemblyFile::get_index`](../../debugger/debug-interface-access/idiainputassemblyfile-get-index.md)|Retrieves the file index.|
3232
|[`IDiaInputAssemblyFile::get_timestamp`](../../debugger/debug-interface-access/idiainputassemblyfile-get-timestamp.md)|Retrieves the time stamp.|
3333
|[`IDiaInputAssemblyFile::get_pdbAvailableAtILMerge`](../../debugger/debug-interface-access/idiainputassemblyfile-get-pdbavailableatilmerge.md)|Retrieves a flag that indicates whether the PDB was available at the creation of the .NET Native binary.|
34-
|[`IDiaInputAssemblyFile::get_fileName`](../../debugger/debug-interface-access/idiainputassemblyfile-get-filename.md)|Retrieves the orginal assembly file name.|
35-
|[`IDiaInputAssemblyFile::get_version`](../../debugger/debug-interface-access/idiainputassemblyfile-get-version.md)|Retrieves the version of the orginal assembly.|
34+
|[`IDiaInputAssemblyFile::get_fileName`](../../debugger/debug-interface-access/idiainputassemblyfile-get-filename.md)|Retrieves the original assembly file name.|
35+
|[`IDiaInputAssemblyFile::get_version`](../../debugger/debug-interface-access/idiainputassemblyfile-get-version.md)|Retrieves the version of the original assembly.|
3636

3737
## Remarks
3838

docs/extensibility/internals/list-of-available-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Use the service GUIDs listed here or obtained from some other source (for exampl
115115
| <xref:Microsoft.VisualStudio.Shell.Interop.SVSMDCodeDomProvider> | IVSMDCodeDomProvider | No | Yes | Provides access to a code document object model (DOM) provider which can be used in native code. |
116116
| <xref:Microsoft.VisualStudio.Shell.Interop.SVSMDDesignerService> | IVSMDCodeDomCreator<br /><br /> IVSMDDesignerService | No | Yes | Provides access to the IDE's support for managed form designers. The `IVSMDCodeDomCreator` can be used to create code DOM providers. |
117117
| <xref:Microsoft.VisualStudio.Shell.Interop.SVSMDPropertyBrowser> | IVSMDPropertyBrowser | No | Yes | Provides access to the designer property windows service. |
118-
| <xref:Microsoft.VisualStudio.Shell.Interop.SVSMDTypeResolutionService> | <xref:Microsoft.VisualStudio.Shell.Interop.IVSMDTypeResolutionService> | No | Yes | Provides access to an interface that can return an <xref:System.ComponentModel.Design.ITypeResolutionService> object useable in native code. |
118+
| <xref:Microsoft.VisualStudio.Shell.Interop.SVSMDTypeResolutionService> | <xref:Microsoft.VisualStudio.Shell.Interop.IVSMDTypeResolutionService> | No | Yes | Provides access to an interface that can return an <xref:System.ComponentModel.Design.ITypeResolutionService> object usable in native code. |
119119
| <xref:Microsoft.VisualStudio.Shell.Interop.SVsSmartOpenScope> | <xref:Microsoft.VisualStudio.Shell.Interop.IVsSmartOpenScope> | No | Yes | Provides a way to open a scope on an assembly, taking into account locking as needed. |
120120
| <xref:Microsoft.VisualStudio.Shell.Interop.SVsSolution> | <xref:Microsoft.VisualStudio.Shell.Interop.IVsSolution> | Yes | Yes | Provides top-level access to the current solution. |
121121
| <xref:Microsoft.VisualStudio.Shell.Interop.SVsSolutionBuildManager> | <xref:Microsoft.VisualStudio.Shell.Interop.IVsSolutionBuildManager> | Yes | Yes | Enables a VSPackage to interact with a solution's build process. |

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_MSOffice2007Demo/cpp/MSOffice2007Demo.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
16731673
BEGIN
16741674
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
16751675
LTEXT "MSOffice2007Demo Application Version 1.0",IDC_STATIC,40,10,119,8
1676-
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
1676+
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
16771677
IDC_STATIC,40,25,122,19
16781678
DEFPUSHBUTTON "OK",IDOK,176,6,32,14,WS_GROUP
16791679
END
@@ -2198,7 +2198,7 @@ BEGIN
21982198
ID_FONT_FONT "Change the font face.\nFont"
21992199
ID_FONT_FONTSIZE "Change the font size.\nFont Size"
22002200
ID_FONT_GROWFONT "Increase the font size.\nGrow Font"
2201-
ID_FONT_ITALIC "Italicize the selcted text.\nItalic"
2201+
ID_FONT_ITALIC "Italicize the selected text.\nItalic"
22022202
ID_FONT_SHRINK "Decrease the font size.\nShrink Font"
22032203
ID_FONT_STRIKETHROUGH "Draw a line through the middle of the selected text.\nStrikethrough"
22042204
ID_FONT_SUBSCRIPT "Create the small letters below the text baseline.\nSubscript"

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_Misc/cpp/Misc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ IDR_POPUP_SORT MENU
303303
BEGIN
304304
POPUP "Sorting"
305305
BEGIN
306-
MENUITEM "&Sort Alphabeticaly", ID_SORTING_SORTALPHABETIC
306+
MENUITEM "&Sort Alphabetically", ID_SORTING_SORTALPHABETIC
307307
MENUITEM "Sort by &Type", ID_SORTING_SORTBYTYPE
308308
MENUITEM "Sort by Acc&ess", ID_SORTING_SORTBYACCESS
309309
MENUITEM "Group by t&ype", ID_SORTING_GROUPBYTYPE

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_VisualStudioDemo/cpp/VisualStudioDemo.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
185185
BEGIN
186186
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
187187
LTEXT "VisualStudioDemo Application",IDC_STATIC,40,10,119,8
188-
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
188+
LTEXT "� 2007 - 2008 Microsoft Corporation. All rights reserved.",
189189
IDC_STATIC,40,25,122,19
190190
DEFPUSHBUTTON "OK",IDOK,176,6,32,14,WS_GROUP
191191
END
@@ -346,15 +346,15 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
346346
CAPTION "Application Look"
347347
FONT 8, "MS Sans Serif", 0, 0, 0x1
348348
BEGIN
349-
LTEXT "Welcome to MFC! The library supports various application looks such as Microsoft� Office 2000/XP/2003/2007, Visual Studio� 97/.NET/2005 and more.",IDC_STATIC,7,12,278,19
349+
LTEXT "Welcome to MFC! The library supports various application looks such as Microsoft� Office 2000/XP/2003/2007, Visual Studio� 97/.NET/2005 and more.",IDC_STATIC,7,12,278,19
350350
LTEXT "Please choose the preferred look and click OK to continue.",IDC_STATIC,17,34,214,8
351351
LTEXT "&Visual Manager:",IDC_STATIC,19,51,52,8
352352
COMBOBOX IDC_APP_LOOK,112,50,140,199,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
353353
LTEXT "&Style (Office 2007 only):",IDC_STATIC,19,76,76,8
354354
COMBOBOX IDC_STYLE,112,75,72,165,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
355355
CONTROL "Show ""Close"" Button on the &Active Tab",IDC_ACTIVETAB_CLOSE_BUTTON,
356356
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,99,141,10
357-
CONTROL "One&Note�-style MDI tabs",IDC_ONENOTE_TABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,114,97,10
357+
CONTROL "One&Note�-style MDI tabs",IDC_ONENOTE_TABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,114,97,10
358358
CONTROL "Docking Tab &Colors",IDC_DOCK_TAB_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,129,79,10
359359
CONTROL "&3D Rounded Docking Tabs and Auto Hide Buttons (VS 2005 only)",IDC_ROUNDED_TABS,
360360
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,144,225,10
@@ -699,7 +699,7 @@ IDR_POPUP_SORT MENU
699699
BEGIN
700700
POPUP "Sorting"
701701
BEGIN
702-
MENUITEM "&Sort Alphabeticaly", ID_SORTING_SORTALF
702+
MENUITEM "&Sort Alphabetically", ID_SORTING_SORTALF
703703
MENUITEM "Sort by &Type", ID_SORTING_SORTBYTYPE
704704
MENUITEM "Sort by Acc&ess", ID_SORTING_SORTBYACCESS
705705
MENUITEM "Group by t&ype", ID_SORTING_GROUPBYTYPE

docs/snippets/cpp/VS_Snippets_Misc/NVC_MFC_WordPad/cpp/wordpdoc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ BOOL CWordPadDoc::DoSave(LPCTSTR pszPathName, BOOL bReplace /*=TRUE*/)
319319
}
320320
END_CATCH_ALL
321321
}
322-
// restore orginal document type
322+
// restore original document type
323323
SetDocType(nOrigDocType, TRUE);
324324
EndWaitCursor();
325325
return FALSE;

docs/snippets/cpp/VS_Snippets_Misc/cx_partial/cpp/class1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace PartialClassExample
2121

2222
/*
2323
// This is commented out because it causes
24-
// a compile error in Delcaration #6 due to mc already being defined.
24+
// a compile error in Declaration #6 due to mc already being defined.
2525
// the error is understood. The example is most effective showing
2626
// the various declaration rules all in one example like this.
2727
//<snippet03>

docs/snippets/cpp/VS_Snippets_Winforms/DataGridTableStyle_ResetGridLineColor/CPP/datagridtablestyle_resetgridlinecolor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public ref class Form1: public Form
7777

7878
void Button1_Click( Object^ /*sender*/, EventArgs^ /*e*/ )
7979
{
80-
// Reset the 'GridLineColor' to its orginal color.
80+
// Reset the 'GridLineColor' to its original color.
8181
myDataTableStyle->ResetGridLineColor();
8282
}
8383
// </Snippet1>

0 commit comments

Comments
 (0)