Skip to content

Commit e62bfd8

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#781 from MicrosoftDocs/master636851617169738184
Fix git push error for protected CLA branch
2 parents 110561b + 71382cf commit e62bfd8

33 files changed

Lines changed: 606 additions & 947 deletions

File tree

‎.openpublishing.redirection.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7780,6 +7780,106 @@
77807780
"redirect_url": "/cpp/windows/how-to-include-resources-at-compile-time",
77817781
"redirect_document_id": false
77827782
},
7783+
{
7784+
"source_path": "docs/windows/how-to-change-the-language-or-condition-of-a-resource-while-copying.md",
7785+
"redirect_url": "/cpp/windows/how-to-copy-resources",
7786+
"redirect_document_id": false
7787+
},
7788+
{
7789+
"source_path": "docs/windows/how-to-open-a-manifest-resource.md",
7790+
"redirect_url": "/cpp/windows/manifest-resources",
7791+
"redirect_document_id": false
7792+
},
7793+
{
7794+
"source_path": "docs/windows/how-to-open-a-resource-script-file-outside-of-a-project-standalone.md",
7795+
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
7796+
"redirect_document_id": false
7797+
},
7798+
{
7799+
"source_path": "docs/windows/how-to-open-a-resource-script-file-in-text-format.md",
7800+
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
7801+
"redirect_document_id": false
7802+
},
7803+
{
7804+
"source_path": "docs/windows/grid-settings-dialog-box-image-editor-for-icons.md",
7805+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7806+
"redirect_document_id": false
7807+
},
7808+
{
7809+
"source_path": "docs/windows/selecting-foreground-or-background-colors-image-editor-for-icons.md",
7810+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7811+
"redirect_document_id": false
7812+
},
7813+
{
7814+
"source_path": "docs/windows/filling-a-bounded-area-of-an-image-with-a-color-image-editor-for-icons.md",
7815+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7816+
"redirect_document_id": false
7817+
},
7818+
{
7819+
"source_path": "docs/windows/picking-up-a-color-from-an-image-to-use-elsewhere-image-editor-for-icons.md",
7820+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7821+
"redirect_document_id": false
7822+
},
7823+
{
7824+
"source_path": "docs/windows/choosing-a-transparent-or-opaque-background-image-editor-for-icons.md",
7825+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7826+
"redirect_document_id": false
7827+
},
7828+
{
7829+
"source_path": "docs/windows/inverting-the-colors-in-a-selection-image-editor-for-icons.md",
7830+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7831+
"redirect_document_id": false
7832+
},
7833+
{
7834+
"source_path": "docs/windows/customizing-or-changing-colors-image-editor-for-icons.md",
7835+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7836+
"redirect_document_id": false
7837+
},
7838+
{
7839+
"source_path": "docs/windows/saving-and-loading-different-color-palettes-image-editor-for-icons.md",
7840+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7841+
"redirect_document_id": false
7842+
},
7843+
{
7844+
"source_path": "docs/windows/colors-window-image-editor-for-icons.md",
7845+
"redirect_url": "/cpp/windows/image-menu-image-editor-for-icons",
7846+
"redirect_document_id": false
7847+
},
7848+
{
7849+
"source_path": "docs/windows/creating-a-device-image-image-editor-for-icons.md",
7850+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7851+
"redirect_document_id": false
7852+
},
7853+
{
7854+
"source_path": "docs/windows/adding-an-image-for-a-different-display-device-image-editor-for-icons.md",
7855+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7856+
"redirect_document_id": false
7857+
},
7858+
{
7859+
"source_path": "docs/windows/copying-a-device-image-image-editor-for-icons.md",
7860+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7861+
"redirect_document_id": false
7862+
},
7863+
{
7864+
"source_path": "docs/windows/deleting-a-device-image-image-editor-for-icons.md",
7865+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7866+
"redirect_document_id": false
7867+
},
7868+
{
7869+
"source_path": "docs/windows/creating-transparent-or-inverse-regions-in-device-images.md",
7870+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7871+
"redirect_document_id": false
7872+
},
7873+
{
7874+
"source_path": "docs/windows/creating-a-256-color-icon-or-cursor-image-editor-for-icons.md",
7875+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7876+
"redirect_document_id": false
7877+
},
7878+
{
7879+
"source_path": "docs/windows/setting-a-cursor-s-hot-spot-image-editor-for-icons.md",
7880+
"redirect_url": "/cpp/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons",
7881+
"redirect_document_id": false
7882+
},
77837883
{
77847884
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
77857885
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

‎docs/atl/atl-support-for-dhtml-controls.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Using ATL, you can create a control with Dynamic HTML (DHTML) capability. An ATL
1212

1313
- Specifies, using HTML, the user interface (UI) of the DHTML control.
1414

15-
- Accesses the WebBrowser object and its methods through its interface, [IWebBrowser2](https://msdn.microsoft.com/library/aa752127.aspx).
15+
- Accesses the WebBrowser object and its methods through its interface, [IWebBrowser2](/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa752127\(v=vs.85\)).
1616

1717
- Manages communication between C++ code and HTML.
1818

‎docs/build/reference/execution-charset-set-execution-character-set.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "/execution-charset (Set Execution Character Set)"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/06/2019"
44
f1_keywords: ["execution-charset", "/execution-charset"]
55
helpviewer_keywords: ["/execution-charset compiler option", "-execution-charset compiler option"]
66
ms.assetid: 0e02f487-2236-45bc-95f3-5760933a8f96
@@ -37,7 +37,7 @@ If you want to set both the source character set and the execution character set
3737

3838
1. Expand the **Configuration Properties**, **C/C++**, **Command Line** folder.
3939

40-
1. In **Advanced Options**, add the **/execution-charset** option, and specify your preferred encoding.
40+
1. In **Additional Options**, add the **/execution-charset** option, and specify your preferred encoding.
4141

4242
1. Choose **OK** to save your changes.
4343

‎docs/build/reference/source-charset-set-source-character-set.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "/source-charset (Set Source Character Set)"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/06/2019"
44
f1_keywords: ["source-charset", "/source-charset"]
55
helpviewer_keywords: ["/execution-charset compiler option"]
66
ms.assetid: d3c5bf7f-526d-4ee4-acc5-c1a02a4fc481
@@ -39,7 +39,7 @@ If you want to set both the source character set and the execution character set
3939

4040
1. Expand the **Configuration Properties**, **C/C++**, **Command Line** folder.
4141

42-
1. In **Advanced Options**, add the **/source-charset** option, and specify your preferred encoding.
42+
1. In **Additional Options**, add the **/source-charset** option, and specify your preferred encoding.
4343

4444
1. Choose **OK** to save your changes.
4545

‎docs/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ By default, Visual Studio detects a byte-order mark to determine if the source f
2727

2828
1. Expand the **Configuration Properties**, **C/C++**, **Command Line** folder.
2929

30-
1. In **Advanced Options**, add the **/utf-8** option, and specify your preferred encoding.
30+
1. In **Additional Options**, add the **/utf-8** option to specify your preferred encoding.
3131

3232
1. Choose **OK** to save your changes.
3333

‎docs/build/reference/validate-charset-validate-for-compatible-characters.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "/validate-charset (Validate for compatible characters)"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/06/2019"
44
f1_keywords: ["/validate-charset", "validate-charset"]
55
helpviewer_keywords: ["/validate-charset compiler option"]
66
ms.assetid: 50360fd0-4d32-4a4f-95d0-53d38c12ad4c
@@ -29,7 +29,7 @@ Visual Studio uses UTF-8 as the internal character encoding during conversion be
2929

3030
1. Expand the **Configuration Properties**, **C/C++**, **Command Line** folder.
3131

32-
1. In **Advanced Options**, add the **/validate-charset** option, and specify your preferred encoding.
32+
1. In **Additional Options**, add the **/validate-charset** option, and specify your preferred encoding.
3333

3434
1. Choose **OK** to save your changes.
3535

‎docs/windows/TOC.md‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,16 @@
1212
### [Resource Files (Visual Studio)](resource-files-visual-studio.md)
1313
#### [How to: Create a Resource Script File](how-to-create-a-resource-script-file.md)
1414
#### [How to: Create a Resource](how-to-create-a-resource.md)
15-
#### [How to: Open a Resource Script File Outside of a Project (Standalone)](how-to-open-a-resource-script-file-outside-of-a-project-standalone.md)
16-
#### [How to: Open a Resource Script File in Text Format](how-to-open-a-resource-script-file-in-text-format.md)
1715
#### [How to: Add MFC Support to Resource Script Files](how-to-add-mfc-support-to-resource-script-files.md)
1816
#### [How to: Include Resources at Compile Time](how-to-include-resources-at-compile-time.md)
1917
#### [How to: Copy Resources](how-to-copy-resources.md)
20-
##### [How to: Change the Language or Condition of a Resource While Copying](how-to-change-the-language-or-condition-of-a-resource-while-copying.md)
2118
#### [How to: Search for Symbols in Resources](how-to-search-for-symbols-in-resources.md)
2219
#### [How to: Use Resource Templates](how-to-use-resource-templates.md)
2320
#### [How to: Import and Export Resources](how-to-import-and-export-resources.md)
2421
#### [Editable File Types for Resources](editable-file-types-for-resources.md)
2522
#### [Editing Managed Resource Files](editing-managed-resource-files.md)
2623
#### [Files Affected by Resource Editing](files-affected-by-resource-editing.md)
2724
#### [Manifest Resources](manifest-resources.md)
28-
##### [How to: Open a Manifest Resource](how-to-open-a-manifest-resource.md)
2925
### [Symbols: Resource Identifiers](symbols-resource-identifiers.md)
3026
#### [Viewing Resource Symbols](viewing-resource-symbols.md)
3127
#### [Creating New Symbols](creating-new-symbols.md)
@@ -80,26 +76,10 @@
8076
###### [Converting an Image From One Format to Another (Image Editor for Icons)](converting-an-image-from-one-format-to-another-image-editor-for-icons.md)
8177
###### [Editing an Image Outside of a Project (Image Editor for Icons)](editing-an-image-outside-of-a-project-image-editor-for-icons.md)
8278
###### [Image Menu (Image Editor for Icons)](image-menu-image-editor-for-icons.md)
83-
####### [Grid Settings Dialog Box (Image Editor for Icons)](grid-settings-dialog-box-image-editor-for-icons.md)
8479
###### [Toolbar (Image Editor for Icons)](toolbar-image-editor-for-icons.md)
8580
###### [Window Panes (Image Editor for Icons)](window-panes-image-editor-for-icons.md)
8681
##### [Working with Color (Image Editor for Icons)](working-with-color-image-editor-for-icons.md)
87-
###### [Selecting Foreground or Background Colors (Image Editor for Icons)](selecting-foreground-or-background-colors-image-editor-for-icons.md)
88-
###### [Filling a Bounded Area of an Image with a Color (Image Editor for Icons)](filling-a-bounded-area-of-an-image-with-a-color-image-editor-for-icons.md)
89-
###### [Picking up a Color from an Image to Use Elsewhere (Image Editor for Icons)](picking-up-a-color-from-an-image-to-use-elsewhere-image-editor-for-icons.md)
90-
###### [Choosing a Transparent or Opaque Background (Image Editor for Icons)](choosing-a-transparent-or-opaque-background-image-editor-for-icons.md)
91-
###### [Inverting the Colors in a Selection (Image Editor for Icons)](inverting-the-colors-in-a-selection-image-editor-for-icons.md)
92-
###### [Customizing or Changing Colors (Image Editor for Icons)](customizing-or-changing-colors-image-editor-for-icons.md)
93-
###### [Saving and Loading Different Color Palettes (Image Editor for Icons)](saving-and-loading-different-color-palettes-image-editor-for-icons.md)
94-
###### [Colors Window (Image Editor for Icons)](colors-window-image-editor-for-icons.md)
9582
##### [Icons and Cursors: Image Resources for Display Devices (Image Editor for Icons)](icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons.md)
96-
###### [Creating a Device Image (Image Editor for Icons)](creating-a-device-image-image-editor-for-icons.md)
97-
###### [Adding an Image for a Different Display Device (Image Editor for Icons)](adding-an-image-for-a-different-display-device-image-editor-for-icons.md)
98-
###### [Copying a Device Image (Image Editor for Icons)](copying-a-device-image-image-editor-for-icons.md)
99-
###### [Deleting a Device Image (Image Editor for Icons)](deleting-a-device-image-image-editor-for-icons.md)
100-
###### [Creating Transparent or Inverse Regions in Device Images (Image Editor for Icons)](creating-transparent-or-inverse-regions-in-device-images.md)
101-
###### [Using the 256-Color Palette (Image Editor for Icons)](creating-a-256-color-icon-or-cursor-image-editor-for-icons.md)
102-
###### [Setting a Cursor's Hot Spot (Image Editor for Icons)](setting-a-cursor-s-hot-spot-image-editor-for-icons.md)
10383
##### [Accelerator Keys (Image Editor for Icons)](accelerator-keys-image-editor-for-icons.md)
10484
#### [Menu Editor](menu-editor.md)
10585
##### [Creating a Menu](creating-a-menu.md)

‎docs/windows/adding-an-image-for-a-different-display-device-image-editor-for-icons.md‎

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

‎docs/windows/choosing-a-transparent-or-opaque-background-image-editor-for-icons.md‎

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

‎docs/windows/colors-window-image-editor-for-icons.md‎

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

0 commit comments

Comments
 (0)