Skip to content

Commit 3b4540d

Browse files
v-dirichardsv-dirichards
authored
Merge pull request #277273 from alexbuckgit/alexbuckgit/docutune-autopr-20240605-130753-9035457-ignore-build
[BULK] - DocuTune - Minor formatting and syntax fixes (part 4)
2 parents bf04768 + ce013d4 commit 3b4540d

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎articles/event-hubs/send-and-receive-events-using-data-generator.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To complete this QuickStart, you need the following prerequisites:
2020

2121
- Microsoft Azure subscription. To use Azure services, including Azure Event Hubs, you need a subscription. If you don't have an existing Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
2222

23-
- Create Event Hubs namespace and an event hub. The first step is to use the Azure portal to create an Event Hubs namespace and an event hub in the namespace. To create a namespace and an event hub, see [QuickStart: Create an event hub using Azure portal. ](event-hubs-create.md)
23+
- Create Event Hubs namespace and an event hub. The first step is to use the Azure portal to create an Event Hubs namespace and an event hub in the namespace. To create a namespace and an event hub, see [QuickStart: Create an event hub using Azure portal](event-hubs-create.md).
2424

2525
> [!NOTE]
2626
> Data Generator for Azure Event Hubs is in Public Preview.
@@ -51,9 +51,9 @@ You could follow these steps to send events to Azure Event Hubs Data Generator:
5151

5252
You could send data until the permitted payload size with Data Generator. The following table talks about maximum message/payload size that you could send with Data Generator.
5353

54-
Tier | Basic | Standard | Premium | Dedicated
55-
--------------------|-------------|--------------|---------|----------|
56-
Maximum Payload Size| 256 Kb | 1 MB | 1 MB | 1 MB
54+
| Tier | Basic | Standard | Premium | Dedicated |
55+
|--|--|--|--|--|
56+
| Maximum Payload Size| 256 Kb | 1 MB | 1 MB | 1 MB |
5757

5858
## View events using Event Hubs Data Generator
5959

‎articles/machine-learning/component-reference/apply-math-operation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ The order for division and subtraction are as follows:
251251

252252
The following table shows some examples
253253

254-
Operation|Num1|Num2|Result column|Result value|
255-
----|----|----|----|----
254+
|Operation|Num1|Num2|Result column|Result value|
255+
|----|----|----|----|----|
256256
|Addition|1|5|Add(Num2_Num1)| 6|
257257
|Multiplication|1|5|Multiple(Num2_Num1)|5|
258258
|Subtraction|5|1|Subtract(Num2_Num1)|4|

