Merge pull request #758 from MicrosoftDocs/master636845572185650915

Fix git push error for protected CLA branch

Author: tfosmark

.openpublishing.redirection.json

@@ -7510,6 +7510,76 @@
             "redirect_url": "/cpp/windows/selecting-controls",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/windows/aligning-controls-on-a-guide.md",
+            "redirect_url": "/cpp/windows/dialog-editor-states-guides-and-grids",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/creating-and-setting-guides-and-margins.md",
+            "redirect_url": "/cpp/windows/dialog-editor-states-guides-and-grids",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/disabling-guides.md",
+            "redirect_url": "/cpp/windows/dialog-editor-states-guides-and-grids",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/guide-settings-dialog-box.md",
+            "redirect_url": "/cpp/windows/dialog-editor-states-guides-and-grids",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/modifying-the-layout-grid.md",
+            "redirect_url": "/cpp/windows/dialog-editor-states-guides-and-grids",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/arranging-push-buttons-along-the-right-or-bottom-of-a-dialog-box.md",
+            "redirect_url": "/cpp/windows/aligning-groups-of-controls",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/centering-controls-in-a-dialog-box.md",
+            "redirect_url": "/cpp/windows/aligning-groups-of-controls",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/evening-the-spacing-between-controls.md",
+            "redirect_url": "/cpp/windows/aligning-groups-of-controls",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/adding-controls-to-a-dialog-causes-the-dialog-to-no-longer-function.md",
+            "redirect_url": "/cpp/windows/troubleshooting-the-dialog-editor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/using-the-richedit-1-0-control-with-mfc.md",
+            "redirect_url": "/cpp/windows/troubleshooting-the-dialog-editor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/cropping-or-extending-an-entire-image-image-editor-for-icons.md",
+            "redirect_url": "/cpp/windows/resizing-an-image-image-editor-for-icons",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/resizing-an-entire-image-image-editor-for-icons.md",
+            "redirect_url": "/cpp/windows/resizing-an-image-image-editor-for-icons",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/shrinking-or-stretching-an-entire-image-image-editor-for-icons.md",
+            "redirect_url": "/cpp/windows/resizing-an-image-image-editor-for-icons",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/shrinking-or-stretching-part-of-an-image-image-editor-for-icons.md",
+            "redirect_url": "/cpp/windows/resizing-an-image-image-editor-for-icons",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
             "redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

docs/windows/TOC.md

@@ -81,25 +81,15 @@
 ###### [Setting the Width of a Horizontal Scroll Bar](setting-the-width-of-a-horizontal-scroll-bar.md)
 ###### [Arrangement of Controls on Dialog Boxes](arrangement-of-controls-on-dialog-boxes.md)
 ####### [Dialog Editor States (Guides and Grids)](dialog-editor-states-guides-and-grids.md)
-######## [Creating and Setting Guides and Margins](creating-and-setting-guides-and-margins.md)
-######## [Aligning Controls on a Guide](aligning-controls-on-a-guide.md)
-######## [Disabling Guides](disabling-guides.md)
-######## [Modifying the Layout Grid](modifying-the-layout-grid.md)
-######### [Guide Settings Dialog Box](guide-settings-dialog-box.md)
 ####### [Grouping Radio Buttons on a Dialog Box](grouping-radio-buttons-on-a-dialog-box.md)
-####### [Aligning Groups of Controls](aligning-groups-of-controls.md)
-####### [Evening the Spacing Between Controls](evening-the-spacing-between-controls.md)
-####### [Centering Controls in a Dialog Box](centering-controls-in-a-dialog-box.md)
-####### [Arranging Push Buttons Along the Right or Bottom of a Dialog Box](arranging-push-buttons-along-the-right-or-bottom-of-a-dialog-box.md)
+####### [Align Controls](aligning-groups-of-controls.md)
 ####### [Changing the Tab Order of Controls](changing-the-tab-order-of-controls.md)
 ###### [Custom Controls in the Dialog Editor](custom-controls-in-the-dialog-editor.md)
 ###### [Defining Mnemonics (Access Keys)](defining-mnemonics-access-keys.md)
 ###### [Specifying the Location and Size of a Dialog Box](specifying-the-location-and-size-of-a-dialog-box.md)
 ###### [Testing a Dialog Box](testing-a-dialog-box.md)
 ##### [Accelerator Keys for the Dialog Editor](accelerator-keys-for-the-dialog-editor.md)
 ##### [Troubleshooting the Dialog Editor](troubleshooting-the-dialog-editor.md)
-###### [Adding Controls to a Dialog Causes the Dialog to No Longer Function](adding-controls-to-a-dialog-causes-the-dialog-to-no-longer-function.md)
-###### [Using the RichEdit 1.0 Control with MFC](using-the-richedit-1-0-control-with-mfc.md)
 ##### [Defining Member Variables for Dialog Controls](defining-member-variables-for-dialog-controls.md)
 #### [Image Editor for Icons](image-editor-for-icons.md)
 ##### [Editing Graphical Resources (Image Editor for Icons)](editing-graphical-resources-image-editor-for-icons.md)
