Merge pull request #211584 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)

Author: huypub

articles/active-directory-b2c/error-codes.md

@@ -61,6 +61,7 @@ The following errors can be returned by the Azure Active Directory B2C service.
 | `AADB2C99059` | The supplied request must present a code_challenge. Required for single-page apps using the authorization code flow.| [Authorization code flow](authorization-code-flow.md) |
 | `AADB2C90067` | The post logout redirect URI '{0}' has an invalid format. Specify an https based URL such as 'https://example.com/return' or for native clients use the IETF native client URI 'urn:ietf:wg:oauth:2.0:oob'. | [Send a sign-out request](openid-connect.md#send-a-sign-out-request) |
 | `AADB2C90068` | The provided application with ID '{0}' is not valid against this service. Please use an application created via the B2C portal and try again. | [Register a web application in Azure AD B2C](tutorial-register-applications.md) |
+| `AADB2C90073` | KeyContainer with 'id': '{0}' cannot be found in the directory '{1}' |
 | `AADB2C90075` | The claims exchange '{0}' specified in step '{1}' returned HTTP error response with Code '{2}' and Reason '{3}'. |
 | `AADB2C90077` | User does not have an existing session and request prompt parameter has a value of '{0}'. |
 | `AADB2C90079` | Clients must send a client_secret when redeeming a confidential grant. | [Create a web app client secret](configure-authentication-sample-web-app-with-api.md#step-24-create-a-web-app-client-secret) |

articles/active-directory-b2c/localization-string-ids.md

@@ -158,6 +158,7 @@ The following are the IDs for a content definition with an ID of `api.localaccou
 | **months** | January, February, March, April, May, June, July, August, September, October, November, December |
 | **ver_fail_server** | We are having trouble verifying your email address. Please enter a valid email address and try again. |
 | **error_requiredFieldMissing** | A required field is missing. Please fill out all required fields and try again. |
+| **heading** | User Details |
 | **initial_intro** | Please provide the following details. |
 | **ver_but_resend** | Send new code |
 | **button_continue** | Create |
@@ -234,6 +235,7 @@ The following example shows the use of some of the user interface elements in th
     <LocalizedString ElementType="UxElement" StringId="error_passwordEntryMismatch">The password entry fields do not match. Please enter the same password in both fields and try again.</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="error_requiredFieldMissing">A required field is missing. Please fill out all required fields and try again.</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="helplink_text">What is this?</LocalizedString>
+    <LocalizedString ElementType="UxElement" StringId="heading">User Details</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="initial_intro">Please provide the following details.</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="preloader_alt">Please wait</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="required_field">This information is required.</LocalizedString>

articles/active-directory-b2c/string-transformations.md

@@ -1062,7 +1062,7 @@ Extracts parts of a string claim type, beginning at the character at the specifi
 | InputClaim | inputClaim | string | The claim type, which contains the string. |
 | InputParameter | startIndex | int | The zero-based starting character position of a substring in this instance. |
 | InputParameter | length | int | The number of characters in the substring. |
-| OutputClaim | outputClaim | boolean | A string that is equivalent to the substring of length that begins at startIndex in this instance, or Empty if startIndex is equal to the length of this instance and length is zero. |
+| OutputClaim | outputClaim | string | A string that is equivalent to the substring of length that begins at startIndex in this instance, or Empty if startIndex is equal to the length of this instance and length is zero. |
 
 ### Example of StringSubstring
 

articles/azure-vmware/concepts-design-public-internet-access.md

@@ -1,5 +1,5 @@
 ---
-title: Concept - Internet connectivity design considerations (Preview)
+title: Concept - Internet connectivity design considerations
 description: Options for Azure VMware Solution Internet Connectivity. 
 ms.topic: conceptual
 ms.service: azure-vmware
@@ -72,4 +72,4 @@ The option that you select depends on the following factors:
 
 [Enable Public IP to the NSX Edge for Azure VMware Solution (Preview)](enable-public-ip-nsx-edge.md)
 
-[Disable Internet access or enable a default route](disable-internet-access.md)
+[Disable Internet access or enable a default route](disable-internet-access.md)

articles/container-registry/container-registry-oras-artifacts.md

@@ -1,6 +1,6 @@
 ---
-title: Push and pull supply chain artifacts
-description: Push and pull supply chain artifacts using Azure Registry (Preview)
+title: Attach, push, and pull supply chain artifacts
+description: Attach, push, and pull supply chain artifacts using Azure Registry (Preview)
 author: SteveLasker
 manager: gwallace
 ms.topic: article
@@ -21,7 +21,7 @@ ORAS Artifacts support is a preview feature and subject to [limitations](#previe
 
 ## Prerequisites
 
-* **ORAS CLI** - The ORAS CLI enables push, discover, pull of artifacts to an ORAS Artifacts enabled registry.
+* **ORAS CLI** - The ORAS CLI enables attach, copy, push, discover, pull of artifacts to an ORAS Artifacts enabled registry.
 * **Azure CLI** - To create an identity, list and delete repositories, you need a local installation of the Azure CLI. Version 2.29.1 or later is recommended. Run `az --version `to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
 * **Docker (optional)** - To complete the walkthrough, a container image is referenced. You can use Docker installed locally to build and push a container image, or reference an existing container image. Docker provides packages that easily configure Docker on any [macOS][docker-mac], [Windows][docker-windows], or [Linux][docker-linux] system.
 
@@ -31,11 +31,11 @@ ORAS Artifacts support is not available in the government or China clouds, but a
 
 ## ORAS installation
 
-Download and install a preview ORAS release for your operating system. See [ORAS Install instructions][oras-install-docs] for how to extract and install the file for your operating system, referencing an Alpha.1 preview build from the [ORAS GitHub repo][oras-preview-install]
+Download and install a preview ORAS release for your operating system. See [ORAS installation instructions][oras-install-docs] for how to extract and install the file for your operating system. This article uses ORAS CLI 0.14.1 to demonstrate how to manage supply chain artifacts in ACR.
 
 ## Configure a registry
 
-Configure environment variables to easily copy/paste commands into your shell. The commands can be run in the [Azure Cloud Shell](https://shell.azure.com/)
+Configure environment variables to easily copy/paste commands into your shell. The commands can be run in the [Azure Cloud Shell](https://shell.azure.com/).
 
 ```console
 ACR_NAME=myregistry
@@ -65,7 +65,7 @@ az acr create \
   --output jsonc
 ```
 
-In the command output, note the `zoneRedundancy` property for the registry. When enabled, the registry is zone redundant, and ORAS Artifact enabled:
+In the command output, note the `zoneRedundancy` property for the registry. When enabled, the registry is zone redundant, and ORAS Artifact enabled.
 
 ```output
 {
@@ -151,49 +151,47 @@ docker push $IMAGE
 echo '{"artifact": "'${IMAGE}'", "signature": "pat hancock"}' > signature.json
 ```
 
-### Push a signature to the registry, as a reference to the container image
+### Attach a signature to the registry, as a reference to the container image
 
-The ORAS command pushes the signature to a repository, referencing another artifact through the `subject` parameter. The `--artifact-type` provides for differentiating artifacts, similar to file extensions that enable different file types. One or more files can be pushed by specifying `file:mediaType`
+The ORAS command attaches the signature to a repository, referencing another artifact. The `--artifact-type` provides for differentiating artifacts, similar to file extensions that enable different file types. One or more files can be attached by specifying `file:mediaType`.
 
 ```bash
-oras push $REGISTRY/$REPO \
-    --artifact-type 'signature/example' \
-    --subject $IMAGE \
-    ./signature.json:application/json
+oras attach $IMAGE \
+    ./signature.json:application/json \
+    --artifact-type signature/example
 ```
 
-For more information on oras push, see [ORAS documentation][oras-push-docs].
+For more information on oras attach, see [ORAS documentation][oras-docs].
 
-## Push a multi-file artifact as a reference
+## Attach a multi-file artifact as a reference
 
-Create some documentation around an artifact
+Create some documentation around an artifact.
 
 ```bash
 echo 'Readme Content' > readme.md
 echo 'Detailed Content' > readme-details.md
 ```
 
-Push the multi-file artifact as a reference
+Attach the multi-file artifact as a reference.
 
 ```bash
-oras push $REGISTRY/$REPO \
-    --artifact-type 'readme/example' \
-    --subject $IMAGE \
+oras attach $IMAGE \
     ./readme.md:application/markdown \
     ./readme-details.md:application/markdown
+    --artifact-type readme/example
 ```
 
 ## Discovering artifact references
 
 The ORAS Artifacts Specification defines a [referrers API][oras-artifacts-referrers] for discovering references to a `subject` artifact. The `oras discover` command can show the list of references to the container image.
 
-Using `oras discover`, view the graph of artifacts now stored in the registry
+Using `oras discover`, view the graph of artifacts now stored in the registry.
 
 ```bash
 oras discover -o tree $IMAGE
 ```
 
-The output shows the beginning of a graph of artifacts, where the signature and docs are viewed as children of the container image
+The output shows the beginning of a graph of artifacts, where the signature and docs are viewed as children of the container image.
 
 ```output
 myregistry.azurecr.io/net-monitor:v1
@@ -213,13 +211,12 @@ The ORAS Artifacts specification enables deep graphs, enabling signed software b
 echo '{"version": "0.0.0.0", "artifact": "'${IMAGE}'", "contents": "good"}' > sbom.json
 ```
 
-### Push a sample SBoM to the registry
+### Attach a sample SBoM to the image in the registry
 
 ```bash
-oras push $REGISTRY/$REPO \
-  --artifact-type 'sbom/example' \
-  --subject $IMAGE \
-  ./sbom.json:application/json
+oras attach $IMAGE \
+  ./sbom.json:application/json \
+  --artifact-type sbom/example
 ```
 
 ### Sign the SBoM
@@ -229,21 +226,20 @@ Artifacts that are pushed as references, typically do not have tags as they are
 ```bash
 SBOM_DIGEST=$(oras discover -o json \
                 --artifact-type sbom/example \
-                $IMAGE | jq -r ".references[0].digest")
+                $IMAGE | jq -r ".referrers[0].digest")
 ```
 
 Create a signature of an SBoM
 
 ```bash
-echo '{"artifact": "'$REGISTRY/${REPO}@$SBOM_DIGEST'", "signature": "pat hancock"}' > sbom-signature.json
+echo '{"artifact": "'$IMAGE@$SBOM_DIGEST'", "signature": "pat hancock"}' > sbom-signature.json
 ```
 
-### Push the SBoM signature
+### Attach the SBoM signature
 
 ```bash
-oras push $REGISTRY/$REPO \
+oras attach $IMAGE@$SBOM_DIGEST \
   --artifact-type 'signature/example' \
-  --subject $REGISTRY/$REPO@$SBOM_DIGEST \
   ./sbom-signature.json:application/json
 ```
 
@@ -274,7 +270,7 @@ To pull a referenced type, the digest of reference is discovered with the `oras
 ```bash
 DOC_DIGEST=$(oras discover -o json \
               --artifact-type 'readme/example' \
-              $IMAGE | jq -r ".references[0].digest")
+              $IMAGE | jq -r ".referrers[0].digest")
 ```
 
 ### Create a clean directory for downloading
@@ -285,7 +281,7 @@ mkdir ./download
 
 ### Pull the docs into the download directory
 ```bash
-oras pull -a -o ./download $REGISTRY/$REPO@$DOC_DIGEST
+oras pull -o ./download $REGISTRY/$REPO@$DOC_DIGEST
 ```
 ### View the docs
 
@@ -313,7 +309,7 @@ A repository can have a list of manifests that are both tagged and untagged
 ```azurecli
 az acr manifest list-metadata \
   --name $REPO \
-  --repository $ACR_NAME \
+  --registry $ACR_NAME \
   --output jsonc
 ```
 
@@ -379,16 +375,15 @@ az acr manifest list-metadata \
 
 ## Next steps
 
-* Learn more about [the ORAS CLI](https://oras.land)
+* Learn more about [the ORAS CLI](https://oras.land/cli/)
 * Learn more about [ORAS Artifacts][oras-artifacts] for how to push, discover, pull, copy a graph of supply chain artifacts
 
 <!-- LINKS - external -->
 [docker-linux]:         https://docs.docker.com/engine/installation/#supported-platforms
 [docker-mac]:           https://docs.docker.com/docker-for-mac/
 [docker-windows]:       https://docs.docker.com/docker-for-windows/
 [oras-install-docs]:    https://oras.land/cli/
-[oras-preview-install]: https://github.com/oras-project/oras/releases/tag/v0.2.1-alpha.1
-[oras-push-docs]:       https://oras.land/cli/1_pushing/
+[oras-docs]:       https://oras.land/
 [oras-artifacts]:       https://github.com/oras-project/artifacts-spec/
 <!-- LINKS - internal -->
 [az-acr-repository-show]: /cli/azure/acr/repository?#az_acr_repository_show