Skip to content

Commit 32fadc2

Browse files
authored
Merge pull request #262540 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 5c2bd8c + 1d2c7db commit 32fadc2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

articles/ai-services/openai/reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,9 @@ curl -i -X POST YOUR_RESOURCE_NAME/openai/deployments/YOUR_DEPLOYMENT_NAME/exten
379379
{
380380
"type": "AzureCognitiveSearch",
381381
"parameters": {
382-
"endpoint": "'YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT'",
383-
"key": "'YOUR_AZURE_COGNITIVE_SEARCH_KEY'",
384-
"indexName": "'YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME'"
382+
"endpoint": "YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT",
383+
"key": "YOUR_AZURE_COGNITIVE_SEARCH_KEY",
384+
"indexName": "YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME"
385385
}
386386
}
387387
],

articles/azure-monitor/app/opentelemetry-add-modify.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
22222222
class SpanFilteringProcessor(SpanProcessor):
22232223

22242224
# Prevents exporting spans from internal activities.
2225-
def on_start(self, span):
2225+
def on_start(self, span, parent_context):
22262226
# Check if the span is an internal activity.
22272227
if span._kind is SpanKind.INTERNAL:
22282228
# Create a new span context with the following properties:
@@ -2235,7 +2235,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
22352235
span.context.trace_id,
22362236
span.context.span_id,
22372237
span.context.is_remote,
2238-
TraceFlags.DEFAULT,
2238+
TraceFlags(TraceFlags.DEFAULT),
22392239
span.context.trace_state,
22402240
)
22412241

articles/container-apps/start-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Containers package your applications in an easy-to-transport unit. Here are a fe
3333

3434
- **Consistency**: Goods in a shipping container remain safe and unchanged during transport. Similarly, a software container guarantees consistent application behavior among different environments.
3535

36-
- **Flexibility**: Despite the diverse contents of a shipping container, transportation methods remain standardized. Software containers encapsulate different apps and technologies, but maintain are maintained in a standardized fashion.
36+
- **Flexibility**: Despite the diverse contents of a shipping container, transportation methods remain standardized. Software containers encapsulate different apps and technologies, but are maintained in a standardized fashion.
3737

3838
- **Efficiency**: Just as shipping containers optimize transport by allowing efficient stacking on ships and trucks, software containers optimize the use of computing resources. This optimization allows multiple containers to operate simultaneously on a single server.
3939

articles/data-factory/copy-activity-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To copy data from a source to a sink, the service that runs the Copy activity pe
3636
:::image type="content" source="media/copy-activity-overview/copy-activity-overview.png" alt-text="Copy activity overview":::
3737

3838
> [!NOTE]
39-
> If a self-hosted integration runtime is used in either a source or sink data store within a Copy activity, then both the source and sink must be accessible from the server hosting the integartion runtime for the Copy activity to be successful.
39+
> If a self-hosted integration runtime is used in either a source or sink data store within a Copy activity, then both the source and sink must be accessible from the server hosting the integration runtime for the Copy activity to be successful.
4040
4141
## Supported data stores and formats
4242

articles/databox-online/azure-stack-edge-gpu-deploy-add-shares.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To create a share, do the following procedure:
6161
The type of service you select depends on which format you want the data to use in Azure. In this example, because we want to store the data as block blobs in Azure, we select **Block Blob**. If you select **Page Blob**, make sure that your data is 512 bytes aligned. For example, a VHDX is always 512 bytes aligned.
6262

6363
> [!IMPORTANT]
64-
> Make sure that the Azure Storage account that you use does not have immutability policies or archiving policies set on it if you are using it with a Azure Stack Edge Pro or Data Box Gateway device. If the blob policies are immutable or if the blobs are aggressively archived, you'll experience upload errors when the blob is changed in the share. For more information, see [Set and manage immutability policies for blob storage](../storage/blobs/immutable-policy-configure-version-scope.md).
64+
> Make sure that the Azure Storage account that you use does not have immutability policies or archiving policies set on it if you are using it with an Azure Stack Edge Pro or Data Box Gateway device. If the blob policies are immutable or if the blobs are aggressively archived, you'll experience upload errors when the blob is changed in the share. For more information, see [Set and manage immutability policies for blob storage](../storage/blobs/immutable-policy-configure-version-scope.md).
6565
6666
e. Create a new blob container or use an existing one from the dropdown list. If creating a blob container, provide a container name. If a container doesn't already exist, it's created in the storage account with the newly created share name.
6767

articles/machine-learning/how-to-access-azureml-behind-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ __Outbound traffic__
8383
| `AzureMonitor` | 443 | Used to log monitoring and metrics to Azure Monitor. Only needed if you haven't [secured Azure Monitor](how-to-secure-workspace-vnet.md#secure-azure-monitor-and-application-insights) for the workspace. </br>* This outbound is also used to log information for support incidents. |
8484

8585
> [!IMPORTANT]
86-
> If a compute instance or compute cluster is configured for no public IP, by default it can't access the internet. If it *can* still send outbound traffic to the internet, it is because of Azure [default outbound access](../virtual-network/ip-services/default-outbound-access.md#when-is-default-outbound-access-provided) and you have an NSG that allows outbound to the internet. We **don't recocmmend** using the default outbound access. If you need outbound access to the internet, we recommend using one of the following options instead of the default outbound access:
86+
> If a compute instance or compute cluster is configured for no public IP, by default it can't access the internet. If it *can* still send outbound traffic to the internet, it is because of Azure [default outbound access](../virtual-network/ip-services/default-outbound-access.md#when-is-default-outbound-access-provided) and you have an NSG that allows outbound to the internet. We **don't recommend** using the default outbound access. If you need outbound access to the internet, we recommend using one of the following options instead of the default outbound access:
8787
>
8888
> * __Azure Virtual Network NAT with a public IP__: For more information on using Virtual Network Nat, see the [Virtual Network NAT](../virtual-network/nat-gateway/nat-overview.md) documentation.
8989
> * __User-defined route and firewall__: Create a user-defined route in the subnet that contains the compute. The __Next hop__ for the route should reference the private IP address of the firewall, with an address prefix of 0.0.0.0/0.

0 commit comments

Comments
 (0)