Skip to content

Commit 0409d97

Browse files
authored
Merge branch 'master' into kraigb-python
2 parents 958a74f + f525288 commit 0409d97

File tree

7 files changed

+68
-128
lines changed

7 files changed

+68
-128
lines changed

docs/install/command-line-parameter-examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ vs_enterprise.exe modify ^
9696
```
9797

9898
> [!NOTE]
99-
> You can use the `^` character at the end of a command line to concatenate multiple lines into a single command. Alternatively, you can simply place these lines together onto a single row.
99+
> You can use the `^` character at the end of a command line to concatenate multiple lines into a single command. Alternatively, you can simply place these lines together onto a single row. In PowerShell, the equivalent is the backtick (`` ` ``) character.
100100
101101
## See also
102102

docs/install/use-command-line-parameters-to-install-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The command-line options are used in conjunction with the setup bootstrapper, wh
9090
| ```--channelUri <uri>``` | **Optional**: The URI of the channel manifest. This can be used for the install command; it is ignored for other commands. |
9191
| ```--installChannelUri <uri>``` | **Optional**: The URI of the channel manifest to use for the installation. The URI specified by --channelUri (which must be specified when --installChannelUri is specified) will be used to detect updates. If updates are not desired, --channelUri must be specified without an argument. This can be used for the install command; it is ignored for other commands. |
9292
| ```--installCatalogUri <uri>``` | **Optional**: The URI of the catalog manifest to use for the installation. If specified, the channel manager will attempt to download the catalog manifest from this URI before using the URI in the install channel manifest. This parameter is used to support offline install, where the layout cache will be created with the product catalog already downloaded. This can be used for the install command; it is ignored for other commands. |
93-
| ```--productId <id>``` | The ID of the product for the instance that will be installed. This is required for the install command, ignored for other commands if --installPath is specified. |
93+
| ```--productId <id>``` | **Optional** The ID of the product for the instance that will be installed. This is prepopulated in normal installation conditions. |
9494
| ```--wait``` | **Optional**: The process will wait until the install is completed before returning a exit code. This is useful when automating installations where one needs to wait for the install to finish to handle the return code from that install. |
9595
| ```--locale <language-locale>``` | **Optional**: Change the display language of the user interface for the installer itself. Setting will be persisted. For more information, see the [List of language locales](#list-of-language-locales) section on this page.|
9696

docs/javascript/TOC.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/javascript/index.md

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

docs/javascript/javascript-in-visual-studio.md

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

scripting-docs/javascript/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ JavaScript is a first-class language in Visual Studio. You can use most or all o
88

99
<ul class="panelContent cardsFTitle">
1010
<li>
11-
<a href="https://docs.microsoft.com/visualstudio/scripting/javascript/javascript-in-vs-2017">
11+
<a href="https://docs.microsoft.com/scripting/javascript/javascript-in-vs-2017">
1212
<div class="cardSize">
1313
<div class="cardPadding">
1414
<div class="card">
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
1-
---
2-
title: "Modulus Operator (JavaScript) | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "01/18/2017"
5-
ms.prod: "windows-client-threshold"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "devlang-javascript"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "language-reference"
12-
f1_keywords:
13-
- "%"
14-
dev_langs:
15-
- "JavaScript"
1+
---
2+
title: "Remainder Operator (JavaScript) | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "01/18/2017"
5+
ms.prod: "windows-client-threshold"
6+
ms.reviewer: ""
7+
ms.suite: ""
8+
ms.technology:
9+
- "devlang-javascript"
10+
ms.tgt_pltfrm: ""
11+
ms.topic: "language-reference"
12+
f1_keywords:
13+
- "%"
14+
dev_langs:
15+
- "JavaScript"
1616
- "TypeScript"
17-
- "DHTML"
18-
helpviewer_keywords:
19-
- "modulus operator, JavaScript"
20-
- "% operator [JavaScript]"
21-
- "Modulo function [JavaScript]"
22-
ms.assetid: 087d654f-623b-498d-95ff-596d26bf674d
23-
caps.latest.revision: 8
24-
author: "mikejo5000"
25-
ms.author: "mikejo"
26-
manager: "ghogen"
27-
---
28-
# Modulus Operator (JavaScript)
29-
Divides the value of one expression by the value of another, and returns the remainder.
30-
31-
## Syntax
32-
33-
```
34-
35-
result = number1 % number2
36-
```
37-
38-
## Arguments
39-
`result`
40-
Any variable.
41-
42-
`number1`
43-
Any numeric expression.
44-
45-
`number2`
46-
Any numeric expression.
47-
48-
## Remarks
49-
The modulus, or remainder, operator divides `number1` by `number2`and returns only the remainder as `result`. The sign of `result` is the same as the sign of `number1`. The value of `result` is between 0 and the absolute value of `number2`.
50-
51-
The following code shows how to use the modulus operator.
52-
53-
```
54-
var modResult = 19 % 6.7;
55-
document.write(modResult);
56-
57-
// Output: 5.6
58-
59-
```
60-
61-
## Requirements
62-
[!INCLUDE[jsv1](../../javascript/misc/includes/jsv1-md.md)]
63-
64-
## See Also
65-
[Operator Precedence](../../javascript/operator-subtractprecedence-javascript.md)
66-
[Operator Summary (JavaScript)](../../javascript/misc/operator-subtractsummary-javascript.md)
17+
- "DHTML"
18+
helpviewer_keywords:
19+
- "remainder operator, JavaScript"
20+
- "% operator [JavaScript]"
21+
- "Remainder function [JavaScript]"
22+
ms.assetid: 087d654f-623b-498d-95ff-596d26bf674d
23+
caps.latest.revision: 8
24+
author: "mikejo5000"
25+
ms.author: "mikejo"
26+
manager: "ghogen"
27+
---
28+
# Remainder Operator (JavaScript)
29+
Divides the value of one expression by the value of another, and returns the remainder.
30+
31+
## Syntax
32+
33+
```
34+
35+
result = number1 % number2
36+
```
37+
38+
## Arguments
39+
`result`
40+
Any variable.
41+
42+
`number1`
43+
Any numeric expression.
44+
45+
`number2`
46+
Any numeric expression.
47+
48+
## Remarks
49+
The remainder operator divides `number1` by `number2`and returns only the remainder as `result`. The sign of `result` is the same as the sign of `number1`. The value of `result` is between 0 and the absolute value of `number2`.
50+
51+
The following code shows how to use the remainder operator.
52+
53+
```
54+
var modResult = 19 % 6.7;
55+
document.write(modResult);
56+
57+
// Output: 5.6
58+
59+
```
60+
61+
## Requirements
62+
[!INCLUDE[jsv1](../../javascript/misc/includes/jsv1-md.md)]
63+
64+
## See Also
65+
[Operator Precedence](../../javascript/operator-subtractprecedence-javascript.md)
66+
[Operator Summary (JavaScript)](../../javascript/misc/operator-subtractsummary-javascript.md)

0 commit comments

Comments
 (0)