Skip to content

Commit 5d81d16

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into march31updates
2 parents 995bff8 + 52a7917 commit 5d81d16

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

articles/azure-cache-for-redis/cache-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Unfortunately, there's no easy answer. Each application needs to decide what op
6363
If you would like to test how your code works under error conditions, consider using the [Reboot feature](cache-administration.md#reboot). Rebooting allows you to see how connection blips affect your application.
6464

6565
## Performance testing
66-
* **Start by using `redis-benchmark.exe`** to get a feel for possible throughput/latency before writing your own perf tests. Redis-benchmark documentation can be [found here](https://redis.io/topics/benchmarks). Note that redis-benchmark doesn't support SSL, so you'll have to [enable the Non-SSL port through the Portal](cache-configure.md#access-ports) before you run the test. [A windows compatible version of redis-benchmark.exe can be found here](https://github.com/MSOpenTech/redis/releases)
66+
* **Start by using `redis-benchmark.exe`** to get a feel for possible throughput/latency before writing your own perf tests. Redis-benchmark documentation can be [found here](https://redis.io/topics/benchmarks). Note that redis-benchmark doesn't support TLS, so you'll have to [enable the Non-TLS port through the Portal](cache-configure.md#access-ports) before you run the test. [A windows compatible version of redis-benchmark.exe can be found here](https://github.com/MSOpenTech/redis/releases)
6767
* The client VM used for testing should be **in the same region** as your Redis cache instance.
6868
* **We recommend using Dv2 VM Series** for your client as they have better hardware and will give the best results.
6969
* Make sure the client VM you use has **at least as much compute and bandwidth* as the cache being tested.

articles/cognitive-services/QnAMaker/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Learn more about [pricing tiers](Concepts/azure-resources.md).
2626
<summary><b>How to get the QnAMaker service endpoint</b></summary>
2727

2828
**Answer**:
29-
QnAMaker service endpoint is useful for debugging purposes when you contact QnAMaker Support or UserVoice. The endpoint is a URL in this form: https://your-resource-name.azurewebsites.net.
29+
QnAMaker service endpoint is useful for debugging purposes when you contact QnAMaker Support or UserVoice. The endpoint is a URL in this form: `https://your-resource-name.azurewebsites.net`.
3030

3131
1. Go to your QnAMaker service (resource group) in the [Azure portal](https://portal.azure.com)
3232

articles/iot-hub/iot-hub-devguide-messages-read-builtin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ By default, messages are routed to the built-in service-facing endpoint (**messa
1919
| **Partition count** | Set this property at creation to define the number of [partitions](../event-hubs/event-hubs-features.md#partitions) for device-to-cloud event ingestion. |
2020
| **Retention time** | This property specifies how long in days messages are retained by IoT Hub. The default is one day, but it can be increased to seven days. |
2121

22-
IoT Hub allows data retention in the built-in Event Hubs for a maximum of 7 days. You can set the retention time during creation of your IoT Hub. Data retention time in IoT Hub depends on your IoT hub tier and unit type. In terms of size, the built-in Event Hubs can retain messages of the maximum message size up to at least 24 hours of quota. For example, for 1 S1 unit IoT Hub provides enough storage to retain at least 400K messages of 4k size each. If your devices are sending smaller messages, they may be retained for longer (up to 7 days) depending on how much storage is consumed. We guarantee retaining the data for the specified retention time as a minimum.
22+
IoT Hub allows data retention in the built-in Event Hubs for a maximum of 7 days. You can set the retention time during creation of your IoT Hub. Data retention time in IoT Hub depends on your IoT hub tier and unit type. In terms of size, the built-in Event Hubs can retain messages of the maximum message size up to at least 24 hours of quota. For example, for 1 S1 unit IoT Hub provides enough storage to retain at least 400K messages of 4k size each. If your devices are sending smaller messages, they may be retained for longer (up to 7 days) depending on how much storage is consumed. We guarantee retaining the data for the specified retention time as a minimum. Messages will expire and will not be accessible after the retention time has passed.
2323

2424
IoT Hub also enables you to manage consumer groups on the built-in device-to-cloud receive endpoint. You can have up to 20 consumer groups for each IoT Hub.
2525

articles/machine-learning/how-to-deploy-and-where.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,9 @@ The classes for local, Azure Container Instances, and AKS web services can be im
533533
from azureml.core.webservice import AciWebservice, AksWebservice, LocalWebservice
534534
```
535535

536-
### Securing deployments with SSL
536+
### Securing deployments with TLS
537537

538-
For more information on how to secure a web service deployment, see [Use SSL to secure a web service](how-to-secure-web-service.md#enable).
538+
For more information on how to secure a web service deployment, see [Enable TLS and deploy](how-to-secure-web-service.md#enable).
539539

540540
### <a id="local"></a> Local deployment
541541

@@ -1169,7 +1169,7 @@ def run(request):
11691169

11701170
* [How to deploy a model using a custom Docker image](how-to-deploy-custom-docker-image.md)
11711171
* [Deployment troubleshooting](how-to-troubleshoot-deployment.md)
1172-
* [Secure Azure Machine Learning web services with SSL](how-to-secure-web-service.md)
1172+
* [Use TLS to secure a web service through Azure Machine Learning](how-to-secure-web-service.md)
11731173
* [Consume an Azure Machine Learning model deployed as a web service](how-to-consume-web-service.md)
11741174
* [Monitor your Azure Machine Learning models with Application Insights](how-to-enable-app-insights.md)
11751175
* [Collect data for models in production](how-to-enable-data-collection.md)

articles/machine-learning/how-to-deploy-azure-container-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ See [deploy your models with VS Code](tutorial-train-deploy-image-classification
8989

9090
* [How to deploy a model using a custom Docker image](how-to-deploy-custom-docker-image.md)
9191
* [Deployment troubleshooting](how-to-troubleshoot-deployment.md)
92-
* [Secure Azure Machine Learning web services with SSL](how-to-secure-web-service.md)
92+
* [Use TLS to secure a web service through Azure Machine Learning](how-to-secure-web-service.md)
9393
* [Consume a ML Model deployed as a web service](how-to-consume-web-service.md)
9494
* [Monitor your Azure Machine Learning models with Application Insights](how-to-enable-app-insights.md)
9595
* [Collect data for models in production](how-to-enable-data-collection.md)

articles/machine-learning/how-to-deploy-azure-kubernetes-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ If you set `cluster_purpose = AksCompute.ClusterPurpose.DEV_TEST`, then the clus
126126
> [!WARNING]
127127
> Do not create multiple, simultaneous attachments to the same AKS cluster from your workspace. For example, attaching one AKS cluster to a workspace using two different names. Each new attachment will break the previous existing attachment(s).
128128
>
129-
> If you want to re-attach an AKS cluster, for example to change SSL or other cluster configuration setting, you must first remove the existing attachment by using [AksCompute.detach()](https://docs.microsoft.com/python/api/azureml-core/azureml.core.compute.akscompute?view=azure-ml-py#detach--).
129+
> If you want to re-attach an AKS cluster, for example to change TLS or other cluster configuration setting, you must first remove the existing attachment by using [AksCompute.detach()](https://docs.microsoft.com/python/api/azureml-core/azureml.core.compute.akscompute?view=azure-ml-py#detach--).
130130
131131
For more information on creating an AKS cluster using the Azure CLI or portal, see the following articles:
132132

@@ -343,7 +343,7 @@ print(token)
343343
* [Secure experimentation and inference in a virtual network](how-to-enable-virtual-network.md)
344344
* [How to deploy a model using a custom Docker image](how-to-deploy-custom-docker-image.md)
345345
* [Deployment troubleshooting](how-to-troubleshoot-deployment.md)
346-
* [Secure Azure Machine Learning web services with SSL](how-to-secure-web-service.md)
346+
* [Use TLS to secure a web service through Azure Machine Learning](how-to-secure-web-service.md)
347347
* [Consume a ML Model deployed as a web service](how-to-consume-web-service.md)
348348
* [Monitor your Azure Machine Learning models with Application Insights](how-to-enable-app-insights.md)
349349
* [Collect data for models in production](how-to-enable-data-collection.md)

articles/storage/blobs/TOC.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
href: storage-blobs-introduction.md
1414
- name: Quickstarts
1515
items:
16-
- name: Manage blobs without code
16+
- name: Work with blobs
1717
items:
1818
- name: Azure portal
1919
href: storage-quickstart-blobs-portal.md
@@ -23,8 +23,6 @@
2323
href: storage-quickstart-blobs-powershell.md
2424
- name: CLI
2525
href: storage-quickstart-blobs-cli.md
26-
- name: Develop with blobs
27-
items:
2826
- name: .NET
2927
items:
3028
- name: .NET (v12 SDK)

0 commit comments

Comments
 (0)