Skip to content

Commit 5ef4979

Browse files
authored
Merge pull request #25606 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to main to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 8f04269 + e4490aa commit 5ef4979

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

azure-sql/virtual-machines/windows/security-considerations-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Consider the following limitations
109109
- Once Azure AD authentication is enabled, there is no way to disable it by using the Azure portal.
110110
- Currently, enabling Azure AD authentication is only possible through the Azure portal.
111111
- Currently, Azure AD authentication is only available to SQL Server VMs deployed to the public cloud.
112-
112+
- Currently, Authenticating to SQL VM through AAD authentication using [FIDO2 method](/azure/active-directory/authentication/howto-authentication-passwordless-faqs) is not supported.
113113

114114

115115
## Azure Advisor
@@ -237,4 +237,4 @@ To learn more, see the other articles in this best practices series:
237237
- [VM size](performance-guidelines-best-practices-vm-size.md)
238238
- [Storage](performance-guidelines-best-practices-storage.md)
239239
- [HADR settings](hadr-cluster-best-practices.md)
240-
- [Collect baseline](performance-guidelines-best-practices-collect-baseline.md)
240+
- [Collect baseline](performance-guidelines-best-practices-collect-baseline.md)

docs/relational-databases/system-stored-procedures/sp-fulltext-database-transact-sql.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
2222
# sp_fulltext_database (Transact-SQL)
2323
[!INCLUDE [SQL Server Azure SQL Database Azure SQL Managed Instance](../../includes/applies-to-version/sql-asdb-asdbmi.md)]
2424

25-
Has no effect on full-text catalogs in [!INCLUDE[sql2008-md](../../includes/sql2008-md.md)] and later versions and is supported for backward compatibility only. **sp_fulltext_database** does not disable the Full-Text Engine for a given database. All user-created databases in [!INCLUDE [ssnoversion-md](../../includes/ssnoversion-md.md)] are always enabled for full-text indexing.
25+
This is supported for backward compatibility only. **sp_fulltext_database** does not disable the Full-Text Engine for a given database. All user-created databases in [!INCLUDE [ssnoversion-md](../../includes/ssnoversion-md.md)] are always enabled for full-text indexing.
2626

2727
> [!IMPORTANT]
2828
> [!INCLUDE[ssNoteDepFutureAvoid](../../includes/ssnotedepfutureavoid-md.md)] Use [!INCLUDE[ssManStudio](../../includes/ssmanstudio-md.md)] instead.
@@ -42,8 +42,8 @@ sp_fulltext_database [@action=/proxy/https/github.com/MicrosoftDocs/sql-docs/commit/] 'action'
4242

4343
|Value|Description|
4444
|-----------|-----------------|
45-
|**enable**|Supported for backward compatibility only. Has no effect on full-text catalogs in [!INCLUDE[sql2008-md](../../includes/sql2008-md.md)] and later versions.|
46-
|**disable**|Supported for backward compatibility only. Has no effect on full-text catalogs in [!INCLUDE[sql2008-md](../../includes/sql2008-md.md)] and later versions.|
45+
|**enable**|Supported for backward compatibility only. It will rebuild all Fulltext catalogs of the database if the previous state of Fulltext is "disabled".|
46+
|**disable**|Supported for backward compatibility only.|
4747

4848
## Return Code Values
4949
0 (success) or 1 (failure)

docs/t-sql/queries/predict-transact-sql.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ monikerRange: ">=sql-server-2017||=azuresqldb-current||>=sql-server-linux-2017||
2525

2626
Generates a predicted value or scores based on a stored model. For more information, see [Native scoring using the PREDICT T-SQL function](../../machine-learning/predictions/native-scoring-predict-transact-sql.md).
2727

28-
> [!IMPORTANT]
29-
> Support for `PREDICT` is in Preview in Azure SQL Managed Instance.
30-
3128
[!INCLUDE [select-product](../includes/select-product.md)]
3229

