Skip to content

Commit 968b358

Browse files
authored
Merge pull request #2291 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents 77890cd + 7a3ac50 commit 968b358

File tree

32 files changed

+38
-38
lines changed

32 files changed

+38
-38
lines changed

docs/code-quality/C26450.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manager: douge
1919

2020
This warning indicates that an arithmetic operation was provably lossy at compile time. This can be asserted when the operands are all compile-time constants. Currently, we check left shift, multiplication, addition, and subtraction operations for such overflows.
2121

22-
Note: C4307 is a similar check in in the Microsoft C++ compiler.
22+
Note: C4307 is a similar check in the Microsoft C++ compiler.
2323

2424
## Example 1
2525

docs/data-tools/how-to-assign-stored-procedures-to-perform-updates-inserts-and-deletes-o-r-designer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Stored procedures can be added to the O/R Designer and executed as typical <xref
2121
> [!INCLUDE[vbtecdlinq](../data-tools/includes/vbtecdlinq_md.md)] handles database-generated values automatically for identity (auto-increment), rowguidcol (database-generated GUID), and timestamp columns. Database-generated values in other column types will unexpectedly result in a null value. To return the database-generated values, you should manually set <xref:System.Data.Linq.Mapping.ColumnAttribute.IsDbGenerated%2A> to `true` and <xref:System.Data.Linq.Mapping.ColumnAttribute.AutoSync%2A> to one of the following: <xref:System.Data.Linq.Mapping.AutoSync>, <xref:System.Data.Linq.Mapping.AutoSync>, or <xref:System.Data.Linq.Mapping.AutoSync>.
2222
2323
## Configuring the Update Behavior of an Entity Class
24-
By default, the logic to update a database (inserts, updates, and deletes) with changes that were made to the data in [!INCLUDE[vbtecdlinq](../data-tools/includes/vbtecdlinq_md.md)] entity classes is provided by the [!INCLUDE[vbtecdlinq](../data-tools/includes/vbtecdlinq_md.md)] runtime. The runtime creates default INSERT, UPDATE, and DELETE commands that are based on the the schema of the table (the column and primary key information). When the default behavior is not desired, you can configure the update behavior by assigning specific stored procedures for performing the necessary inserts, updates, and deletes required to manipulate the data in your table. You can also do this when the default behavior is not generated, for example, when your entity classes map to views. Finally, you can override the default update behavior when the database requires table access through stored procedures.
24+
By default, the logic to update a database (inserts, updates, and deletes) with changes that were made to the data in [!INCLUDE[vbtecdlinq](../data-tools/includes/vbtecdlinq_md.md)] entity classes is provided by the [!INCLUDE[vbtecdlinq](../data-tools/includes/vbtecdlinq_md.md)] runtime. The runtime creates default INSERT, UPDATE, and DELETE commands that are based on the schema of the table (the column and primary key information). When the default behavior is not desired, you can configure the update behavior by assigning specific stored procedures for performing the necessary inserts, updates, and deletes required to manipulate the data in your table. You can also do this when the default behavior is not generated, for example, when your entity classes map to views. Finally, you can override the default update behavior when the database requires table access through stored procedures.
2525

2626
[!INCLUDE[note_settings_general](../data-tools/includes/note_settings_general_md.md)]
2727

docs/debugger/finding-memory-leaks-using-the-crt-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ This tells you that the leaked allocation was on line 20 of debug_new.cpp.
180180

181181
2. When the application breaks at the breakpoint, the **Watch** window.
182182

183-
3. In the **Watch** window, type `_crtBreakAlloc` in in the **Name** column.
183+
3. In the **Watch** window, type `_crtBreakAlloc` in the **Name** column.
184184

185185
If you are using the multithreaded DLL version of the CRT library (the /MD option), include the context operator: `{,,ucrtbased.dll}_crtBreakAlloc`
186186

