Merge master to live

.openpublishing.redirection.json

@@ -6,111 +6,144 @@
         },
         {
             "source_path": "access/Concepts/Miscellaneous/alter-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/alter-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/alter-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/asc-desc-microsoft-access-sql-reserved-words.md",
             "redirect_url": "/office/vba/access/concepts/structured-query-language/asc-desc-microsoft-access-sql-reserved-words"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/by-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/by-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/by-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/container-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/container-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/container-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/create-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/create-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/create-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/delete-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/delete-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/delete-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/drop-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/drop-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/drop-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/first-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/first-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/first-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/from-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/from-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/from-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/index-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/index-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/index-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/in-microsoft-access-sql-reserved-word.md",
             "redirect_url": "/office/vba/access/concepts/structured-query-language/in-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/insert-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/insert-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/insert-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/into-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/into-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/into-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/last-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/last-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/last-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/on-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/on-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/on-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/schema-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/schema-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/schema-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/select-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/select-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/select-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/selectschema-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/selectschema-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/selectschema-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/selectsecurity-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/selectsecurity-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/selectsecurity-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/to-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/to-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/to-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/updateidentity-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/updateidentity-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/updateidentity-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/update-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/update-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/update-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/updateowner-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/updateowner-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/updateowner-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/updatesecurity-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/updatesecurity-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/updatesecurity-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/user-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/user-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/user-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/view-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/view-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/view-microsoft-access-sql-reserved-word"
         },
         {
             "source_path": "access/Concepts/Miscellaneous/with-microsoft-access-sql-reserved-word.md",
-            "redirect_url": "/office/vba/access/concepts/Structured-Query-Language/with-microsoft-access-sql-reserved-word"
+            "redirect_url": "/office/vba/access/concepts/structured-query-language/with-microsoft-access-sql-reserved-word"
+        },
+        {
+            "source_path": "access/Concepts/Criteria-Expressions/quotation-marks-in-strings.md",
+            "redirect_url": "/office/vba/access/concepts/criteria-expressions/include-quotation-marks-in-string-expressions"
+        },
+        {
+            "source_path": "access/Concepts/Criteria-Expressions/use-multiple-fields-in-criteria-expressions.md",
+            "redirect_url": "/office/vba/access/concepts/criteria-expressions/multiple-fields-in-criteria-expressions"
+        },    
+        {
+            "source_path": "access/Concepts/Criteria-Expressions/use-numeric-criteria-in-expressions.md",
+            "redirect_url": "/office/vba/access/concepts/criteria-expressions/numeric-criteria-expressions"
+        },  
+        {
+            "source_path": "access/Concepts/Criteria-Expressions/use-textual-criteria-expressions.md",
+            "redirect_url": "/office/vba/access/concepts/criteria-expressions/textual-criteria-expressions"
+        },
+        {
+            "source_path": "access/Concepts/Maintenance/handle-run-time-errors-in-vba.md",
+            "redirect_url": "/office/vba/access/concepts/error-codes/elements-of-run-time-error-handling"
+        },
+        {
+            "source_path": "access/Concepts/Maintenance/recover-tables-deleted-from-a-database.md",
+            "redirect_url": "/office/vba/access/concepts/miscellaneous/recover-tables-deleted-from-a-database"
+        },
+        {
+            "source_path": "access/Concepts/Settings/data-access-objects-dao.md",
+            "redirect_url": "/office/vba/api/overview/access"
+        },
+        {
+            "source_path": "access/Concepts/Settings/activex-data-objects-ado.md",
+            "redirect_url": "/office/vba/api/overview/access"
         }
+
     ]
 }

Language/Concepts/Forms/add-a-watch-expression.md

@@ -20,9 +20,9 @@ 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.
 
-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.
+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.
+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.
 4. Select an option in the  **Watch Type** group to define how the system responds to the watch expression.

Language/Concepts/Forms/assign-a-control-tip-to-a-page-or-tab.md

@@ -20,7 +20,7 @@ ms.date: 06/08/2017
 
 3. From the shortcut menu, choose  **Rename**.
 
-4. In the  **ControlTipText** field, type the string you want to use as the[control tip](../../Glossary/glossary-vba.md#control-tip).
+4. In the  **ControlTipText** field, type the string you want to use as the [control tip](../../Glossary/glossary-vba.md#control-tip).
 
 5. Click OK.
 

Language/Concepts/Forms/should-i-use-a-multipage-or-a-tabstrip.md

@@ -13,5 +13,5 @@ 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**.
 
-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**.
+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**.
 

Language/Concepts/Forms/transparency-in-microsoft-forms.md

@@ -13,7 +13,7 @@ ms.date: 06/08/2017
 
 Microsoft Forms supports transparency in two areas: the background of certain controls, and in bitmaps used on certain controls.
 
-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).
+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.
 

Language/Concepts/Forms/ways-to-change-the-appearance-of-a-control.md

@@ -24,7 +24,7 @@ Microsoft Forms includes several properties that let you define the appearance o
 -  **SpecialEffect**
 
 
- **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.
+ **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.
 

Language/Concepts/Forms/ways-to-create-an-option-group.md

@@ -11,7 +11,7 @@ ms.date: 06/08/2017
 
 # Ways to create an option group
 
-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**.
+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**.
 
 If you want more than one option group on the form, there are two ways to create additional groups: