Skip to content

Commit e602af0

Browse files
Merge pull request #14031 from MicrosoftDocs/main
Merged by Learn.Build PR Management system
2 parents 11e6bb7 + b92a541 commit e602af0

File tree

29 files changed

+66
-54
lines changed

29 files changed

+66
-54
lines changed

docs/data-tools/n-tier-data-applications-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The data tier cannot be accessed directly from the client in the presentation ti
7878

7979
The following topics provide information about working with n-tier applications:
8080

81-
[Separate datasets and TableAdapters into different projects](/previous-versions/visualstudio/visual-studio-2017/data-tools/separate-datasets-and-tableadapters-into-different-projects?view=vs-2017)
81+
[Separate datasets and TableAdapters into different projects](/previous-versions/visualstudio/visual-studio-2017/data-tools/separate-datasets-and-tableadapters-into-different-projects)
8282

8383
[Walkthrough: Creating an n-tier data application](../data-tools/walkthrough-creating-an-n-tier-data-application.md)
8484

docs/data-tools/work-with-datasets-in-n-tier-applications.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ ms.subservice: data-tools
2626

2727
*N-tier data applications* are data-centric applications that are separated into multiple logical layers (or *tiers*). In other words, an n-tier data application is an application that is separated into multiple projects, with the data access tier, the business logic tier, and the presentation tier each in its own project. For more information, see [N-Tier data applications overview](../data-tools/n-tier-data-applications-overview.md).
2828

29-
Typed datasets have been enhanced so that the TableAdapters and dataset classes can be generated into discrete projects. This provides the ability to quickly separate application layers and generate n-tier data applications.
29+
With typed datasets, you can generate TableAdapters and dataset classes into discrete projects. This design lets you quickly separate application layers and generate n-tier data applications.
3030

31-
N-tier support in typed datasets enables iterative development of the application architecture to an n-tier design.It also removes the requirement to manually separate the code into more than one project. Start out designing the data layer by using the **Dataset Designer**. When you're ready to take the application architecture to an n-tiered design, set the **DataSet Project** property of a dataset to generate the dataset class into a separate project.
31+
N-tier support in typed datasets enables iterative development of the application architecture to an n-tier design. It also removes the requirement to manually separate the code into more than one project. Start out designing the data layer by using the **Dataset Designer**. When you're ready to take the application architecture to an n-tiered design, set the **DataSet Project** property of a dataset to generate the dataset class into a separate project.
3232

3333
## Reference
3434

@@ -38,13 +38,13 @@ N-tier support in typed datasets enables iterative development of the applicatio
3838
## Related content
3939

4040
- [N-Tier data applications overview](../data-tools/n-tier-data-applications-overview.md)
41-
- [Walkthrough: Creating an n-tier Data Application](../data-tools/walkthrough-creating-an-n-tier-data-application.md)
42-
- [Add code to TableAdapters in n-tier applications](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-code-to-tableadapters-in-n-tier-applications?view=vs-2017)
43-
- [Add code to datasets in n-tier applications](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-code-to-datasets-in-n-tier-applications?view=vs-2017)
44-
- [Add validation to an n-tier dataset](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-validation-to-an-n-tier-dataset?view=vs-2017)
45-
- [Separate datasets and TableAdapters into different projects](/previous-versions/visualstudio/visual-studio-2017/data-tools/separate-datasets-and-tableadapters-into-different-projects?view=vs-2017)
41+
- [Create an n-tier Data Application](../data-tools/walkthrough-creating-an-n-tier-data-application.md)
42+
- [Add code to TableAdapters in n-tier applications](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-code-to-tableadapters-in-n-tier-applications)
43+
- [Add code to datasets in n-tier applications](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-code-to-datasets-in-n-tier-applications)
44+
- [Add validation to an n-tier dataset](/previous-versions/visualstudio/visual-studio-2017/data-tools/add-validation-to-an-n-tier-dataset)
45+
- [Separate datasets and TableAdapters into different projects](/previous-versions/visualstudio/visual-studio-2017/data-tools/separate-datasets-and-tableadapters-into-different-projects)
4646
- [Hierarchical update](../data-tools/hierarchical-update.md)
4747
- [Dataset tools in Visual Studio](../data-tools/dataset-tools-in-visual-studio.md)
48-
- [Accessing data in Visual Studio](../data-tools/accessing-data-in-visual-studio.md)
48+
- [Access data in Visual Studio](../data-tools/accessing-data-in-visual-studio.md)
4949
- [Create and configure TableAdapters](../data-tools/create-and-configure-tableadapters.md)
5050
- [N-Tier and remote applications with LINQ to SQL](/dotnet/framework/data/adonet/sql/linq/n-tier-and-remote-applications-with-linq-to-sql)

docs/help-viewer/administrator-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In this article, you learn to use the Help Viewer to deploy and manage local Hel
1616

1717
If your network environment allows clients to access the internet, you can use the **Help Content Manager** executable to deploy local Help content from the internet. For more information about *HlpCtntMgr.exe* command line syntax, see [Command-line arguments for the Help Content Manager](../help-viewer/command-line-arguments.md).
1818

19-
For information about creating content, creating an intranet service endpoint, and similar types of activities, see the [Help Viewer SDK](../extensibility/internals/microsoft-help-viewer-sdk.md).
19+
For information about creating content, creating an intranet service endpoint, and similar types of activities, see the [Help Viewer SDK](/previous-versions/visualstudio/visual-studio-2017/extensibility/internals/microsoft-help-viewer-sdk).
2020

2121
If you do not have internet access in your network environment, Help Viewer can deploy local Help content from the intranet or a network share. You can also disable Visual Studio IDE Help options by using [registry key overrides](../help-viewer/behavior-overrides.md) for functionality such as:
2222