3330
::: moniker range=">=sql-server-2017||>=sql-server-linux-2017"
@@ -169,7 +166,7 @@ The `MODEL` parameter is used to specify the model used for scoring or predictio
169166
In Azure SQL Managed Instance, `PREDICT` supports models in [Open Neural Network Exchange (ONNX)](https://onnx.ai/get-started.html) format or models trained using the [RevoScaleR](../../machine-learning/r/ref-r-revoscaler.md) and [revoscalepy](../../machine-learning/python/ref-py-revoscalepy.md) packages.
170167

171168
> [!IMPORTANT]
172-
> Support for `PREDICT` is in Preview in Azure SQL Managed Instance.
169+
> Support for ONNX in `PREDICT` is in preview in Azure SQL Managed Instance.
173170
174171
::: moniker-end
175172

@@ -186,7 +183,7 @@ The DATA parameter is used to specify the data used for scoring or prediction. D
186183
**RUNTIME = ONNX**
187184

188185
> [!IMPORTANT]
189-
> The `RUNTIME = ONNX` argument is only available in [Azure SQL Edge](/azure/sql-database-edge/onnx-overview), [Azure Synapse Analytics](/azure/synapse-analytics/overview-what-is), and is in Preview in [Azure SQL Managed Instance](/azure/azure-sql/managed-instance/machine-learning-services-overview).
186+
> The `RUNTIME = ONNX` argument is only available in [Azure SQL Edge](/azure/sql-database-edge/onnx-overview), [Azure Synapse Analytics](/azure/synapse-analytics/overview-what-is), and is in preview in [Azure SQL Managed Instance](/azure/azure-sql/managed-instance/machine-learning-services-overview).
190187
191188
Indicates the machine learning engine used for model execution. The `RUNTIME` parameter value is always `ONNX`. The parameter is required for Azure SQL Edge and Azure Synapse Analytics. On Azure SQL Managed Instance (in Preview), the parameter is optional and only used when using ONNX models.
192189

@@ -259,7 +256,7 @@ FROM PREDICT(MODEL = @model,
259256

260257
The alias **d** specified for table source in the `DATA` parameter is used to reference the columns belonging to `dbo.mytable`. The alias **p** specified for the `PREDICT` function is used to reference the columns returned by the `PREDICT` function.
261258

262-
- The model is stored as `varbinary(max)` column in table call **Models**. Additional information such as **ID** and **description** is saved in the table to identify the mode.
259+
- The model is stored as `varbinary(max)` column in table called `Models`. Additional information such as `ID` and `description` is saved in the table to identify the model.
263260
- The alias **d** specified for table source in the `DATA` parameter is used to reference the columns belonging to `dbo.mytable`. The input data column names should match the name of inputs for the model.
264261
- The alias **p** specified for the `PREDICT` function is used to reference the predicted column returned by the `PREDICT` function. The column name should have the same name as the output name for the model.
265262
- All input data columns and the predicted columns are available to display in the SELECT statement.
@@ -306,8 +303,8 @@ FROM PREDICT(MODEL = @model, DATA = dbo.mytable AS d, RUNTIME = ONNX) WITH(score
306303

307304
:::moniker-end
308305

309-
- The results of `PREDICT` are stored in a table called PredictionResults.
310-
- The model is stored as `varbinary(max)` column in table call **Models**. Additional information such as ID and description can be saved in the table to identify the model.
306+
- The results of `PREDICT` are stored in a table called `PredictionResults`.
307+
- The model is stored as `varbinary(max)` column in table called `Models`. Additional information such as ID and description can be saved in the table to identify the model.
311308
- The alias **d** specified for table source in the `DATA` parameter is used to reference the columns in `dbo.mytable`. The input data column names should match the name of inputs for the model.
312309
- The alias **p** specified for the `PREDICT` function is used to reference the predicted column returned by the `PREDICT` function. The column name should have the same name as the output name for the model.
313310
- All input columns and the predicted column are available to display in the SELECT statement.
@@ -321,4 +318,4 @@ Learn more about related concepts in the following articles:
321318
- [Revoscalepy (Python package in SQL Server Machine Learning Services)](../../machine-learning/python/ref-py-revoscalepy.md)
322319
- [OPENXML (Transact-SQL)](../functions/openxml-transact-sql.md)
323320
- [Learn more about ONNX models](/azure/machine-learning/concept-onnx#get-onnx-models)
324-
- [STRING_SPLIT (Transact-SQL)](../functions/string-split-transact-sql.md)
321+
- [STRING_SPLIT (Transact-SQL)](../functions/string-split-transact-sql.md)

0 commit comments

Comments
 (0)