@@ -110,10 +100,6 @@
 ###### [Editing Parts of an Image (Image Editor for Icons)](editing-parts-of-an-image-image-editor-for-icons.md)
 ###### [Flipping an Image (Image Editor for Icons)](flipping-an-image-image-editor-for-icons.md)
 ###### [Resizing an Image (Image Editor for Icons)](resizing-an-image-image-editor-for-icons.md)
-####### [Resizing an Entire Image (Image Editor for Icons)](resizing-an-entire-image-image-editor-for-icons.md)
-####### [Cropping or Extending an Entire Image (Image Editor for Icons)](cropping-or-extending-an-entire-image-image-editor-for-icons.md)
-####### [Shrinking or Stretching an Entire Image (Image Editor for Icons)](shrinking-or-stretching-an-entire-image-image-editor-for-icons.md)
-####### [Shrinking or Stretching Part of an Image (Image Editor for Icons)](shrinking-or-stretching-part-of-an-image-image-editor-for-icons.md)
 ###### [Creating a Custom Brush (Image Editor for Icons)](creating-a-custom-brush-image-editor-for-icons.md)
 ###### [Changing Image Properties (Image Editor for Icons)](changing-image-properties-image-editor-for-icons.md)
 ###### [Saving Bitmaps as GIFs or JPEGs (Image Editor for Icons)](saving-bitmaps-as-gifs-or-jpegs-image-editor-for-icons.md)

docs/windows/adding-controls-to-a-dialog-causes-the-dialog-to-no-longer-function.md

@@ -1,20 +1,22 @@
 ---
-title: "Aligning Groups of Controls"
+title: "Align Controls"
 ms.date: "11/04/2016"
-helpviewer_keywords: ["controls [C++], aligning"]
+helpviewer_keywords: ["controls [C++], aligning", "controls [C++], positioning", "Space Evenly command", "dialog box controls [C++], placement", "Center in Dialog command", "Arrange Buttons command", "buttons, arranging push buttons in dialog boxes", "push buttons"]
 ms.assetid: a4f49a73-4a17-44b3-8568-aa35f646b5cf
 ---
-# Aligning Groups of Controls
+# Align Controls
 
-The following procedure shows you how to align groups of controls.
+For information on adding resources to managed projects, see [Resources in Desktop Apps](/dotnet/framework/resources/index) in the *.NET Framework Developer's Guide*. For information on manually adding resource files to managed projects, accessing resources, displaying static resources, and assigning resource strings to properties, see [Creating Resource Files for Desktop Apps](/dotnet/framework/resources/creating-resource-files-for-desktop-apps). For information on globalization and localization of resources in managed apps, see [Globalizing and Localizing .NET Framework Applications](/dotnet/standard/globalization-localization/index).
 
-### To align groups of controls
+The following procedures show you how to align controls:
+
+## To align groups of controls
 
 1. [Select the controls](../windows/selecting-multiple-controls.md) you want to align. Be sure to select the control that you want to be the dominant control first or set it to be the dominant control before executing the alignment or sizing command.
 
    The final position of the group of controls depends on the position of the dominant control. For more information on selecting the dominant control, see [Specifying the Dominant Control](../windows/specifying-the-dominant-control.md).
 
-2. From the **Format** menu, choose **Align**, and then choose one of the following alignments:
+1. From the **Format** menu, choose **Align**, and then choose one of the following alignments:
 
    - `Lefts`: aligns the selected controls along their left sides.
 
@@ -28,7 +30,39 @@ The following procedure shows you how to align groups of controls.
 
    - `Bottoms`: aligns the selected controls along their bottom edges.
 
-For information on adding resources to managed projects, please see [Resources in Desktop Apps](/dotnet/framework/resources/index) in the *.NET Framework Developer's Guide*. For information on manually adding resource files to managed projects, accessing resources, displaying static resources, and assigning resource strings to properties, see [Creating Resource Files for Desktop Apps](/dotnet/framework/resources/creating-resource-files-for-desktop-apps). For information on globalization and localization of resources in managed apps, see [Globalizing and Localizing .NET Framework Applications](/dotnet/standard/globalization-localization/index).
+## To even the spacing between controls
+
+The **Dialog** editor enables you to space controls evenly between the outermost controls selected.
+
+1. Select the controls you want to rearrange.
+
+1. From the **Format** menu, choose **Space Evenly**, and then choose one of the following spacing alignments:
+
+   - `Across`: space controls evenly between the leftmost and the rightmost control selected.
+
+   - `Down`: space controls evenly between the topmost and the bottommost control selected.
+
+## To center controls in a dialog box
+
+1. Select the control or controls you want to rearrange.
+
+1. From the **Format** menu, choose **Center In Dialog**, and then choose one of the following arrangements:
+
+   - `Vertical`: center controls vertically in the dialog box.
+
+   - `Horizontal`: center controls horizontally in the dialog box.
+
+## To arrange push buttons along the right or bottom of a dialog box
+
+1. Select one or more push buttons.
+
+1. From the **Format** menu, choose **Arrange Buttons**, and then choose one of the following arrangements:
+
+   - `Right`: aligns push buttons along the right edge of the dialog box.
+
+   - `Bottom`: aligns push buttons along the bottom edge of the dialog box.
+
+       If you select a control other than a push button, its position isn't affected.
 
 ## Requirements