Merge branch 'master' of https://github.com/Microsoft/vsdocs into mikejo

docs/csharp-ide/refactoring/sync-type-and-file.md

@@ -33,7 +33,7 @@ translation.priority.ht:
 # Sync a type to a filename, or a filename to a type in C# #
 
 <!-- VERSIONLESS -->
-**This feature is available in Visual Studio 2017 and later.**
+**This feature is available in Visual Studio 2017 and later.  Additionally, .NET Standard projects are not yet supported for this refactoring.**
 
 **What:** Lets you rename a type to match the filename, or rename a filename to match the type it contains.
 
@@ -60,4 +60,4 @@ translation.priority.ht:
    ![Inline result](media/synctype_result.png)
 
 ## See Also  
-[Refactoring (C#)](../refactoring-csharp.md)
+[Refactoring (C#)](../refactoring-csharp.md)

docs/vb-ide/refactoring/sync-type-and-file.md

@@ -33,7 +33,7 @@ translation.priority.ht:
 # Sync a type to a filename, or a filename to a type in Visual Basic
 
 <!-- VERSIONLESS -->
-**This feature is available in Visual Studio 2017 and later.**
+**This feature is available in Visual Studio 2017 and later.  Additionally, .NET Standard projects are not yet supported for this refactoring.**
 
 **What:** Lets you rename a type to match the filename, or rename a filename to match the type it contains.
 
@@ -60,4 +60,4 @@ translation.priority.ht:
    ![Inline result](media/synctype_result.png)
 
 ## See Also  
-[Refactoring (Visual Basic)](../refactoring-vb.md)
+[Refactoring (Visual Basic)](../refactoring-vb.md)

scripting-docs/javascript/advanced/advanced-javascript.md

@@ -1,29 +1,30 @@
----
-title: "Advanced JavaScript | Microsoft Docs"
-ms.custom: ""
-ms.date: "01/18/2017"
-ms.prod: "windows-client-threshold"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "devlang-javascript"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-dev_langs: 
-  - "JavaScript"
-  - "DHTML"
-helpviewer_keywords: 
-  - "troubleshooting, JavaScript"
-  - "troubleshooting scripts"
-  - "arrays [JavaScript]"
-  - "recursive procedures, JavaScript"
-ms.assetid: ea26b6a1-e5c6-40d5-ac33-3961f584f941
-caps.latest.revision: 18
-author: "mikejo5000"
-ms.author: "mikejo"
-manager: "ghogen"
----
-# Advanced JavaScript
+---
+title: "Advanced JavaScript | Microsoft Docs"
+ms.custom: ""
+ms.date: "01/18/2017"
+ms.prod: "windows-client-threshold"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "devlang-javascript"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+dev_langs: 
+  - "JavaScript"
+  - "TypeScript"
+  - "DHTML"
+helpviewer_keywords: 
+  - "troubleshooting, JavaScript"
+  - "troubleshooting scripts"
+  - "arrays [JavaScript]"
+  - "recursive procedures, JavaScript"
+ms.assetid: ea26b6a1-e5c6-40d5-ac33-3961f584f941
+caps.latest.revision: 18
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: "ghogen"
+---
+# Advanced JavaScript
 These sections explain advanced [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] functionality, such as recursion, arrays, troubleshooting, and so on.  
 
 ## In This Section  

scripting-docs/javascript/advanced/collections-javascript.md

@@ -1,24 +1,25 @@
----
-title: "Collections (JavaScript) | Microsoft Docs"
-ms.custom: ""
-ms.date: "01/18/2017"
-ms.prod: "windows-client-threshold"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "devlang-javascript"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-dev_langs: 
-  - "JavaScript"
-  - "DHTML"
-ms.assetid: 23c26185-6a7b-4b69-9d22-63e1841b4905
-caps.latest.revision: 4
-author: "mikejo5000"
-ms.author: "mikejo"
-manager: "ghogen"
----
-# Collections (JavaScript)
+---
+title: "Collections (JavaScript) | Microsoft Docs"
+ms.custom: ""
+ms.date: "01/18/2017"
+ms.prod: "windows-client-threshold"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "devlang-javascript"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+dev_langs: 
+  - "JavaScript"
+  - "TypeScript"
+  - "DHTML"
+ms.assetid: 23c26185-6a7b-4b69-9d22-63e1841b4905
+caps.latest.revision: 4
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: "ghogen"
+---
+# Collections (JavaScript)
 You can use the collection objects [Map](../../javascript/reference/map-object-javascript.md), [Set](../../javascript/reference/set-object-javascript.md), and [WeakMap](../../javascript/reference/weakmap-object-javascript.md) to store values and objects. These objects provide convenient methods for adding and retrieving members by using either a key or a value instead of an index. To access members of a collection by using an index, use an `Array` object. For more information, see [Using Arrays](../../javascript/advanced/using-arrays-javascript.md).  
 
 > [!CAUTION]
@@ -31,7 +32,7 @@ You can use the collection objects [Map](../../javascript/reference/map-object-j
 
  The following example shows how to use the `Map` object. In this example, you access members by using both `get` and `forEach`. The callback function in `forEach` can take up to three parameters, which provide the value of the current collection element, the key of the current element, and the collection object itself.  
 
-```javascript  
+```JavaScript  
 var m = new Map();  
 m.set(1, "black");  
 m.set(2, "red");  
@@ -59,7 +60,7 @@ m.forEach(function (value, key, mapObj) {
 
  The following example shows how to use the `Set` object. In this example, the callback function takes one parameter, which is the value of the current collection element.  
 
-```javascript  
+```JavaScript  
 var s = new Set();  
 s.add("Thomas Jefferson");  
 s.add(1776);  

scripting-docs/javascript/advanced/conditional-compilation-javascript.md

@@ -13,6 +13,7 @@ f1_keywords:
   - "ConditionalComp_JavaScript"
 dev_langs: 
   - "JavaScript"
+  - "TypeScript"
   - "DHTML"
 helpviewer_keywords: 
   - "conditional compilation, overview"
@@ -24,23 +25,23 @@ ms.author: "mikejo"
 manager: "ghogen"
 ---
 # Conditional Compilation (JavaScript)
-Conditional compilation allows the use of new [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] language features without sacrificing compatibility with older versions that do not support the features.  
-
-> [!WARNING]
->  Conditional compilation is supported in all versions of Internet Explorer prior to Internet Explorer 11. Starting with Internet Explorer 11 Standards mode, and in [!INCLUDE[win8_appname_long](../../javascript/includes/win8-appname-long-md.md)] apps, conditional compilation is not supported.  
-  
-## Statements  
- Conditional compilation is activated by using the `@cc_on` statement, or using an `@if` or `@set` statement. Some typical uses for conditional compilation include using new features in [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)], embedding debugging support into a script, and tracing code execution.  
-
- Always place conditional compilation code in comments, so that hosts (like Netscape Navigator) that do not support conditional compilation will ignore it. Here is an example.  
-
-```javascript  
-/*@cc_on @*/  
-/*@if (@_jscript_version >= 4)  
-    alert("JavaScript version 4 or better");  
-    @else @*/  
-    alert("Conditional compilation not supported by this scripting engine.");  
-/*@end @*/  
-```  
-
+Conditional compilation allows the use of new [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] language features without sacrificing compatibility with older versions that do not support the features.  
+
+> [!WARNING]
+>  Conditional compilation is supported in all versions of Internet Explorer prior to Internet Explorer 11. Starting with Internet Explorer 11 Standards mode, and in [!INCLUDE[win8_appname_long](../../javascript/includes/win8-appname-long-md.md)] apps, conditional compilation is not supported.  
+  
+## Statements  
+ Conditional compilation is activated by using the `@cc_on` statement, or using an `@if` or `@set` statement. Some typical uses for conditional compilation include using new features in [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)], embedding debugging support into a script, and tracing code execution.  
+
+ Always place conditional compilation code in comments, so that hosts (like Netscape Navigator) that do not support conditional compilation will ignore it. Here is an example.  
+
+```JavaScript  
+/*@cc_on @*/  
+/*@if (@_jscript_version >= 4)  
+    alert("JavaScript version 4 or better");  
+    @else @*/  
+    alert("Conditional compilation not supported by this scripting engine.");  
+/*@end @*/  
+```  
+
  This example uses special comment delimiters that are used only if conditional compilation is activated by the `@cc_on` statement. Scripting engines that do not support conditional compilation see only the message that says conditional compilation is not supported.

scripting-docs/javascript/advanced/conditional-compilation-variables-javascript.md

@@ -11,6 +11,7 @@ ms.tgt_pltfrm: ""
 ms.topic: "article"
 dev_langs: 
   - "JavaScript"
+  - "TypeScript"
   - "DHTML"
 helpviewer_keywords: 
   - "conditional compilation, variables"
@@ -21,22 +22,22 @@ ms.author: "mikejo"
 manager: "ghogen"
 ---
 # Conditional Compilation Variables (JavaScript)
-The following predefined variables are available for conditional compilation. If a variable is not **true**, it is not defined and behaves as `NaN` when accessed.  
-
-> [!WARNING]
->  Conditional compilation is supported in all versions of Internet Explorer prior to Internet Explorer 11. Starting with Internet Explorer 11 Standards mode, and in [!INCLUDE[win8_appname_long](../../javascript/includes/win8-appname-long-md.md)] apps, conditional compilation is not supported.  
-  
-## Variables  
-
-|Variable|Description|  
-|--------------|-----------------|  
-|@_win32|True if running on a Win32 system.|  
-|@_win16|True if running on a Win16 system.|  
-|@_mac|True if running on an Apple Macintosh system.|  
-|@_alpha|True if running on a DEC Alpha processor.|  
-|@_x86|True if running on an Intel processor.|  
-|@_mc680x0|True if running on a Motorola 680x0 processor.|  
-|@_PowerPC|True if running on a Motorola PowerPC processor.|  
-|@_jscript|Always true.|  
-|@_jscript_build|Contains the build number of the [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] scripting engine.|  
+The following predefined variables are available for conditional compilation. If a variable is not **true**, it is not defined and behaves as `NaN` when accessed.  
+
+> [!WARNING]
+>  Conditional compilation is supported in all versions of Internet Explorer prior to Internet Explorer 11. Starting with Internet Explorer 11 Standards mode, and in [!INCLUDE[win8_appname_long](../../javascript/includes/win8-appname-long-md.md)] apps, conditional compilation is not supported.  
+  
+## Variables  
+
+|Variable|Description|  
+|--------------|-----------------|  
+|@_win32|True if running on a Win32 system.|  
+|@_win16|True if running on a Win16 system.|  
+|@_mac|True if running on an Apple Macintosh system.|  
+|@_alpha|True if running on a DEC Alpha processor.|  
+|@_x86|True if running on an Intel processor.|  
+|@_mc680x0|True if running on a Motorola 680x0 processor.|  
+|@_PowerPC|True if running on a Motorola PowerPC processor.|  
+|@_jscript|Always true.|  
+|@_jscript_build|Contains the build number of the [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] scripting engine.|  
 |@_jscript_version|Contains the [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)] version number in major.minor format.|

scripting-docs/javascript/advanced/copying-passing-and-comparing-data-javascript.md

@@ -1,34 +1,35 @@
----
-title: "Copying, Passing, and Comparing Data (JavaScript) | Microsoft Docs"
-ms.custom: ""
-ms.date: "01/18/2017"
-ms.prod: "windows-client-threshold"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "devlang-javascript"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-dev_langs: 
-  - "JavaScript"
-  - "DHTML"
-helpviewer_keywords: 
-  - "arrays [Visual Studio], passing values"
-  - "function parameters"
-  - "string comparison"
-  - "function parameters, about function parameters"
-  - "ByRef argument"
-  - "arrays [Visual Studio], setting data types"
-  - "arrays [Visual Studio], copying data"
-  - "ByVal argument"
-  - "string comparison, testing data"
-ms.assetid: fbccd877-7249-45d4-bd9f-6bcd8ba94a6b
-caps.latest.revision: 9
-author: "mikejo5000"
-ms.author: "mikejo"
-manager: "ghogen"
----
-# Copying, Passing, and Comparing Data (JavaScript)
+---
+title: "Copying, Passing, and Comparing Data (JavaScript) | Microsoft Docs"
+ms.custom: ""
+ms.date: "01/18/2017"
+ms.prod: "windows-client-threshold"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "devlang-javascript"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+dev_langs: 
+  - "JavaScript"
+  - "TypeScript"
+  - "DHTML"
+helpviewer_keywords: 
+  - "arrays [Visual Studio], passing values"
+  - "function parameters"
+  - "string comparison"
+  - "function parameters, about function parameters"
+  - "ByRef argument"
+  - "arrays [Visual Studio], setting data types"
+  - "arrays [Visual Studio], copying data"
+  - "ByVal argument"
+  - "string comparison, testing data"
+ms.assetid: fbccd877-7249-45d4-bd9f-6bcd8ba94a6b
+caps.latest.revision: 9
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: "ghogen"
+---
+# Copying, Passing, and Comparing Data (JavaScript)
 In [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)], how data is handled depends on its data type.  
 
 ## By Value vs. By Reference  
@@ -48,7 +49,7 @@ In [!INCLUDE[javascript](../../javascript/includes/javascript-md.md)], how data
 
  For example (using the Internet Explorer object model):  
 
-```javascript  
+```JavaScript  
 // This clobbers (over-writes) its parameter, so the change  
 // is not reflected in the calling code.  
 function Clobber(param)   

scripting-docs/javascript/advanced/data-properties-and-accessor-properties.md

@@ -1,24 +1,25 @@
----
-title: "Data Properties and Accessor Properties | Microsoft Docs"
-ms.custom: ""
-ms.date: "01/18/2017"
-ms.prod: "windows-client-threshold"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "devlang-javascript"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-dev_langs: 
-  - "JavaScript"
-  - "DHTML"
-ms.assetid: 7e132831-375d-4728-9a57-5c6f91075b1c
-caps.latest.revision: 3
-author: "mikejo5000"
-ms.author: "mikejo"
-manager: "ghogen"
----
-# Data Properties and Accessor Properties
+---
+title: "Data Properties and Accessor Properties | Microsoft Docs"
+ms.custom: ""
+ms.date: "01/18/2017"
+ms.prod: "windows-client-threshold"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "devlang-javascript"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+dev_langs: 
+  - "JavaScript"
+  - "TypeScript"
+  - "DHTML"
+ms.assetid: 7e132831-375d-4728-9a57-5c6f91075b1c
+caps.latest.revision: 3
+author: "mikejo5000"
+ms.author: "mikejo"
+manager: "ghogen"
+---
+# Data Properties and Accessor Properties
 This section includes all the information you are likely to need about data properties and accessor properties.  
 
 ### Data Properties