Skip to content

Commit 936f27c

Browse files
Merge pull request #10498 from MicrosoftDocs/main638675750519290501sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 1ba6c1c + 0fc42cd commit 936f27c

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

docker/tutorials/tutorial-multi-container-app-mysql.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ In this example, you create the network and attach the MySQL container at startu
8989
--network todo-app --network-alias mysql
9090
-v todo-mysql-data:/var/lib/mysql
9191
-e MYSQL_ROOT_PASSWORD=<your-password>
92-
-e MYSQL_DATABASE=todos
92+
-e MYSQL_DB=todos
9393
mysql:5.7
9494
```
9595

96-
This command also defines the `MYSQL_ROOT_PASSWORD` and `MYSQL_DATABASE` environment variables. For more information, see [MySQL Docker Hub listing](https://hub.docker.com/_/mysql/).
96+
This command also defines the `MYSQL_ROOT_PASSWORD` and `MYSQL_DB` environment variables. For more information, see [MySQL Docker Hub listing](https://hub.docker.com/_/mysql/).
9797

9898
> [!WARNING]
9999
> This tutorial illustrates password credentials to authenticate with a MySQL database, which is not the most secure method. Refer to the [MySQL documentation](https://dev.mysql.com/doc/) to learn about more secure methods of authentication.
@@ -146,7 +146,7 @@ The `todo` app supports setting certain environment variables to specify your My
146146
| `MYSQL_HOST` | `mysql` | The host name for the MySQL server. |
147147
| `MYSQL_USER` | `root` | The username to use for the connection. |
148148
| `MYSQL_PASSWORD` | `<your-password>` | The password to use for the connection. In this example, substitute your root password for the `<your-password>` placeholder. |
149-
| `MYSQL_DATABASE` | `todos` | The name of the database to use after the connection is established. |
149+
| `MYSQL_DB` | `todos` | The name of the database to use after the connection is established. |
150150

151151
> [!WARNING]
152152
> Using environment variables to set connection settings is acceptable for development, but this practice isn't recommended for running applications in production. For more information, see [Why you shouldn't use environment variables for secret data](https://diogomonica.com/2017/03/27/why-you-shouldnt-use-env-variables-for-secret-data/).
@@ -166,7 +166,7 @@ In the following example, you start your app and connect your app container to y
166166
-e MYSQL_HOST=mysql
167167
-e MYSQL_USER=root
168168
-e MYSQL_PASSWORD=<your-password>
169-
-e MYSQL_DATABASE=todos
169+
-e MYSQL_DB=todos
170170
node:20-alpine
171171
sh -c "yarn install && yarn run dev"
172172
```
@@ -255,7 +255,7 @@ In the following example, you configure a Docker Compose file for your multi-con
255255
-e MYSQL_HOST=mysql
256256
-e MYSQL_USER=root
257257
-e MYSQL_PASSWORD=<your-password>
258-
-e MYSQL_DATABASE=todos
258+
-e MYSQL_DB=todos
259259
node:20-alpine
260260
sh -c "yarn install && yarn run dev"
261261
```
@@ -320,7 +320,7 @@ In the following example, you configure a Docker Compose file for your multi-con
320320
MYSQL_HOST: mysql
321321
MYSQL_USER: root
322322
MYSQL_PASSWORD: <your-password>
323-
MYSQL_DATABASE: todos
323+
MYSQL_DB: todos
324324
```
325325

326326
Remember to enter your MySQL root password for the `<your-password>` placeholder.
@@ -361,7 +361,7 @@ In the following example, you configure a Docker Compose file for your multi-con
361361
- todo-mysql-data:/var/lib/mysql
362362
environment:
363363
MYSQL_ROOT_PASSWORD: <your-password>
364-
MYSQL_DATABASE: todos
364+
MYSQL_DB: todos
365365
```
366366

367367
Remember to enter your MySQL root password for the `<your-password>` placeholder.
@@ -394,15 +394,15 @@ In the following example, you configure a Docker Compose file for your multi-con
394394
MYSQL_HOST: mysql
395395
MYSQL_USER: root
396396
MYSQL_PASSWORD: <your-password>
397-
MYSQL_DATABASE: todos
397+
MYSQL_DB: todos
398398
399399
mysql:
400400
image: mysql:5.7
401401
volumes:
402402
- todo-mysql-data:/var/lib/mysql
403403
environment:
404404
MYSQL_ROOT_PASSWORD: <your-password>
405-
MYSQL_DATABASE: todos
405+
MYSQL_DB: todos
406406
407407
volumes:
408408
todo-mysql-data:

docs/extensibility/visualstudio.extensibility/editor/editor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ To avoid misplaced edits, edits from editor extensions are applied as follows:
225225
226226
## Changing caret position or selecting text from an extension
227227
228-
Editing text document from an extension implicitly affects caret position. For example, inserting some text at the caret will move the caret to the end of the inserted text. Extensions can also use [`ITextViewSnapshot.AsEditable().SetSelections()`](/dotnet/api/microsoft.visualstudio.text.itextvieweditor.setselections) to set the caret explicitly to a different position or make text selections. To illustrate, the following code would insert some text, but keep the caret at the original position:
228+
Editing text document from an extension implicitly affects caret position. For example, inserting some text at the caret will move the caret to the end of the inserted text. Extensions can also use [`ITextViewSnapshot.AsEditable().SetSelections()`](/dotnet/api/microsoft.visualstudio.extensibility.editor.itextvieweditor.setselections) to set the caret explicitly to a different position or make text selections. To illustrate, the following code would insert some text, but keep the caret at the original position:
229229
230230
```csharp
231231
await this.Extensibility.Editor().EditAsync(batch =>
@@ -264,7 +264,7 @@ Text view margins are placed into a margin container (see [ContainerMarginPlacem
264264
265265
Text view margin providers implement [ITextViewMarginProvider](/dotnet/api/microsoft.visualstudio.extensibility.editor.itextviewmarginprovider) interface, configure the margin they provide by implementing [TextViewMarginProviderConfiguration](/dotnet/api/microsoft.visualstudio.extensibility.editor.itextviewmarginprovider.textviewmarginproviderconfiguration) and when activated, provide UI control to be hosted in the margin via [CreateVisualElementAsync](/dotnet/api/microsoft.visualstudio.extensibility.editor.itextviewmarginprovider.createvisualelementasync).
266266
267-
Because extensions in VisualStudio.Extensibility might be out-of-process from the Visual Studio, we can't directly use WPF as a presentation layer for content of text view margins. Instead, providing a content to a text view margin requires creating a [RemoteUserControl](./../inside-the-sdk/remote-ui.md) and the corresponding data template for that control. While there are some simple examples below, we recommend reading the [Remote UI documentation](./../inside-the-sdk/remote-ui.md) when creating text view margin UI content.
267+
Because extensions in VisualStudio.Extensibility might be out-of-process from the Visual Studio, we can't directly use WPF as a presentation layer for content of text view margins. Instead, providing a content to a text view margin requires creating a [RemoteUserControl](./../inside-the-sdk/remote-ui.md#create-the-remote-user-control) and the corresponding data template for that control. While there are some simple examples below, we recommend reading the [Remote UI documentation](./../inside-the-sdk/remote-ui.md) when creating text view margin UI content.
268268
269269
```csharp
270270
/// <summary>

docs/extensibility/visualstudio.extensibility/output-window/output-window.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The Output window in the Visual Studio IDE is a [Tool Window](./../tool-window/t
1919
> [!IMPORTANT]
2020
> The VisualStudio.Extensibility Output window APIs are currently in preview and are subject to change. Any extension that leverages these APIs may fail to work in future versions of Visual Studio and will need to be updated when a newer version of the APIs is released.
2121
22-
To get started, follow the [create the project](./../get-started/create-your-first-extension.md) section in Getting Started section.
22+
To get started, follow the [create the project](./../get-started/create-your-first-extension.md#create-the-extension-project) section in Getting Started section.
2323

2424
## Work with the Output window
2525

subscriptions/assign-github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ You can review the impacted subscribers and specify whether you would like to no
6565
Selecting the **Move subscribers** button allows you to move all recommended subscribers or choose individuals from a list. After you confirm your selections, it takes a few seconds for the subscription moves to complete. If applicable, perform these steps for Professional and Enterprise separately.
6666

6767
> [!NOTE]
68-
> If you need to update a single subscriber currently assigned through a Microsoft Entra group, see our article about [Editing Visual Studio subscription assignments](https://learn.microsoft.com/visualstudio/subscriptions/edit-license]).
68+
> If you need to update a single subscriber currently assigned through a Microsoft Entra group, see our article about [Editing Visual Studio subscription assignments](/visualstudio/subscriptions/edit-license).
6969
7070
## Invite subscribers to your organization
7171

0 commit comments

Comments
 (0)