‎articles/machine-learning/v1/how-to-access-data.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ Datastores currently support storage of connection information to the storage se
6565
> [!TIP]
6666
> **For unsupported storage solutions** (those not listed in the following table), you might encounter issues as you connect and work with your data. We suggest that you [move your data](#move-data-to-supported-azure-storage-solutions) to a supported Azure storage solution. This can also help with additional scenarios- - for example, reduction of data egress cost during ML experiments.
6767
68-
| Storage type | Authentication type | [Azure Machine Learning studio](https://ml.azure.com/) | [Azure Machine Learning  Python SDK](/python/api/overview/azure/ml/intro) | [Azure Machine Learning CLI](reference-azure-machine-learning-cli.md) | [Azure Machine Learning  REST API](/rest/api/azureml/) | VS Code
69-
---|---|---|---|---|---|---
70-
[Azure&nbsp;Blob&nbsp;Storage](../../storage/blobs/storage-blobs-overview.md)| Account key <br> SAS token | ✓ | ✓ | ✓ |✓ |✓
71-
[Azure&nbsp;File&nbsp;Share](../../storage/files/storage-files-introduction.md)| Account key <br> SAS token | ✓ | ✓ | ✓ |✓|✓
72-
[Azure&nbsp;Data Lake&nbsp;Storage Gen&nbsp;1](../../data-lake-store/index.yml)| Service principal| ✓ | ✓ | ✓ |✓|
73-
[Azure&nbsp;Data Lake&nbsp;Storage Gen&nbsp;2](../../storage/blobs/data-lake-storage-introduction.md)| Service principal| ✓ | ✓ | ✓ |✓|
74-
[Azure&nbsp;SQL&nbsp;Database](/azure/azure-sql/database/sql-database-paas-overview)| SQL authentication <br>Service principal| ✓ | ✓ | ✓ |✓|
75-
[Azure&nbsp;PostgreSQL](/azure/postgresql/overview) | SQL authentication| ✓ | ✓ | ✓ |✓|
76-
[Azure&nbsp;Database&nbsp;for&nbsp;MySQL](/azure/mysql/overview) | SQL authentication| | ✓* | ✓* |✓*|
77-
[Databricks&nbsp;File&nbsp;System](/azure/databricks/data/databricks-file-system)| No authentication | | ✓** | ✓ ** |✓** |
68+
| Storage&nbsp;type | Authentication&nbsp;type | [Azure&nbsp;Machine&nbsp;Learning studio](https://ml.azure.com/) | [Azure&nbsp;Machine&nbsp;Learning&nbsp; Python SDK](/python/api/overview/azure/ml/intro) | [Azure&nbsp;Machine&nbsp;Learning CLI](reference-azure-machine-learning-cli.md) | [Azure&nbsp;Machine&nbsp;Learning&nbsp; REST API](/rest/api/azureml/) | VS Code |
69+
|---|---|---|---|---|---|---|
70+
| [Azure&nbsp;Blob&nbsp;Storage](../../storage/blobs/storage-blobs-overview.md)| Account key <br> SAS token | ✓ | ✓ | ✓ |✓ |✓|
71+
| [Azure&nbsp;File&nbsp;Share](../../storage/files/storage-files-introduction.md)| Account key <br> SAS token | ✓ | ✓ | ✓ |✓|✓|
72+
| [Azure&nbsp;Data Lake&nbsp;Storage Gen&nbsp;1](../../data-lake-store/index.yml)| Service principal| ✓ | ✓ | ✓ |✓||
73+
| [Azure&nbsp;Data Lake&nbsp;Storage Gen&nbsp;2](../../storage/blobs/data-lake-storage-introduction.md)| Service principal| ✓ | ✓ | ✓ |✓||
74+
| [Azure&nbsp;SQL&nbsp;Database](/azure/azure-sql/database/sql-database-paas-overview)| SQL authentication <br>Service principal| ✓ | ✓ | ✓ |✓||
75+
| [Azure&nbsp;PostgreSQL](/azure/postgresql/overview) | SQL authentication| ✓ | ✓ | ✓ |✓||
76+
| [Azure&nbsp;Database&nbsp;for&nbsp;MySQL](/azure/mysql/overview) | SQL authentication| | ✓* | ✓* |✓*||
77+
| [Databricks&nbsp;File&nbsp;System](/azure/databricks/data/databricks-file-system)| No authentication | | ✓** | ✓ ** |✓** ||
7878

7979
* MySQL is only supported for pipeline [DataTransferStep](/python/api/azureml-pipeline-steps/azureml.pipeline.steps.datatransferstep).
8080
* Databricks is only supported for pipeline [DatabricksStep](/python/api/azureml-pipeline-steps/azureml.pipeline.steps.databricks_step.databricksstep).

‎articles/mariadb/concepts-compatibility.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ Azure Database for MariaDB uses the community edition of MariaDB server. Therefo
1919

2020
The goal is to support the three most recent versions MariaDB drivers, and efforts with authors from the open source community to constantly improve the functionality and usability of MariaDB drivers continue. A list of drivers that have been tested and found to be compatible with Azure Database for MariaDB 10.2 is provided in the following table:
2121

22-
**Driver** | **Links** | **Compatible Versions** | **Incompatible Versions** | **Notes**
23-
---|---|---|---|---
24-
PHP | https://secure.php.net/downloads.php | 5.5, 5.6, 7.x | 5.3 | For PHP 7.0 connection with SSL MySQLi, add MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT in the connection string. <br> ```mysqli_real_connect($conn, $host, $username, $password, $db_name, 3306, NULL, MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT);```<br> PDO set: ```PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT``` option to false.
25-
.NET | [MySqlConnector on GitHub](https://github.com/mysql-net/MySqlConnector) <br> [Installation package from NuGet](https://www.nuget.org/packages/MySqlConnector/) | 0.27 and after | 0.26.5 and before |
26-
MySQL Connector/NET | [MySQL Connector/NET](https://github.com/mysql/mysql-connector-net) | 8.0, 7.0, 6.10 | | An encoding bug may cause connections to fail on some non-UTF8 Windows systems.
27-
Node.js | [MySQLjs on GitHub](https://github.com/mysqljs/mysql/) <br> Installation package from NPM:<br> Run `npm install mysql` from NPM | 2.15 | 2.14.1 and before
28-
GO | https://github.com/go-sql-driver/mysql/releases | 1.3, 1.4 | 1.2 and before | Use `allowNativePasswords=true` in the connection string for version 1.3. Version 1.4 contains a fix and `allowNativePasswords=true` is no longer required.
29-
Python | https://pypi.python.org/pypi/mysql-connector-python | 1.2.3, 2.0, 2.1, 2.2 | 1.2.2 and before |
30-
Java | https://downloads.mariadb.org/connector-java/ | 2.1, 2.0, 1.6 | 1.5.5 and before |
22+
| **Driver** | **Links** | **Compatible Versions** | **Incompatible Versions** | **Notes** |
23+
| ---|---|---|---|--- |
24+
| PHP | https://secure.php.net/downloads.php | 5.5, 5.6, 7.x | 5.3 | For PHP 7.0 connection with SSL MySQLi, add MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT in the connection string. <br> ```mysqli_real_connect($conn, $host, $username, $password, $db_name, 3306, NULL, MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT);```<br> PDO set: ```PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT``` option to false. |
25+
| .NET | [MySqlConnector on GitHub](https://github.com/mysql-net/MySqlConnector) <br> [Installation package from NuGet](https://www.nuget.org/packages/MySqlConnector/) | 0.27 and after | 0.26.5 and before | |
26+
| MySQL Connector/NET | [MySQL Connector/NET](https://github.com/mysql/mysql-connector-net) | 8.0, 7.0, 6.10 | | An encoding bug may cause connections to fail on some non-UTF8 Windows systems. |
27+
| Node.js | [MySQLjs on GitHub](https://github.com/mysqljs/mysql/) <br> Installation package from NPM:<br> Run `npm install mysql` from NPM | 2.15 | 2.14.1 and before | |
28+
| Go | https://github.com/go-sql-driver/mysql/releases | 1.3, 1.4 | 1.2 and before | Use `allowNativePasswords=true` in the connection string for version 1.3. Version 1.4 contains a fix and `allowNativePasswords=true` is no longer required. |
29+
| Python | https://pypi.python.org/pypi/mysql-connector-python | 1.2.3, 2.0, 2.1, 2.2 | 1.2.2 and before | |
30+
| Java | https://downloads.mariadb.org/connector-java/ | 2.1, 2.0, 1.6 | 1.5.5 and before | |
3131

3232
## Management Tools
3333

3434
The compatibility advantage extends to database management tools as well. Your existing tools should continue to work with Azure Database for MariaDB, as long as the database manipulation operates within the confines of user permissions. Three common database management tools that have been tested and found to be compatible with Azure Database for MariaDB 10.2 are listed in the following table:
3535

36-
| Action | **MySQL Workbench 6.x and up** | **Navicat 12** | **PHPMyAdmin 4.x and up**
37-
---|---|---|---
38-
Create, Update, Read, Write, Delete | X | X | X
39-
SSL Connection | X | X | X
40-
SQL Query Auto Completion | X | X |
41-
Import and Export Data | X | X | X
42-
Export to Multiple Formats | X | X | X
43-
Back up and Restore | | X |
44-
Display Server Parameters | X | X | X
45-
Display Client Connections | X | X | X
36+
| Action | **MySQL Workbench 6.x and up** | **Navicat 12** | **PHPMyAdmin 4.x and up** |
37+
| ---|---|---|--- |
38+
| Create, Update, Read, Write, Delete | X | X | X |
39+
| SSL Connection | X | X | X |
40+
| SQL Query Auto Completion | X | X | |
41+
| Import and Export Data | X | X | X |
42+
| Export to Multiple Formats | X | X | X |
43+
| Back up and Restore | | X | |
44+
| Display Server Parameters | X | X | X |
45+
| Display Client Connections | X | X | X |
4646

4747
## Next steps
4848

0 commit comments

Comments
 (0)