Skip to content

Commit 1f46765

Browse files
author
mikeblome
committed
fixed merge conflict
2 parents 41f7730 + 1a4897b commit 1f46765

67 files changed

Lines changed: 95 additions & 92 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.redirection.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@
122122
"redirect_url": "/cpp/atl/atl-com-desktop-components",
123123
"redirect_document_id": false
124124
},
125+
{
126+
"source_path": "docs/atl/understanding-backus-nauer-form-bnf-syntax.md",
127+
"redirect_url": "/cpp/atl/understanding-backus-naur-form-bnf-syntax",
128+
"redirect_document_id": true
129+
},
125130
{
126131
"source_path": "docs/atl/which-atl-classes-facilitate-activex-control-containment-q.md",
127132
"redirect_url": "/cpp/atl/atl-control-containment-faq",

‎docs/assembler/masm/microsoft-macro-assembler-reference.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Information about how to create output files for x64.
3333

3434
## Related Sections
3535

36-
[Visual C++](../../overview/visual-cpp-in-visual-studio.md)<br/>
36+
[C++ in Visual Studio](../../overview/visual-cpp-in-visual-studio.md)<br/>
3737
Provides links to different areas of the Visual Studio and Visual C++ documentation.
3838

3939
## See also

‎docs/atl/TOC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
## [ATL Collection Classes](atl-collection-classes.md)
9696
## [ATL Registry Component (Registrar)](atl-registry-component-registrar.md)
9797
### [Creating Registrar Scripts](creating-registrar-scripts.md)
98-
#### [Understanding Backus Nauer Form (BNF) Syntax](understanding-backus-nauer-form-bnf-syntax.md)
98+
#### [Understanding Backus-Naur form (BNF) syntax](understanding-backus-naur-form-bnf-syntax.md)
9999
#### [Understanding Parse Trees](understanding-parse-trees.md)
100100
#### [Registry Scripting Examples](registry-scripting-examples.md)
101101
#### [Using Replaceable Parameters (The Registrar's Preprocessor)](using-replaceable-parameters-the-registrar-s-preprocessor.md)

‎docs/atl/creating-registrar-scripts.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: "Creating Scripts for ATL Registrar"
3-
ms.date: "11/04/2016"
2+
title: "Creating scripts for ATL Registrar"
3+
ms.date: "05/14/2014"
44
helpviewer_keywords: ["scripting, registry scripting", "ATL, registry", "registrar scripts [ATL]", "scripts, Registrar scripts", "scripts, creating"]
55
ms.assetid: cbd5024b-8061-4a71-be65-7fee90374a35
66
---
7-
# Creating Registrar Scripts
7+
# Creating Registrar scripts
88

99
A registrar script provides data-driven, rather than API-driven, access to the system registry. Data-driven access is typically more efficient since it takes only one or two lines in a script to add a key to the registry.
1010

@@ -14,7 +14,7 @@ The ATL Registrar's Script Engine processes your registrar script at run time. A
1414

1515
This article covers the following topics related to the registrar scripts:
1616

17-
- [Understanding Backus Nauer Form (BNF) Syntax](../atl/understanding-backus-nauer-form-bnf-syntax.md)
17+
- [Understanding Backus-Naur form (BNF) syntax](../atl/understanding-backus-naur-form-bnf-syntax.md)
1818

1919
- [Understanding Parse Trees](../atl/understanding-parse-trees.md)
2020

‎docs/atl/example-implementing-a-property-page.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The ATL Property Page wizard is not available in Visual Studio 2019 and later.
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
This example shows how to build a property page that displays (and allows you to change) properties of the [Document Classes](../mfc/document-classes.md) interface.
1818

‎docs/atl/implementing-property-pages.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The ATL Property Page wizard is not available in Visual Studio 2019 and later.
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
Property pages are COM objects that implement the `IPropertyPage` or `IPropertyPage2` interface. ATL provides support for implementing property pages through the [ATL Property Page Wizard](../atl/reference/atl-property-page-wizard.md) in the [Add Class dialog box](../ide/add-class-dialog-box.md).
1818

‎docs/atl/reference/adding-an-atl-active-server-page-component.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The ATL Active Server Pages component wizard is not available in Visual Studio 2
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
To add an Active Template Library (ATL) object to your project, your project must have been created as an ATL COM application or as an MFC application that contains ATL support. You can use the [ATL Project Wizard](../../atl/reference/atl-project-wizard.md) to create an ATL application, you can select **Add ATL Support to MFC** from the [Add Class Dialog Box](../../ide/add-class-dialog-box.md) dialog box, or you can [add an ATL object to your MFC application](../../mfc/reference/adding-atl-support-to-your-mfc-project.md) to implement ATL support for an MFC application.
1818

‎docs/atl/reference/adding-an-atl-ole-db-consumer.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The ATL OLE DB Consumer wizard is not available in Visual Studio 2019 and later.
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
Use this wizard to add an ATL OLE DB consumer to a project. An ATL OLE DB consumer consists of an OLE DB accessor class and data bindings necessary to access a data source. The project must have been created as an ATL COM application, or as an MFC or Win32 application that contains ATL support (which the ATL OLE DB Consumer Wizard adds automatically).
1818

‎docs/atl/reference/adding-an-atl-ole-db-provider.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The ATL OLE DB Provider wizard is not available in Visual Studio 2019 and later.
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
Use this wizard to add an ATL OLE DB provider to a project. An ATL OLE DB provider consists of a data source, session, command, and rowset classes. The project must have been created as an ATL COM application.
1818

‎docs/atl/reference/atl-active-server-page-component-wizard.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This wizard is not available in Visual Studio 2019 and later.
1212

1313
::: moniker-end
1414

15-
::: moniker range="vs-2017"
15+
::: moniker range="<=vs-2017"
1616

1717
This wizard inserts into the project an Active Server Pages (ASP) component. The Microsoft Internet Information Services (IIS) uses ASP components as part of its enhanced Web page development architecture.
1818

0 commit comments

Comments
 (0)