Merge branch 'master' into live

Fix merge conflicts
MicrosoftDocs · Aug 26, 2018 · 462518d · 462518d
2 parents 663aa3b + 207bc69
commit 462518d
Show file tree

Hide file tree

Showing 3,824 changed files with 34,955 additions and 1,004 deletions.
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -0,0 +1,8 @@
+{
+    "redirections": [
+        {
+            "redirect_url": "/office/vba/api/overview",
+            "source_path": "index.md" 
+        }
+    ]
+}
diff --git a/Language/Concepts/Forms/add-a-watch-expression.md b/Language/Concepts/Forms/add-a-watch-expression.md
@@ -11,7 +11,11 @@ ms.date: 06/08/2017
 
 # Add a Watch Expression
 
+<<<<<<< HEAD
 A watch expression is an expression you define to be monitored in the  **Watch** window. When your application enters[break mode](../../Glossary/vbe-glossary.md), the watch expressions you selected appear in the  **Watch** window where you can observe their values.
+=======
+A watch expression is an expression you define to be monitored in the  **Watch** window. When your application enters[break mode](../../Glossary/vbe-glossary.md#break-mode), the watch expressions you selected appear in the  **Watch** window where you can observe their values.
+>>>>>>> master
 
  **To add a watch expression**
 
@@ -20,11 +24,19 @@ A watch expression is an expression you define to be monitored in the  **Watch**
 
 1. On the  **Debug** menu, click **Add Watch**. The **Add Watch** dialog box is displayed.
 
+<<<<<<< HEAD
 2. If an [expression](../../Glossary/vbe-glossary.md) is already selected in the **Code** window, it is automatically displayed in the **Expression** box. If no expression is displayed, enter the expression you want to evaluate. The expression can be a[variable](../../Glossary/vbe-glossary.md), a [property](../../Glossary/vbe-glossary.md), a function call, or any other valid expression.
 
 3. Select a [module](../../Glossary/vbe-glossary.md) or[procedure](../../Glossary/vbe-glossary.md) context in the **Context** group to select the range for which the expression will be evaluated.
 
      **Note**  Select the narrowest [scope](../../Glossary/vbe-glossary.md) that fits your needs. Selecting all procedures or all modules can slow down module execution considerably, since the expression is evaluated after execution of each statement. If you select a specific procedure for a context, execution is affected only while the procedure is in the list of active procedure calls. Choose **Call Stack** from the **View** menu to display the list of active procedures.
+=======
+2. If an [expression](../../Glossary/vbe-glossary.md#expression) is already selected in the **Code** window, it is automatically displayed in the **Expression** box. If no expression is displayed, enter the expression you want to evaluate. The expression can be a[variable](../../Glossary/vbe-glossary.md#variable), a [property](../../Glossary/vbe-glossary.md#property), a function call, or any other valid expression.
+
+3. Select a [module](../../Glossary/vbe-glossary.md#module) or[procedure](../../Glossary/vbe-glossary.md#procedure) context in the **Context** group to select the range for which the expression will be evaluated.
+
+     **Note**  Select the narrowest [scope](../../Glossary/vbe-glossary.md#scope) that fits your needs. Selecting all procedures or all modules can slow down module execution considerably, since the expression is evaluated after execution of each statement. If you select a specific procedure for a context, execution is affected only while the procedure is in the list of active procedure calls. Choose **Call Stack** from the **View** menu to display the list of active procedures.
+>>>>>>> master
 4. Select an option in the  **Watch Type** group to define how the system responds to the watch expression.
 
 

diff --git a/Language/Concepts/Forms/adjust-horizontal-and-vertical-spacing-between-controls.md b/Language/Concepts/Forms/adjust-horizontal-and-vertical-spacing-between-controls.md
@@ -24,7 +24,11 @@ ms.date: 06/08/2017
 
       -  **Make Equal** — to make all horizontal and vertical spaces between controls the same size. The amount of horizontal and vertical space will vary depending on the area available for displaying controls and the combined width of all controls.
 
+<<<<<<< HEAD
   -  **Increase** — to increase the space between controls by one[grid block](../../Glossary/glossary-vba.md).
+=======
+  -  **Increase** — to increase the space between controls by one[grid block](../../Glossary/glossary-vba.md#grid-block).
+>>>>>>> master
     
   -  **Decrease** — to decrease the space between controls by one grid block.
 

diff --git a/Language/Concepts/Forms/align-controls.md b/Language/Concepts/Forms/align-controls.md
@@ -16,7 +16,11 @@ ms.date: 06/08/2017
 
 1. Select the controls to align.
 
+<<<<<<< HEAD
 2. Select the [dominant control](../../Glossary/glossary-vba.md).
+=======
+2. Select the [dominant control](../../Glossary/glossary-vba.md#dominant-control).
+>>>>>>> master
     
 3. From the  **Format** menu, choose **Align**.
 

diff --git a/Language/Concepts/Forms/assign-a-control-tip-to-a-control.md b/Language/Concepts/Forms/assign-a-control-tip-to-a-control.md
@@ -18,7 +18,11 @@ ms.date: 06/08/2017
 
 2. In the  **Properties** window, select the **ControlTipText** property. You can also set the value of **ControlTipText** through code.
 
+<<<<<<< HEAD
 3. Enter the string you want to use as the [control tip](../../Glossary/glossary-vba.md).
+=======
+3. Enter the string you want to use as the [control tip](../../Glossary/glossary-vba.md#control-tip).
+>>>>>>> master
     
 
 

diff --git a/Language/Concepts/Forms/assign-a-control-tip-to-a-page-or-tab.md b/Language/Concepts/Forms/assign-a-control-tip-to-a-page-or-tab.md
@@ -20,7 +20,11 @@ ms.date: 06/08/2017
 
 3. From the shortcut menu, choose  **Rename**.
 
+<<<<<<< HEAD
 4. In the  **ControlTipText** field, type the string you want to use as the[control tip](../../Glossary/glossary-vba.md).
+=======
+4. In the  **ControlTipText** field, type the string you want to use as the[control tip](../../Glossary/glossary-vba.md#control-tip).
+>>>>>>> master
     
 5. Click OK.
 

diff --git a/Language/Concepts/Forms/make-controls-the-same-size.md b/Language/Concepts/Forms/make-controls-the-same-size.md
@@ -16,7 +16,11 @@ ms.date: 06/08/2017
 
 1. Select all the controls you want to be the same size.
 
+<<<<<<< HEAD
 2. Select the [dominant control](../../Glossary/glossary-vba.md).
+=======
+2. Select the [dominant control](../../Glossary/glossary-vba.md#dominant-control).
+>>>>>>> master
     
 3. From the  **Format** menu, choose **Make Same Size**.
 

diff --git a/Language/Concepts/Forms/object-model-for-microsoft-forms.md b/Language/Concepts/Forms/object-model-for-microsoft-forms.md
@@ -17,7 +17,11 @@ The Microsoft Forms object model includes the following types of object:
 
 - Controls
 
+<<<<<<< HEAD
 - [Collections](../../Glossary/vbe-glossary.md)
+=======
+- [Collections](../../Glossary/vbe-glossary.md#collection)
+>>>>>>> master
     
 - Objects (within collections)
 

diff --git a/Language/Concepts/Forms/passwordchar-property.md b/Language/Concepts/Forms/passwordchar-property.md
@@ -15,9 +15,17 @@ ms.date: 06/08/2017
 
 
 
+<<<<<<< HEAD
 Specifies whether [placeholder](../../Glossary/glossary-vba.md) characters are displayed instead of the characters actually entered in a **TextBox**.
  **Syntax**
  _object_. **PasswordChar** [= _String_ ]
+=======
+Specifies whether [placeholder](../../Glossary/glossary-vba.md#placeholder) characters are displayed instead of the characters actually entered in a **TextBox**.
+
+## Syntax
+
+_object_. **PasswordChar** [= _String_ ]
+>>>>>>> master
 The  **PasswordChar** property syntax has these parts:
 
 
@@ -26,6 +34,11 @@ The  **PasswordChar** property syntax has these parts:
 | _object_|Required. A valid object.|
 | _String_|Optional. A string expression specifying the placeholder character.|
 
+<<<<<<< HEAD
  **Remarks**
+=======
+## Remarks
+
+>>>>>>> master
 You can use the  **PasswordChar** property to protect sensitive information, such as passwords or security codes. The value of **PasswordChar** is the character that appears in a control instead of the actual characters that the user types. If you don't specify a character, the control displays the characters that the user types.
 
diff --git a/Language/Concepts/Forms/select-a-grid-size.md b/Language/Concepts/Forms/select-a-grid-size.md
@@ -18,7 +18,11 @@ ms.date: 06/08/2017
 
 2. In the  **Options** dialog box, choose the **General** page.
 
+<<<<<<< HEAD
 3. In the  **Form Grid Settings** group, specify the size you want for each[grid block](../../Glossary/glossary-vba.md). Specifying smaller numbers results in smaller grid blocks.
+=======
+3. In the  **Form Grid Settings** group, specify the size you want for each[grid block](../../Glossary/glossary-vba.md#grid-block). Specifying smaller numbers results in smaller grid blocks.
+>>>>>>> master
     
 
 

diff --git a/Language/Concepts/Forms/set-the-tab-order-using-the-tab-order-dialog-box.md b/Language/Concepts/Forms/set-the-tab-order-using-the-tab-order-dialog-box.md
@@ -20,7 +20,11 @@ ms.date: 06/08/2017
 
 3. From the shortcut menu, choose  **Tab Order**.
 
+<<<<<<< HEAD
 4. Select the name of a control you want to reposition in the [tab order](../../Glossary/vbe-glossary.md).
+=======
+4. Select the name of a control you want to reposition in the [tab order](../../Glossary/vbe-glossary.md#tab-order).
+>>>>>>> master
     
 5. Choose  **Move Up** or **Move Down** until the control name is in the appropriate position in the tab order.
 

diff --git a/Language/Concepts/Forms/set-the-tab-order-using-the-tabindex-property.md b/Language/Concepts/Forms/set-the-tab-order-using-the-tabindex-property.md
@@ -14,7 +14,11 @@ ms.date: 06/08/2017
 
 
 
+<<<<<<< HEAD
 1. Identify the [tab order](../../Glossary/vbe-glossary.md) you want to use for the form.
+=======
+1. Identify the [tab order](../../Glossary/vbe-glossary.md#tab-order) you want to use for the form.
+>>>>>>> master
     
     The tab index of the first control in the tab order is 0; the tab index of the second is 1, and so on.
 

diff --git a/Language/Concepts/Forms/should-i-use-a-multipage-or-a-tabstrip.md b/Language/Concepts/Forms/should-i-use-a-multipage-or-a-tabstrip.md
@@ -13,5 +13,9 @@ ms.date: 06/08/2017
 
 If you use a single layout for data, use a  **TabStrip** and map each set of data to its own **Tab**. If you need several layouts for data, use a **MultiPage** and assign each layout to its own **Page**.
 
+<<<<<<< HEAD
 Unlike a  **Page** of a **MultiPage**, the[client region](../../Glossary/glossary-vba.md) of a **TabStrip** is not a separate form, but a portion of the form that contains the **TabStrip**. The border of a **TabStrip** defines a region of the form that you can associate with the tabs. When you place a control in the client region of a **TabStrip**, you are adding a control to the form that contains the **TabStrip**.
+=======
+Unlike a  **Page** of a **MultiPage**, the[client region](../../Glossary/glossary-vba.md#client-region) of a **TabStrip** is not a separate form, but a portion of the form that contains the **TabStrip**. The border of a **TabStrip** defines a region of the form that you can associate with the tabs. When you place a control in the client region of a **TabStrip**, you are adding a control to the form that contains the **TabStrip**.
+>>>>>>> master
 
diff --git a/Language/Concepts/Forms/tips-on-setting-the-dominant-control.md b/Language/Concepts/Forms/tips-on-setting-the-dominant-control.md
@@ -11,7 +11,11 @@ ms.date: 06/08/2017
 
 # Tips on setting the dominant control
 
+<<<<<<< HEAD
 You can set the [dominant control](../../Glossary/glossary-vba.md) in one of the following ways when selecting multiple controls:
+=======
+You can set the [dominant control](../../Glossary/glossary-vba.md#dominant-control) in one of the following ways when selecting multiple controls:
+>>>>>>> master
 
 
 

diff --git a/Language/Concepts/Forms/transparency-in-microsoft-forms.md b/Language/Concepts/Forms/transparency-in-microsoft-forms.md
@@ -13,9 +13,15 @@ ms.date: 06/08/2017
 
 Microsoft Forms supports transparency in two areas: the background of certain controls, and in bitmaps used on certain controls.
 
+<<<<<<< HEAD
 The  **BackStyle** property determines whether a control is[transparent](../../Glossary/glossary-vba.md). A transparent control lets you see what is behind it on the form. This is useful if you have a decorative background on the form and you want to minimize the amount of that background that is hidden behind the controls. For more information on making a control transparent, see [Create a transparent control](create-a-transparent-control.md).
 
 You can display a bitmap on many controls in Microsoft Forms. Certain controls support transparent bitmaps, that is, bitmaps in which one or more [background color](../../Glossary/glossary-vba.md) is transparent. Bitmap transparency is not controlled by any control property; it is controlled by the color of the lower-left pixel in the image. Microsoft Forms does not provide a way to edit a bitmap and make it transparent; you must use a picture editor for this purpose.
+=======
+The  **BackStyle** property determines whether a control is[transparent](../../Glossary/glossary-vba.md#transparent). A transparent control lets you see what is behind it on the form. This is useful if you have a decorative background on the form and you want to minimize the amount of that background that is hidden behind the controls. For more information on making a control transparent, see [Create a transparent control](create-a-transparent-control.md).
+
+You can display a bitmap on many controls in Microsoft Forms. Certain controls support transparent bitmaps, that is, bitmaps in which one or more [background color](../../Glossary/glossary-vba.md#background-color) is transparent. Bitmap transparency is not controlled by any control property; it is controlled by the color of the lower-left pixel in the image. Microsoft Forms does not provide a way to edit a bitmap and make it transparent; you must use a picture editor for this purpose.
+>>>>>>> master
 
 In Microsoft Forms, bitmaps are always transparent on the following controls:
 

diff --git a/Language/Concepts/Forms/use-z-order-to-layer-controls.md b/Language/Concepts/Forms/use-z-order-to-layer-controls.md
@@ -11,7 +11,11 @@ ms.date: 06/08/2017
 
 # Use z-order to layer controls
 
+<<<<<<< HEAD
 To place a control at the front or back of the [z-order](../../Glossary/vbe-glossary.md):
+=======
+To place a control at the front or back of the [z-order](../../Glossary/vbe-glossary.md#z-order):
+>>>>>>> master
 
 
 

diff --git a/Language/Concepts/Forms/ways-to-change-the-appearance-of-a-control.md b/Language/Concepts/Forms/ways-to-change-the-appearance-of-a-control.md
@@ -24,7 +24,13 @@ Microsoft Forms includes several properties that let you define the appearance o
 -  **SpecialEffect**
 
 
+<<<<<<< HEAD
  **ForeColor** determines the[foreground color](../../Glossary/glossary-vba.md). The foreground color applies to any text associated with the control, such as the caption or the control's contents.
  **BackColor** and **BackStyle** apply to the control's background. The background is the area within the control's boundaries, such as the area surrounding the text in a control, but not the control's border. **BackColor** determines the[background color](../../Glossary/glossary-vba.md).  **BackStyle** determines whether the background is[transparent](../../Glossary/glossary-vba.md). A transparent control background is useful if your application design includes a picture as the main background and you want to see that picture through the control.
  **BorderColor**, **BorderStyle**, and **SpecialEffect** apply to the control's border. You can use **BorderStyle** or **SpecialEffect** to choose a type of border. Only one of these two properties can be used at a time. When you assign a value to one of these properties, the system sets the other property to **None**. **SpecialEffect** lets you choose one of several border styles, but only lets you use[system colors](../../Glossary/glossary-vba.md) for the border. **BorderStyle** supports only one border style, but lets you choose any color that is a valid setting for **BorderColor**. **BorderColor** specifies the color of the control's border, and is only valid when you use **BorderStyle** to create the border.
+=======
+ **ForeColor** determines the[foreground color](../../Glossary/glossary-vba.md#foreground-color). The foreground color applies to any text associated with the control, such as the caption or the control's contents.
+ **BackColor** and **BackStyle** apply to the control's background. The background is the area within the control's boundaries, such as the area surrounding the text in a control, but not the control's border. **BackColor** determines the[background color](../../Glossary/glossary-vba.md#background-color).  **BackStyle** determines whether the background is[transparent](../../Glossary/glossary-vba.md#transparent). A transparent control background is useful if your application design includes a picture as the main background and you want to see that picture through the control.
+ **BorderColor**, **BorderStyle**, and **SpecialEffect** apply to the control's border. You can use **BorderStyle** or **SpecialEffect** to choose a type of border. Only one of these two properties can be used at a time. When you assign a value to one of these properties, the system sets the other property to **None**. **SpecialEffect** lets you choose one of several border styles, but only lets you use[system colors](../../Glossary/glossary-vba.md#system-colors) for the border. **BorderStyle** supports only one border style, but lets you choose any color that is a valid setting for **BorderColor**. **BorderColor** specifies the color of the control's border, and is only valid when you use **BorderStyle** to create the border.
+>>>>>>> master
 
diff --git a/Language/Concepts/Forms/ways-to-create-an-option-group.md b/Language/Concepts/Forms/ways-to-create-an-option-group.md
@@ -11,7 +11,11 @@ ms.date: 06/08/2017
 
 # Ways to create an option group
 
+<<<<<<< HEAD
 By default, all  **OptionButton** controls on a[container](../../Glossary/vbe-glossary.md) (such as a form, a **MultiPage**, or a **Frame**) are part of a single option group. This means that selecting one of the buttons automatically sets all other option buttons on the form to **False**.
+=======
+By default, all  **OptionButton** controls on a[container](../../Glossary/vbe-glossary.md#container) (such as a form, a **MultiPage**, or a **Frame**) are part of a single option group. This means that selecting one of the buttons automatically sets all other option buttons on the form to **False**.
+>>>>>>> master
 
 If you want more than one option group on the form, there are two ways to create additional groups:
 

diff --git a/Language/Concepts/Forms/ways-to-protect-sensitive-information.md b/Language/Concepts/Forms/ways-to-protect-sensitive-information.md
@@ -17,11 +17,19 @@ Many applications use data that should be available only to certain users. Here
 
 - Write code that makes a control (and its data) invisible to unauthorized users. The  **Visible** property makes a control visible or invisible. For more information about **Visible**, see[Visible Property](../../reference/User-Interface-Help/visible-property-microsoft-forms.md).
 
+<<<<<<< HEAD
 - Write code that sets the control's foreground and background to the same color when unauthorized users run the application. This hides the information from unauthorized users. The  **ForeColor** and **BackColor** properties determine the[foreground color](../../Glossary/glossary-vba.md) and the[background color](../../Glossary/glossary-vba.md). For information about  **ForeColor**, see[ForeColor Property](../../reference/User-Interface-Help/forecolor-property-microsoft-forms.md). For information about  **BackColor**, see[BackColor Property](../../reference/User-Interface-Help/backcolor-property-microsoft-forms.md).
 
 - Disable the control when unauthorized users run the application. The  **Enabled** property determines when a control is disabled. For information about **Enabled**, see[Enabled Property](../../reference/User-Interface-Help/enabled-property-microsoft-forms.md).
 
 - Require a password for access to the application or a specific control. You can use [placeholders](../../Glossary/glossary-vba.md) as the user types each character. The **PasswordChar** property defines placeholder characters. For information about **PasswordChar**, see[PasswordChar Property](passwordchar-property.md).
+=======
+- Write code that sets the control's foreground and background to the same color when unauthorized users run the application. This hides the information from unauthorized users. The  **ForeColor** and **BackColor** properties determine the[foreground color](../../Glossary/glossary-vba.md#foreground-color) and the[background color](../../Glossary/glossary-vba.md#background-color). For information about  **ForeColor**, see[ForeColor Property](../../reference/User-Interface-Help/forecolor-property-microsoft-forms.md). For information about  **BackColor**, see[BackColor Property](../../reference/User-Interface-Help/backcolor-property-microsoft-forms.md).
+
+- Disable the control when unauthorized users run the application. The  **Enabled** property determines when a control is disabled. For information about **Enabled**, see[Enabled Property](../../reference/User-Interface-Help/enabled-property-microsoft-forms.md).
+
+- Require a password for access to the application or a specific control. You can use [placeholders](../../Glossary/glossary-vba.md#placeholder) as the user types each character. The **PasswordChar** property defines placeholder characters. For information about **PasswordChar**, see[PasswordChar Property](passwordchar-property.md).
+>>>>>>> master
     
 
 

diff --git a/Language/Concepts/Forms/ways-to-put-data-in-a-listbox-or-combobox.md b/Language/Concepts/Forms/ways-to-put-data-in-a-listbox-or-combobox.md
@@ -11,6 +11,10 @@ ms.date: 06/08/2017
 
 # Ways to put data in a ListBox or ComboBox
 
+<<<<<<< HEAD
 In a  **ListBox** or **ComboBox** with a single column, the **AddItem** method provides an effective technique for adding an individual entry to the list. In a multicolumn **ListBox** or **ComboBox**, however, the **List** and **Column** properties offer another technique; you can load the list from a two-dimensional[array](../../Glossary/vbe-glossary.md).
+=======
+In a  **ListBox** or **ComboBox** with a single column, the **AddItem** method provides an effective technique for adding an individual entry to the list. In a multicolumn **ListBox** or **ComboBox**, however, the **List** and **Column** properties offer another technique; you can load the list from a two-dimensional[array](../../Glossary/vbe-glossary.md#array).
+>>>>>>> master