docs/debugger/graphics/walkthrough-missing-objects-due-to-vertex-shading.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ This walkthrough demonstrates how to use the [!INCLUDE[vsprvs](../../code-qualit
102102
> [!TIP]
103103
> If you are simultaneously debugging your app, you can set a breakpoint at this location and it will be hit when the next frame is rendered. You can then inspect the members of `m_marbleConstantBufferData` to confirm that the value of the `projection` member is set to all zeros when the constant buffer is filled.
104104
105-
After you find the location where the constant buffer is being filled and discover that that its values come from the variable `m_marbleConstantBufferData`, the next step is to find out where the `m_marbleConstantBufferData.projection` member is set to all zeros. You can use **Find All References** to quickly scan for code that changes the value of `m_marbleConstantBufferData.projection`.
105+
After you find the location where the constant buffer is being filled and discover that its values come from the variable `m_marbleConstantBufferData`, the next step is to find out where the `m_marbleConstantBufferData.projection` member is set to all zeros. You can use **Find All References** to quickly scan for code that changes the value of `m_marbleConstantBufferData.projection`.
106106

107107
#### To find where the projection member is set in your app's source code
108108

docs/debugger/run-windows-store-apps-on-a-remote-machine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ For Windows 10 PCs running a pre-Creator's Update version of Windows, you must i
3838
- For Windows 10 PCs running a version of Windows 10 earlier than Windows 10 Creator's Update, you must [install and run the remote debugging components](#BKMK_download).
3939

4040
## <a name="BKMK_Security"></a> Security
41-
By default, **Universal (Unencrypted Protocol)** is used on Windows 10. Ths protocol should only be used on trusted networks. The debugging connection is vulnerable to malicious users who could intercept and change data being passed between the development and remote machine.
41+
By default, **Universal (Unencrypted Protocol)** is used on Windows 10. This protocol should only be used on trusted networks. The debugging connection is vulnerable to malicious users who could intercept and change data being passed between the development and remote machine.
4242

4343
> [!WARNING]
4444
> There is no network security when you set the authentication mode to **Universal (Unencrypted Protocol)** or **None**. Choose these modes only if you are sure that the network is not at risk of from malicious or hostile traffic.
@@ -99,4 +99,4 @@ If you are using a pre-Creator's Update versions of Windows 10, then follow thes
9999
## See Also
100100
[Advanced remote deployment options](/windows/uwp/debug-test-perf/deploying-and-debugging-uwp-apps#advanced-remote-deployment-options)
101101
[Testing UWP apps with Visual Studio](../test/testing-store-apps-with-visual-studio.md)
102-
[Debug apps in Visual Studio](../debugger/debug-store-apps-in-visual-studio.md)
102+
[Debug apps in Visual Studio](../debugger/debug-store-apps-in-visual-studio.md)

docs/designers/accessibility-products-and-services-blend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Microsoft is committed to making its products and services easier for everyone t
6060

6161
Web addresses can change, so you might be unable to connect to the site mentioned here.
6262

63-
## Customer service for people people with hearing impairments
63+
## Customer service for people with hearing impairments
6464
If you are deaf or have hearing impairments, complete access to Microsoft product and customer services is available through a text telephone (TTY/TDD) service:
6565

6666
For customer service, contact Microsoft Sales Information Center at (800) 892-5234 between 6:30 AM and 5:30 PM Pacific Time, Monday through Friday, excluding holidays.

docs/extensibility/creating-a-basic-project-system-part-2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The first walkthrough in this series, [Creating a Basic Project System, Part 1](
4343

4444
1. In [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)], open the SimpleProject solution that you created by following [Creating a Basic Project System, Part 1](../extensibility/creating-a-basic-project-system-part-1.md).
4545

46-
2. In the SimpleProjectPackage.cs file, find the the ProvideProjectFactory attribute. Replace the second parameter (the project name) with null, and the fourth parameter (the path to the project template folder) with ".\\\NullPath", as follows.
46+
2. In the SimpleProjectPackage.cs file, find the ProvideProjectFactory attribute. Replace the second parameter (the project name) with null, and the fourth parameter (the path to the project template folder) with ".\\\NullPath", as follows.
4747

4848
```
4949
[ProvideProjectFactory(typeof(SimpleProjectFactory), null,

docs/extensibility/debugger/reference/enumerations-visual-studio-debugging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Following are enumerations for the [!INCLUDE[vsprvs](../../../code-quality/inclu
109109
Specifies the scope of the disassembly stream.
110110

111111
[DisplayKind](../../../extensibility/debugger/reference/displaykind.md)
112-
Enumerates the valid values that represent the kinds of information to take from an an [IDebugField](../../../extensibility/debugger/reference/idebugfield.md) object and display to the user.
112+
Enumerates the valid values that represent the kinds of information to take from an [IDebugField](../../../extensibility/debugger/reference/idebugfield.md) object and display to the user.
113113

114114
[DOCCONTEXT_COMPARE](../../../extensibility/debugger/reference/doccontext-compare.md)
115115
Specifies the criteria for comparing two document contexts.

docs/extensibility/debugger/reference/idebugthread2-getthreadproperties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int GetThreadProperties ( 
4040
[in] A combination of flags from the [THREADPROPERTY_FIELDS](../../../extensibility/debugger/reference/threadproperty-fields.md) enumeration that determines which fields of `ptp` are to be filled in.
4141

4242
`ptp`
43-
[in, out] A [THREADPROPERTIES](../../../extensibility/debugger/reference/threadproperties.md) structure that that is filled in with the properties of the thread.
43+
[in, out] A [THREADPROPERTIES](../../../extensibility/debugger/reference/threadproperties.md) structure that is filled in with the properties of the thread.
4444

4545
## Return Value
4646
If successful, returns `S_OK`; otherwise, returns an error code.

docs/extensibility/debugger/registering-an-expression-evaluator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.workload:
2424
## Managed Code Expression Evaluator
2525
A managed code EE is implemented as a Class Library, which is a DLL that registers itself with the COM environment, typically started by a call to the VSIP program, **regpkg.exe**. The actual process of writing the registry keys for the COM environment is handled automatically.
2626

27-
A method of the main class is marked with the <xref:System.Runtime.InteropServices.ComRegisterFunctionAttribute>, indicating that that method is to be called when the DLL is being registered with COM. This registration method, often called `RegisterClass`, performs the task of registering the DLL with Visual Studio. A corresponding `UnregisterClass` (marked with the <xref:System.Runtime.InteropServices.ComUnregisterFunctionAttribute>), undoes the effects of `RegisterClass` when the DLL is uninstalled.
27+
A method of the main class is marked with <xref:System.Runtime.InteropServices.ComRegisterFunctionAttribute>, indicating that the method is to be called when the DLL is being registered with COM. This registration method, often called `RegisterClass`, performs the task of registering the DLL with Visual Studio. A corresponding `UnregisterClass` (marked with the <xref:System.Runtime.InteropServices.ComUnregisterFunctionAttribute>), undoes the effects of `RegisterClass` when the DLL is uninstalled.
2828

2929
The same registry entries are made as for an EE written in unmanaged code; the only difference is that there is no helper function such as `SetEEMetric` to do the work for you. An example of this registration/unregistration process looks like this:
3030

@@ -209,4 +209,4 @@ static HRESULT RegisterMetric( bool registerIt )
209209
210210
## See Also
211211
[Writing a CLR Expression Evaluator](../../extensibility/debugger/writing-a-common-language-runtime-expression-evaluator.md)
212-
[SDK Helpers for Debugging](../../extensibility/debugger/reference/sdk-helpers-for-debugging.md)
212+
[SDK Helpers for Debugging](../../extensibility/debugger/reference/sdk-helpers-for-debugging.md)

docs/extensibility/folder-element-visual-studio-project-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Specifies a folder that will be added to the project.
5959
## Remarks
6060
`Folder` is an optional child of `Project`.
6161

62-
You can use any of the following methods to to organize project items into folders in a template:
62+
You can use any of the following methods to organize project items into folders in a template:
6363

6464
- Include the folders in the template .zip file, and add them to the project in the .vstemplate file by specifying the path to the file in the `ProjectItem` elements, with no `Folder` elements. This is the recommended method. For example:
6565

docs/extensibility/internals/legacy-language-service-parser-and-scanner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace MyNamespace
7373
## Parsing for Matching Braces
7474
This example shows the flow of control for matching a closing brace that the user has typed. In this process, the scanner that is used for colorization is also used to determine the type of token and whether the token can trigger a match-brace operation. If the trigger is found, the <xref:Microsoft.VisualStudio.Package.LanguageService.ParseSource%2A> method is called to find the matching brace. Finally, the two braces are highlighted.
7575

76-
Even though braces are used in the names of triggers and parse reasons, this process is not limited to actual braces. Any pair of characters that that is specified to be a matching pair is supported. Examples include ( and ), \< and >, and [ and ].
76+
Even though braces are used in the names of triggers and parse reasons, this process is not limited to actual braces. Any pair of characters that is specified to be a matching pair is supported. Examples include ( and ), \< and >, and [ and ].
7777

7878
Assume that the language service supports matching braces.
7979

docs/extensibility/internals/microsoft-help-viewer-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ In the following table, any string that appears between brackets is a placeholde
348348
|Property (HTML Representation)|Description|
349349
|--------------------------------------|-----------------|
350350
|\< meta name="Microsoft.Help.Locale" content="[language-code]" />|Sets a locale for this topic. If this tag is used in a topic, it must be used just once and it must be inserted above any other Microsoft Help tags. If this tag is not used, the body text of the topic is indexed by using word breaker that is associated with the product locale, if it is specified; otherwise, the en-us word breaker is used. This tag conforms to ISOC RFC 4646. To ensure that Microsoft Help works correctly, use this property instead of the general Language attribute.|
351-
|\< meta name="Microsoft.Help.TopicLocale" content="[language-code]" />|Sets a locale for this topic when other locales are also used. If this tag is used in a topic, it must be used just once. Use this tag when the catalog contains content in more than one language. Multiple topics in a catalog can have the same ID, but each must specify a unique TopicLocale. The topic that specifies a TopicLocale that matches the locale of the catalog is the the topic that is displayed in the table of contents. However, all language versions of the topic are displayed in Search results.|
351+
|\< meta name="Microsoft.Help.TopicLocale" content="[language-code]" />|Sets a locale for this topic when other locales are also used. If this tag is used in a topic, it must be used just once. Use this tag when the catalog contains content in more than one language. Multiple topics in a catalog can have the same ID, but each must specify a unique TopicLocale. The topic that specifies a TopicLocale that matches the locale of the catalog is the topic that is displayed in the table of contents. However, all language versions of the topic are displayed in Search results.|
352352
|\< title>[Title]\</title>|Specifies the title of this topic. This tag is required, and must be used just once in a topic. If the body of the topic does not contain a title \<div> section, this Title is displayed in the topic and in the table of contents.|
353353
|\< meta name=" Microsoft.Help.Keywords" content="[aKeywordPhrase]"/>|Specifies the text of a link that is displayed in the index pane of the Help Viewer. When the link is clicked, the topic is displayed.You can specify multiple index keywords for a topic, or you can omit this tag if you do not want links to this topic to appear in the index. "K" keywords from earlier versions of Help can be converted to this property.|
354354
|\< meta name="Microsoft.Help.Id" content="[TopicID]"/>|Sets the identifier for this topic. This tag is required, and must be used just once in a topic. The ID must be unique among topics in the catalog that have the same locale setting. In another topic, you can create a link to this topic by using this ID.|

docs/extensibility/internals/registering-project-and-item-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Project types must register the directories where their project and project-item
6060
|SortPriority|REG_DWORD|Set SortPriority to govern the order in which templates are displayed in the **Add New Item** dialog box. Larger SortPriority values appear earlier in the template list.|
6161

6262
### Registering file filters
63-
Optionally, you can register filters that [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] uses when it prompts for file names. For example, the [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)] filter for the the **Open File** dialog box is:
63+
Optionally, you can register filters that [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] uses when it prompts for file names. For example, the [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)] filter for the **Open File** dialog box is:
6464

6565
**Visual C# Files (\*.cs,\*.resx,\*.settings,\*.xsd,\*.wsdl);\*.cs,\*.resx,\*.settings,\*.xsd,\*.wsdl)**
6666

docs/extensibility/signing-vsix-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Extension assemblies do not need to be signed before they can run in Visual Stud
3333

3434
1. Add your VSIX to a project.
3535

36-
2. Right click on the project node in Solution Explorer, selecting **Add &#124; Manage NuGet Packages**. For more information on NuGet and adding NuGet packages see see the [NuGet documentation](/NuGet) and [Package Manager UI](/NuGet/Tools/Package-Manager-UI) topics.
36+
2. Right click on the project node in Solution Explorer, selecting **Add &#124; Manage NuGet Packages**. For more information on NuGet and adding NuGet packages see the [NuGet documentation](/NuGet) and [Package Manager UI](/NuGet/Tools/Package-Manager-UI) topics.
3737

3838
3. Search for VSIXSignTool from VisualStudioExtensibility and install the NuGet package.
3939

docs/ide/create-a-visual-basic-winform-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Now that we've added a button control to create an action, let's add a label con
8181

8282
2. In the **Form1.vb** window, between the **Private Sub** line and the **End Sub** line, type or paste `lblHelloWorld.Text = "Hello World!"`.
8383

84-
![Add code to the form form](../ide/media/vb-add-code-to-the-form.png)
84+
![Add code to the form](../ide/media/vb-add-code-to-the-form.png)
8585

8686
## Run the application
8787

docs/ide/optimize-visual-studio-startup-time.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.workload:
1919
---
2020
# Optimize Visual Studio startup time
2121

22-
Visual Studio is designed to start up as quickly and efficiently as possible. However, certain Visual Studio extensions and tool windows can adversely affect startup time when they are loaded. You can control the behavior of slow extensions and tool windows in the the **Manage Visual Studio Performance** dialog box. For more general tips on improving performance, see [Visual Studio performance tips and tricks](../ide/visual-studio-performance-tips-and-tricks.md).
22+
Visual Studio is designed to start up as quickly and efficiently as possible. However, certain Visual Studio extensions and tool windows can adversely affect startup time when they are loaded. You can control the behavior of slow extensions and tool windows in the **Manage Visual Studio Performance** dialog box. For more general tips on improving performance, see [Visual Studio performance tips and tricks](../ide/visual-studio-performance-tips-and-tricks.md).
2323

2424
## Startup behavior
2525

0 commit comments

Comments
 (0)