Skip to content

Commit 3b57ccc

Browse files
authored
Merge pull request #70295 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 6e07567 + 4de97c0 commit 3b57ccc

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ To download the log files using the Azure Command Line Interface, open a new com
111111

112112
az webapp log download --resource-group resourcegroupname --name appname
113113

114-
This command saves the logs for the app named 'appname' to a file named **diagnostics.zip** in the current directory.
114+
This command saves the logs for the app named 'appname' to a file named **webapp_logs.zip** in the current directory.
115115

116116
> [!NOTE]
117117
> If you haven't installed Azure CLI, or haven't configured it to use your Azure Subscription, see [How to Use Azure CLI](https://docs.microsoft.com/cli/azure/get-started-with-azure-cli?view=azure-cli-latest).

articles/azure-functions/run-functions-from-deployment-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To enable your function app to run from a package, you just add a `WEBSITE_RUN_F
4141

4242
| Value | Description |
4343
|---------|---------|
44-
| **`1`** | Recommended for function apps running on Windows. Run from a package file in the `d:\home\data\SitePackages` folder of your function app. If not [deploying with zip deploy](#integration-with-zip-deployment], this option requires the folder to also have a file named `packagename.txt`. This file contains only the name of the package file in folder, without any whitespace. |
44+
| **`1`** | Recommended for function apps running on Windows. Run from a package file in the `d:\home\data\SitePackages` folder of your function app. If not [deploying with zip deploy](#integration-with-zip-deployment), this option requires the folder to also have a file named `packagename.txt`. This file contains only the name of the package file in folder, without any whitespace. |
4545
|**`<url>`** | Location of a specific package file you want to run. When using Blob storage, you should use a private container with a [Shared Access Signature (SAS)](../vs-azure-tools-storage-manage-with-storage-explorer.md#attach-a-storage-account-by-using-a-shared-access-signature-sas) to enable the Functions runtime to access to the package. You can use the [Azure Storage Explorer](https://azure.microsoft.com/features/storage-explorer/) to upload package files to your Blob storage account. |
4646

4747
> [!CAUTION]

articles/cognitive-services/Computer-vision/concept-categorizing-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In addition to tags and a description, Computer Vision returns the taxonomy-base
2020

2121
## The 86-category concept
2222

23-
Computer vision can categorize an image broadly or specifically, using the list of 86 categroies in the following diagram. For the full taxonomy in text format, see [Category Taxonomy](category-taxonomy.md).
23+
Computer vision can categorize an image broadly or specifically, using the list of 86 categories in the following diagram. For the full taxonomy in text format, see [Category Taxonomy](category-taxonomy.md).
2424

2525
![Grouped lists of all the categories in the category taxonomy](./Images/analyze_categories-v2.png)
2626

articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-entity-linking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Details on request definition can be found in [How to call the Text Analytics AP
103103
104104
## Step 2: Post the request
105105

106-
Analysis is performed upon receipt of the request. The service accepts up to 100 requests per minute. Each request can be a maximum of 1 MB.
106+
Analysis is performed upon receipt of the request. The service accepts up to 100 requests per second and 1000 requests per minute. Each request can be a maximum of 1 MB.
107107

108108
Recall that the service is stateless. No data is stored in your account. Results are returned immediately in the response.
109109

articles/marketplace/cloud-partner-portal/test-drive/logic-app-test-drive.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ Given we are using the application to deploy to the subscription, we need to add
137137

138138
![Azure Active Directory Keys section](./media/azure-resource-manager-test-drive/subdetails8.png)
139139

140+
> [!CAUTION]
141+
> You cannot use the Azure App Registration Preview because it does not currently generate a base64 encoded key.
142+
143+
140144
Next steps
141145
----------
142146

articles/search/search-what-is-an-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Arriving at the right index design is typically achieved through multiple iterat
4040

4141
6. Continue using code to iterate over your design.
4242

43-
Because physical structures are created in the service, [dropping and recreating indexes](search-howto-reindex.md) is necessary whenever you make material changes to ab existing field definition. This means that during development, you should plan on frequent rebuilds. You might consider working with a subset of your data to make rebuilds go faster.
43+
Because physical structures are created in the service, [dropping and recreating indexes](search-howto-reindex.md) is necessary whenever you make material changes to an existing field definition. This means that during development, you should plan on frequent rebuilds. You might consider working with a subset of your data to make rebuilds go faster.
4444

4545
Code, rather than a portal approach, is recommended for iterative design. If you rely on the portal for index definition, you will have to fill out the index definition on each rebuild. As an alternative, tools like [Postman and the REST API](search-fiddler.md) are helpful for proof-of-concept testing when development projects are still in early phases. You can make incremental changes to an index definition in a request body, and then send the request to your service to recreate an index using an updated schema.
4646

articles/site-recovery/migrate-tutorial-on-premises-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Run a failover for the machines you want to migrate.
110110
5. Check that the Azure VM appears in Azure as expected.
111111
6. In **Replicated items**, right-click the VM > **Complete Migration**. This does the following:
112112

113-
- Finishes the migration process, stops replication for the AWS VM, and stops Site Recovery billing for the VM.
113+
- Finishes the migration process, stops replication for the on-premises VM, and stops Site Recovery billing for the VM.
114114
- This step cleans up the replication data. It doesn't delete the migrated VMs.
115115

116116
![Complete migration](./media/migrate-tutorial-on-premises-azure/complete-migration.png)

0 commit comments

Comments
 (0)