@@ -142,4 +142,4 @@ Next, you need to package the content so it can be deployed to client computers.
142142
- [Command-line arguments for the Help Content Manager](../help-viewer/command-line-arguments.md)
143143
- [Override Help Viewer defaults](../help-viewer/behavior-overrides.md)
144144
- [Microsoft Help Viewer](../help-viewer/overview.md)
145-
- [Help Viewer SDK](../extensibility/internals/microsoft-help-viewer-sdk.md)
145+
- [Help Viewer SDK](/previous-versions/visualstudio/visual-studio-2017/extensibility/internals/microsoft-help-viewer-sdk)

docs/help-viewer/find-topics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ You might enter a search string that includes multiple words, such as "word1 wor
9898

9999
> [!IMPORTANT]
100100
> - Phrase searches are not supported. If you specify more than one word in a search string, returned topics contain all the words that you specified but not necessarily the exact phrase that you specified.
101-
> - Use logical operators to specify the relationship between words in your search phrase. You can include logical operators, such as AND, OR, NOT, and NEAR, to further refine your search. For example, if you search for "declaring NEAR union", search results include topics that contain the words "declaring" and "union" no more than a few words apart from each other. For more information, see [Logical operators in search expressions](../help-viewer/logical-operators-search-expressions.md).
101+
> - Use logical operators to specify the relationship between words in your search phrase. You can include logical operators, such as AND, OR, NOT, and NEAR, to further refine your search. For example, if you search for "declaring NEAR union", search results include topics that contain the words "declaring" and "union" no more than a few words apart from each other.
102102
103103
### Filters
104104

docs/modeling/browse-and-rearrange-code-maps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,11 @@ You can change the icons on code elements and the colors of code elements and li
289289
|Specific color or icon|Open the category or property value list. Select a color or icon.|
290290

291291
> [!NOTE]
292-
> You can rearrange, delete, or temporarily inactivate styles in the **Legend** box. See [Edit the Legend box](#ModifyLegend).
292+
> You can rearrange, delete, or temporarily deactivate styles in the **Legend** box. See [Edit the Legend box](#ModifyLegend).
293293
294294
## <a name="ModifyLegend"></a> Edit the Legend box
295295

296-
You can rearrange, delete, or temporarily inactivate styles in the **Legend** box:
296+
You can rearrange, delete, or temporarily deactivate styles in the **Legend** box:
297297

298298
1. Open the shortcut menu for a style in the **Legend** box.
299299

docs/modeling/properties-of-domain-relationships.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Properties of Domain Relationships
3-
description: Learn about the properties that are associated with a domain relationshop, like Access Modifier, Custome Attributes, and Generates Double Derived.
3+
description: Learn about the properties that are associated with a domain relationship, like Access Modifier, Custom Attributes, and Generates Double Derived.
44
ms.date: 11/04/2016
55
ms.topic: reference
66
helpviewer_keywords:

docs/modeling/properties-of-domain-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Properties of Domain Roles
3-
description: Learn about the properties that are associated with a domain role, like Collection Type, Custome Attributes, and Is Property Browsable.
3+
description: Learn about the properties that are associated with a domain role, like Collection Type, Custom Attributes, and Is Property Browsable.
44
ms.date: 11/04/2016
55
ms.topic: reference
66
author: mgoertz-msft

docs/msbuild/creating-forwarding-loggers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ Forwarding loggers improve logging efficiency by letting you choose the events y
3333

3434
## Multi-processor-aware loggers
3535

36-
When you build a project on a multi-processor system, the build messages from each processor are not automatically interleaved in a unified sequence. Instead, you must establish a message grouping priority by using the <xref:Microsoft.Build.Framework.BuildEventContext> class that is attached to every message. For more information about multi-processor building, see [Logging in a multi-processor environment](../msbuild/logging-in-a-multi-processor-environment.md).
36+
When you build a project on a multi-processor system, the build messages from each processor are not automatically interleaved in a unified sequence. Instead, you must establish a message grouping priority by using the <xref:Microsoft.Build.Framework.BuildEventContext> class that is attached to every message. For more information about multi-processor building, see [Logging in a multi-processor environment](writing-multi-processor-aware-loggers.md).
3737

3838
## Related content
3939

4040
- [Obtain build logs](../msbuild/obtaining-build-logs-with-msbuild.md)
4141
- [Build loggers](../msbuild/build-loggers.md)
42-
- [Logging in a multi-processor environment](../msbuild/logging-in-a-multi-processor-environment.md)
42+
- [Logging in a multi-processor environment](writing-multi-processor-aware-loggers.md)

docs/msbuild/msbuild-errors.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,3 @@ We're sorry! It looks like we couldn't find what you were looking for.
109109
- Use the [Microsoft Learn](/) toolbar to search
110110
- Browse the Knowledge Base for [Visual Studio troubleshooting](/troubleshoot/visualstudio/welcome-visual-studio/)
111111

112-
**Didn't mean to click?** [Remap or disable the `F1` help key](../ide/not-in-toc/change-f1-help-key.md)

docs/msbuild/msbuild-multitargeting-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ By using MSBuild, you can compile an application to run on any one of several ve
4545

4646
## Troubleshooting
4747

48-
You might encounter errors if you try to reference an assembly that is not part of the target context. For more information about these errors and what to do about them, see [Troubleshoot .NET Framework targeting errors](../msbuild/troubleshooting-dotnet-framework-targeting-errors.md).
48+
You might encounter errors if you try to reference an assembly that is not part of the target context. For more information about these errors and what to do about them, see [Troubleshoot .NET Framework targeting errors](/troubleshoot/developer/visualstudio/project-build/troubleshooting-dotnet-framework-targeting-errors).

0 commit comments

Comments
 (0)