Skip to content

Commit 1949098

Browse files
Merge pull request #10885 from MicrosoftDocs/main638865146815669499sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents dde45fd + 03f3985 commit 1949098

22 files changed

+83
-310
lines changed

.openpublishing.redirection.json

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20761,6 +20761,41 @@
2076120761
"source_path": "docs/debugger/specify-command-line-arguments.md",
2076220762
"redirect_url": "/visualstudio/debugger/project-settings-for-a-cpp-debug-configuration",
2076320763
"redirect_document_id": false
20764+
},
20765+
{
20766+
"source_path": "docs/ide/reference/options-text-editor-html-miscellaneous.md",
20767+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-text-editor-html-miscellaneous",
20768+
"redirect_document_id": false
20769+
},
20770+
{
20771+
"source_path": "docs/ide/reference/options-text-editor-usql-intellisense.md",
20772+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-text-editor-usql-intellisense",
20773+
"redirect_document_id": false
20774+
},
20775+
{
20776+
"source_path": "docs/ide/reference/visual-basic-defaults-projects-options-dialog-box.md",
20777+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/visual-basic-defaults-projects-options-dialog-box",
20778+
"redirect_document_id": false
20779+
},
20780+
{
20781+
"source_path": "docs/ide/reference/startup-environment-options-dialog-box.md",
20782+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/startup-environment-options-dialog-box",
20783+
"redirect_document_id": false
20784+
},
20785+
{
20786+
"source_path": "docs/ide/reference/options-text-editor-html-validation.md",
20787+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-text-editor-html-validation",
20788+
"redirect_document_id": false
20789+
},
20790+
{
20791+
"source_path": "docs/ide/reference/options-dialog-box-projects-and-solutions-web-projects.md",
20792+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-dialog-box-projects-and-solutions-web-projects",
20793+
"redirect_document_id": false
20794+
},
20795+
{
20796+
"source_path": "docs/ide/reference/options-text-editor-fsharp-codelens.md",
20797+
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-text-editor-fsharp-codelens",
20798+
"redirect_document_id": false
2076420799
}
2076520800
]
20766-
}
20801+
}

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/ide/reference/options-dialog-box-projects-and-solutions-build-and-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ Instructs Visual Studio to run all compile and link processes at "Below normal"
6363

6464
- [Compiling and Building](../../ide/compiling-and-building-in-visual-studio.md)
6565
- [Options Dialog Box, Projects and Solutions](projects-and-solutions-options-dialog-box.md)
66-
- [Options Dialog Box, Projects and Solutions, Web Projects](options-dialog-box-projects-and-solutions-web-projects.md)
66+
- [Options Dialog Box, Projects and Solutions, Web Projects](/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-dialog-box-projects-and-solutions-web-projects)

docs/ide/reference/options-dialog-box-projects-and-solutions-web-projects.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

docs/ide/reference/options-text-editor-fsharp-codelens.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

docs/ide/reference/options-text-editor-html-miscellaneous.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

docs/ide/reference/options-text-editor-html-validation.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

docs/ide/reference/options-text-editor-usql-intellisense.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy