diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Artifact/RegistryArtifact.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Artifact/RegistryArtifact.cs
index ac0cd8072105..9891ef260ab9 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Artifact/RegistryArtifact.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Artifact/RegistryArtifact.cs
@@ -9,7 +9,12 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
-    /// <summary> A helper class that groups information and operations about an image or artifact in this container registry. </summary>
+    /// <summary> `Artifact` is the general term for items stored in a container registry,
+    /// and can include Docker images or other Open Container Initiative (OCI) artifact types.
+    /// <para>
+    /// The <see cref="RegistryArtifact"/> class is a helper class that groups information and operations about an image or artifact in this container registry.
+    /// </para>
+    /// </summary>
     public partial class RegistryArtifact
     {
         private readonly ClientDiagnostics _clientDiagnostics;
@@ -57,7 +62,7 @@ protected RegistryArtifact()
 
         #region Registry Artifact/Manifest methods
 
-        /// <summary> Get registry artifact properties by tag or digest. </summary>
+        /// <summary> Get the properties of the manifest that uniquely identifies this artifact. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual async Task<Response<ArtifactManifestProperties>> GetManifestPropertiesAsync(CancellationToken cancellationToken = default)
@@ -77,7 +82,7 @@ public virtual async Task<Response<ArtifactManifestProperties>> GetManifestPrope
             }
         }
 
-        /// <summary> Get registry artifact properties by tag or digest. </summary>
+        /// <summary> Get the properties of the manifest that uniquely identifies this artifact. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual Response<ArtifactManifestProperties> GetManifestProperties(CancellationToken cancellationToken = default)
@@ -118,8 +123,8 @@ private static bool IsDigest(string tagOrDigest)
             return tagOrDigest.Contains(":");
         }
 
-        /// <summary> Update manifest attributes. </summary>
-        /// <param name="value"> Manifest properties value. </param>
+        /// <summary> Update the properties of the artifact's manifest. </summary>
+        /// <param name="value"> Manifest properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="value"/> is null. </exception>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -141,8 +146,8 @@ public virtual async Task<Response<ArtifactManifestProperties>> UpdateManifestPr
             }
         }
 
-        /// <summary> Update manifest attributes. </summary>
-        /// <param name="value"> Manifest properties value. </param>
+        /// <summary> Update the properties of the artifact's manifest. </summary>
+        /// <param name="value"> Manifest properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="value"/> is null. </exception>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -177,7 +182,7 @@ private static ManifestWriteableProperties GetManifestWriteableProperties(Artifa
             };
         }
 
-        /// <summary> Delete registry artifact. </summary>
+        /// <summary> Delete registry artifact by deleting its manifest. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual async Task<Response> DeleteAsync(CancellationToken cancellationToken = default)
@@ -196,7 +201,7 @@ public virtual async Task<Response> DeleteAsync(CancellationToken cancellationTo
             }
         }
 
-        /// <summary> Delete registry artifact. </summary>
+        /// <summary> Delete registry artifact by deleting its manifest. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual Response Delete(CancellationToken cancellationToken = default)
@@ -218,7 +223,7 @@ public virtual Response Delete(CancellationToken cancellationToken = default)
         #endregion
 
         #region Tag methods
-        /// <summary> Get the collection of tags for a repository. </summary>
+        /// <summary> List the tags that uniquely identify this artifact and the properties of each. </summary>
         /// <param name="orderBy"> Requested order of tags in the collection. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -264,7 +269,7 @@ async Task<Page<ArtifactTagProperties>> NextPageFunc(string nextLink, int? pageS
             return PageableHelpers.CreateAsyncEnumerable(FirstPageFunc, NextPageFunc);
         }
 
-        /// <summary> Get the collection of tags for a repository, including their full metadata. </summary>
+        /// <summary> List the tags that uniquely identify this artifact and the properties of each. </summary>
         /// <param name="orderBy"> Requested order of tags in the collection. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -310,7 +315,7 @@ Page<ArtifactTagProperties> NextPageFunc(string nextLink, int? pageSizeHint)
             return PageableHelpers.CreateEnumerable(FirstPageFunc, NextPageFunc);
         }
 
-        /// <summary> Get tag properties by tag. </summary>
+        /// <summary> Get the properties of the specified tag. </summary>
         /// <param name="tag"> Tag name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
@@ -331,7 +336,7 @@ public virtual async Task<Response<ArtifactTagProperties>> GetTagPropertiesAsync
             }
         }
 
-        /// <summary> Get tag attributes by tag. </summary>
+        /// <summary> Get the properties of the specified tag. </summary>
         /// <param name="tag"> Tag name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
@@ -354,9 +359,9 @@ public virtual Response<ArtifactTagProperties> GetTagProperties(string tag, Canc
             }
         }
 
-        /// <summary> Update tag attributes. </summary>
-        /// <param name="tag"> Tag name. </param>
-        /// <param name="value"> Tag property value. </param>
+        /// <summary> Update the properties of a given tag. </summary>
+        /// <param name="tag"> Name of the tag to update properties on. </param>
+        /// <param name="value"> Tag properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
         /// <exception cref="ArgumentException"> Thrown when <paramref name="tag"/> is empty. </exception>
@@ -391,9 +396,9 @@ private static TagWriteableProperties GetTagWriteableProperties(ArtifactTagPrope
             };
         }
 
-        /// <summary> Update tag attributes. </summary>
-        /// <param name="tag"> Tag name. </param>
-        /// <param name="value"> Tag property value. </param>
+        /// <summary> Update the properties of a given tag. </summary>
+        /// <param name="tag"> Name of the tag to update properties on. </param>
+        /// <param name="value"> Tag properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
         /// <exception cref="ArgumentException"> Thrown when <paramref name="tag"/> is empty. </exception>
@@ -418,7 +423,7 @@ public virtual Response<ArtifactTagProperties> UpdateTagProperties(string tag, A
         }
 
         /// <summary> Delete the tag.  This removes the tag from the artifact and its manifest. </summary>
-        /// <param name="tag"> Name of tag to delete. </param>
+        /// <param name="tag"> The name of tag to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
         /// <exception cref="ArgumentException"> Thrown when <paramref name="tag"/> is empty. </exception>
@@ -441,7 +446,7 @@ public virtual async Task<Response> DeleteTagAsync(string tag, CancellationToken
         }
 
         /// <summary> Delete the tag.  This removes the tag from the artifact and its manifest. </summary>
-        /// <param name="tag"> Name of tag to delete. </param>
+        /// <param name="tag"> The name of tag to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="tag"/> is null. </exception>
         /// <exception cref="ArgumentException"> Thrown when <paramref name="tag"/> is empty. </exception>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClient.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClient.cs
index b087e17a2556..e6cbfb70fc40 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClient.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClient.cs
@@ -23,7 +23,7 @@ public partial class ContainerRegistryClient
         /// <summary>
         /// Initializes a new instance of the <see cref="ContainerRegistryClient"/> for managing container images and artifacts,
         /// using anonymous access to the registry.  Only operations that support anonymous access are enabled.  Other service
-        /// methods will throw <see cref="RequestFailedException"/> if called.
+        /// methods will throw <see cref="RequestFailedException"/> if called from this client.
         /// </summary>
         /// <param name="endpoint">The URI endpoint of the container registry.  This is likely to be similar
         /// to "https://{registry-name}.azurecr.io".</param>
@@ -33,9 +33,9 @@ public partial class ContainerRegistryClient
         }
 
         /// <summary>
-        /// Initializes a new instance of the ContainerRegistryClient for managing container images and artifacts,
+        /// Initializes a new instance of the <see cref="ContainerRegistryClient"/> for managing container images and artifacts,
         /// using anonymous access to the registry.  Only operations that support anonymous access are enabled.  Other service
-        /// methods will throw <see cref="RequestFailedException"/> if called.
+        /// methods will throw <see cref="RequestFailedException"/> if called from this client.
         /// </summary>
         /// <param name="endpoint">The URI endpoint of the container registry.  This is likely to be similar
         /// to "https://{registry-name}.azurecr.io".</param>
@@ -58,7 +58,7 @@ public partial class ContainerRegistryClient
         }
 
         /// <summary>
-        /// Initializes a new instance of the ContainerRegistryClient for managing container images and artifacts.
+        /// Initializes a new instance of the <see cref="ContainerRegistryClient"/> for managing container images and artifacts.
         /// </summary>
         /// <param name="endpoint">The URI endpoint of the container registry.  This is likely to be similar
         /// to "https://{registry-name}.azurecr.io".</param>
@@ -93,7 +93,7 @@ protected ContainerRegistryClient()
         /// </summary>
         public virtual Uri Endpoint => _endpoint;
 
-        /// <summary> List repositories in this registry. </summary>
+        /// <summary> List the names of the repositories in this registry. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual AsyncPageable<string> GetRepositoryNamesAsync(CancellationToken cancellationToken = default)
@@ -134,7 +134,7 @@ async Task<Page<string>> NextPageFunc(string continuationToken, int? pageSizeHin
             return PageableHelpers.CreateAsyncEnumerable(FirstPageFunc, NextPageFunc);
         }
 
-        /// <summary> List repositories in this registry. </summary>
+        /// <summary> List the names of the repositories in this registry. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual Pageable<string> GetRepositoryNames(CancellationToken cancellationToken = default)
@@ -189,7 +189,7 @@ internal static string ParseUriReferenceFromLinkHeader(string linkValue)
             return linkValue?.Substring(1, linkValue.IndexOf('>') - 1);
         }
 
-        /// <summary> Delete the repository identified by `repostitory`. </summary>
+        /// <summary> Delete the repository identified by `repository` and all associated artifacts.</summary>
         /// <param name="repositoryName"> Repository name (including the namespace). </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="repositoryName"/> is null. </exception>
@@ -212,7 +212,7 @@ public virtual async Task<Response> DeleteRepositoryAsync(string repositoryName,
             }
         }
 
-        /// <summary> Delete the repository identified by `repostitory`. </summary>
+        /// <summary> Delete the repository identified by `repository` and all associated artifacts.</summary>
         /// <param name="repositoryName"> Repository name (including the namespace). </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="repositoryName"/> is null. </exception>
@@ -236,7 +236,7 @@ public virtual Response DeleteRepository(string repositoryName, CancellationToke
         }
 
         /// <summary>
-        /// Create a new <see cref="ContainerRepository"/> object for the specified repository.
+        /// Create a new <see cref="ContainerRepository"/> object for calling service methods related to the repository specified by `repositoryName`.
         /// </summary>
         /// <param name="repositoryName"> The name of the repository to reference. </param>
         /// <returns> A new <see cref="ContainerRepository"/> for the desired repository. </returns>
@@ -254,7 +254,7 @@ public virtual ContainerRepository GetRepository(string repositoryName)
         }
 
         /// <summary>
-        /// Create a new <see cref="RegistryArtifact"/> object for the specified artifact.
+        /// Create a new <see cref="RegistryArtifact"/> object for calling service methods related to the artifact specified by `repositoryName` and `tagOrDigest`.
         /// </summary>
         /// <param name="repositoryName"> The name of the repository to reference. </param>
         /// <param name="tagOrDigest"> Either a tag or a digest that uniquely identifies the artifact. </param>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClientOptions.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClientOptions.cs
index 7a0ae59a7d7a..717234b8aac3 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClientOptions.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/ContainerRegistryClientOptions.cs
@@ -7,7 +7,7 @@
 namespace Azure.Containers.ContainerRegistry
 {
     /// <summary>
-    /// The options for <see cref="ContainerRegistryClient"/>
+    /// Options that allow users to configure the requests sent to the Container Registry service.
     /// </summary>
     public class ContainerRegistryClientOptions : ClientOptions
     {
@@ -25,6 +25,7 @@ public class ContainerRegistryClientOptions : ClientOptions
         public string AuthenticationScope { get; set; } = "https://management.azure.com/.default";
 
         /// <summary>
+        /// Create an instance of the options for configuring request sent to the Container Registry service.
         /// </summary>
         /// <param name="version"></param>
         public ContainerRegistryClientOptions(ServiceVersion version = ServiceVersion.V1_0)
@@ -49,6 +50,7 @@ private void AddHeadersAndQueryParameters()
         }
 
         /// <summary>
+        /// The versions of the Container Registry service supported by this client library.
         /// </summary>
         public enum ServiceVersion
         {
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
index bf0afc1b96a8..98db20ed7d9c 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
@@ -13,7 +13,7 @@ namespace Azure.Containers.ContainerRegistry
     public static partial class ContainerRegistryModelFactory
     {
         /// <summary> Initializes a new instance of ContainerRepositoryProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="name"> Image name. </param>
         /// <param name="createdOn"> Image created time. </param>
         /// <param name="lastUpdatedOn"> Image last update time. </param>
@@ -31,7 +31,7 @@ public static ContainerRepositoryProperties ContainerRepositoryProperties(string
         }
 
         /// <summary> Initializes a new instance of ArtifactTagProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repositoryName"> Image name. </param>
         /// <param name="name"> Tag name. </param>
         /// <param name="digest"> Tag digest. </param>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryRestClient.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryRestClient.cs
index acb1f36195bc..d37b6682eebe 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryRestClient.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryRestClient.cs
@@ -107,7 +107,7 @@ internal HttpMessage CreateGetManifestRequest(string name, string reference, str
         /// <param name="accept"> Accept header string delimited by comma. For example, application/vnd.docker.distribution.manifest.v2+json. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> or <paramref name="reference"/> is null. </exception>
-        public async Task<Response<Manifest>> GetManifestAsync(string name, string reference, string accept = null, CancellationToken cancellationToken = default)
+        public async Task<Response<ManifestWrapper>> GetManifestAsync(string name, string reference, string accept = null, CancellationToken cancellationToken = default)
         {
             if (name == null)
             {
@@ -124,9 +124,9 @@ public async Task<Response<Manifest>> GetManifestAsync(string name, string refer
             {
                 case 200:
                     {
-                        Manifest value = default;
+                        ManifestWrapper value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
-                        value = Manifest.DeserializeManifest(document.RootElement);
+                        value = ManifestWrapper.DeserializeManifestWrapper(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -140,7 +140,7 @@ public async Task<Response<Manifest>> GetManifestAsync(string name, string refer
         /// <param name="accept"> Accept header string delimited by comma. For example, application/vnd.docker.distribution.manifest.v2+json. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> or <paramref name="reference"/> is null. </exception>
-        public Response<Manifest> GetManifest(string name, string reference, string accept = null, CancellationToken cancellationToken = default)
+        public Response<ManifestWrapper> GetManifest(string name, string reference, string accept = null, CancellationToken cancellationToken = default)
         {
             if (name == null)
             {
@@ -157,9 +157,9 @@ public Response<Manifest> GetManifest(string name, string reference, string acce
             {
                 case 200:
                     {
-                        Manifest value = default;
+                        ManifestWrapper value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream);
-                        value = Manifest.DeserializeManifest(document.RootElement);
+                        value = ManifestWrapper.DeserializeManifestWrapper(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/AcrManifests.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/AcrManifests.cs
index 39ac32d96f28..65273cd3f9b9 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/AcrManifests.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/AcrManifests.cs
@@ -20,7 +20,7 @@ internal AcrManifests()
         }
 
         /// <summary> Initializes a new instance of AcrManifests. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repository"> Image name. </param>
         /// <param name="manifests"> List of manifests. </param>
         /// <param name="link"> . </param>
@@ -32,7 +32,7 @@ internal AcrManifests(string registryLoginServer, string repository, IReadOnlyLi
             Link = link;
         }
 
-        /// <summary> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </summary>
+        /// <summary> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </summary>
         public string RegistryLoginServer { get; }
         /// <summary> Image name. </summary>
         public string Repository { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactArchitecture.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactArchitecture.cs
index 5a4ec3a47574..ecc6bd186998 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactArchitecture.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactArchitecture.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
-    /// <summary> The ArtifactArchitecture. </summary>
+    /// <summary> The artifact platform&apos;s architecture. </summary>
     public readonly partial struct ArtifactArchitecture : IEquatable<ArtifactArchitecture>
     {
         private readonly string _value;
@@ -36,31 +36,31 @@ public ArtifactArchitecture(string value)
         private const string S390XValue = "s390x";
         private const string WasmValue = "wasm";
 
-        /// <summary> 386. </summary>
+        /// <summary> i386. </summary>
         public static ArtifactArchitecture I386 { get; } = new ArtifactArchitecture(I386Value);
-        /// <summary> amd64. </summary>
+        /// <summary> AMD64. </summary>
         public static ArtifactArchitecture Amd64 { get; } = new ArtifactArchitecture(Amd64Value);
-        /// <summary> arm. </summary>
+        /// <summary> ARM. </summary>
         public static ArtifactArchitecture Arm { get; } = new ArtifactArchitecture(ArmValue);
-        /// <summary> arm64. </summary>
+        /// <summary> ARM64. </summary>
         public static ArtifactArchitecture Arm64 { get; } = new ArtifactArchitecture(Arm64Value);
-        /// <summary> mips. </summary>
+        /// <summary> MIPS. </summary>
         public static ArtifactArchitecture Mips { get; } = new ArtifactArchitecture(MipsValue);
-        /// <summary> mipsle. </summary>
+        /// <summary> MIPSLE. </summary>
         public static ArtifactArchitecture MipsLe { get; } = new ArtifactArchitecture(MipsLeValue);
-        /// <summary> mips64. </summary>
+        /// <summary> MIPS64. </summary>
         public static ArtifactArchitecture Mips64 { get; } = new ArtifactArchitecture(Mips64Value);
-        /// <summary> mips64le. </summary>
+        /// <summary> MIPS64LE. </summary>
         public static ArtifactArchitecture Mips64Le { get; } = new ArtifactArchitecture(Mips64LeValue);
-        /// <summary> ppc64. </summary>
+        /// <summary> PPC64. </summary>
         public static ArtifactArchitecture Ppc64 { get; } = new ArtifactArchitecture(Ppc64Value);
-        /// <summary> ppc64le. </summary>
+        /// <summary> PPC64LE. </summary>
         public static ArtifactArchitecture Ppc64Le { get; } = new ArtifactArchitecture(Ppc64LeValue);
-        /// <summary> riscv64. </summary>
+        /// <summary> RISCv64. </summary>
         public static ArtifactArchitecture RiscV64 { get; } = new ArtifactArchitecture(RiscV64Value);
         /// <summary> s390x. </summary>
         public static ArtifactArchitecture S390X { get; } = new ArtifactArchitecture(S390XValue);
-        /// <summary> wasm. </summary>
+        /// <summary> Wasm. </summary>
         public static ArtifactArchitecture Wasm { get; } = new ArtifactArchitecture(WasmValue);
         /// <summary> Determines if two <see cref="ArtifactArchitecture"/> values are the same. </summary>
         public static bool operator ==(ArtifactArchitecture left, ArtifactArchitecture right) => left.Equals(right);
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestPlatform.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestPlatform.cs
index 445f21db8839..52d1f5e70fda 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestPlatform.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestPlatform.cs
@@ -9,7 +9,7 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
-    /// <summary> Manifest attributes details. </summary>
+    /// <summary> The artifact&apos;s platform, consisting of operating system and architecture. </summary>
     public partial class ArtifactManifestPlatform
     {
         /// <summary> Initializes a new instance of ArtifactManifestPlatform. </summary>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestProperties.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestProperties.cs
index 9fb5851b638d..b730545d6625 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestProperties.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactManifestProperties.cs
@@ -34,7 +34,7 @@ internal ArtifactManifestProperties(string digest, DateTimeOffset createdOn, Dat
         }
 
         /// <summary> Initializes a new instance of ArtifactManifestProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repositoryName"> Repository name. </param>
         /// <param name="digest"> Manifest. </param>
         /// <param name="size"> Image size. </param>
@@ -70,7 +70,7 @@ internal ArtifactManifestProperties(string registryLoginServer, string repositor
             QuarantineDetails = quarantineDetails;
         }
 
-        /// <summary> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </summary>
+        /// <summary> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </summary>
         public string RegistryLoginServer { get; }
         /// <summary> Repository name. </summary>
         public string RepositoryName { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagOrderBy.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagOrderBy.cs
index 3ae87cd04516..3f4d1b9278b3 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagOrderBy.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagOrderBy.cs
@@ -7,7 +7,7 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
-    /// <summary> The ArtifactTagOrderBy. </summary>
+    /// <summary> Sort options for ordering tags in a collection. </summary>
     public enum ArtifactTagOrderBy
     {
         /// <summary> Do not provide an orderby value in the request. </summary>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagProperties.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagProperties.cs
index 58a4a629d39b..f66f5c67753c 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagProperties.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ArtifactTagProperties.cs
@@ -13,7 +13,7 @@ namespace Azure.Containers.ContainerRegistry
     public partial class ArtifactTagProperties
     {
         /// <summary> Initializes a new instance of ArtifactTagProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repositoryName"> Image name. </param>
         /// <param name="name"> Tag name. </param>
         /// <param name="digest"> Tag digest. </param>
@@ -48,7 +48,7 @@ internal ArtifactTagProperties(string registryLoginServer, string repositoryName
         }
 
         /// <summary> Initializes a new instance of ArtifactTagProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repositoryName"> Image name. </param>
         /// <param name="name"> Tag name. </param>
         /// <param name="digest"> Tag digest. </param>
@@ -72,7 +72,7 @@ internal ArtifactTagProperties(string registryLoginServer, string repositoryName
             CanRead = canRead;
         }
 
-        /// <summary> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </summary>
+        /// <summary> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </summary>
         public string RegistryLoginServer { get; }
         /// <summary> Image name. </summary>
         public string RepositoryName { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ContainerRepositoryProperties.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ContainerRepositoryProperties.cs
index 64118a45dc38..b19a728fcb1b 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ContainerRepositoryProperties.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/ContainerRepositoryProperties.cs
@@ -13,7 +13,7 @@ namespace Azure.Containers.ContainerRegistry
     public partial class ContainerRepositoryProperties
     {
         /// <summary> Initializes a new instance of ContainerRepositoryProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="name"> Image name. </param>
         /// <param name="createdOn"> Image created time. </param>
         /// <param name="lastUpdatedOn"> Image last update time. </param>
@@ -40,7 +40,7 @@ internal ContainerRepositoryProperties(string registryLoginServer, string name,
         }
 
         /// <summary> Initializes a new instance of ContainerRepositoryProperties. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="name"> Image name. </param>
         /// <param name="createdOn"> Image created time. </param>
         /// <param name="lastUpdatedOn"> Image last update time. </param>
@@ -66,7 +66,7 @@ internal ContainerRepositoryProperties(string registryLoginServer, string name,
             TeleportEnabled = teleportEnabled;
         }
 
-        /// <summary> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </summary>
+        /// <summary> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </summary>
         public string RegistryLoginServer { get; }
         /// <summary> Image name. </summary>
         public string Name { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/TagList.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/TagList.cs
index e2148643fc25..ff1d2402fcec 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/TagList.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/Models/TagList.cs
@@ -15,7 +15,7 @@ namespace Azure.Containers.ContainerRegistry
     internal partial class TagList
     {
         /// <summary> Initializes a new instance of TagList. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repository"> Image name. </param>
         /// <param name="tagAttributeBases"> List of tag attribute details. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="registryLoginServer"/>, <paramref name="repository"/>, or <paramref name="tagAttributeBases"/> is null. </exception>
@@ -40,7 +40,7 @@ internal TagList(string registryLoginServer, string repository, IEnumerable<TagA
         }
 
         /// <summary> Initializes a new instance of TagList. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
+        /// <param name="registryLoginServer"> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </param>
         /// <param name="repository"> Image name. </param>
         /// <param name="tagAttributeBases"> List of tag attribute details. </param>
         /// <param name="link"> . </param>
@@ -52,7 +52,7 @@ internal TagList(string registryLoginServer, string repository, IReadOnlyList<Ta
             Link = link;
         }
 
-        /// <summary> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </summary>
+        /// <summary> Registry login server name. This is likely to be similar to {registry-name}.azurecr.io. </summary>
         public string RegistryLoginServer { get; }
         /// <summary> Image name. </summary>
         public string Repository { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactManifestProperties.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactManifestProperties.cs
index e00e5b181ced..1e1ed88843df 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactManifestProperties.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactManifestProperties.cs
@@ -17,13 +17,13 @@ public ArtifactManifestProperties()
         {
         }
 
-        /// <summary> Delete enabled. </summary>
+        /// <summary> Whether or not this tag can be deleted. </summary>
         public bool? CanDelete { get; set; }
-        /// <summary> Write enabled. </summary>
+        /// <summary> Whether or not this tag can be written to. </summary>
         public bool? CanWrite { get; set;  }
-        /// <summary> List enabled. </summary>
+        /// <summary> Whether or not to include this artifact in the collection returned from <see cref="ContainerRepository.GetManifestPropertiesCollection"/>. </summary>
         public bool? CanList { get; set;  }
-        /// <summary> Read enabled. </summary>
+        /// <summary> Whether or not this tag can be read. </summary>
         public bool? CanRead { get; set; }
         /// <summary> Quarantine state. </summary>
         internal string QuarantineState { get; }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactOperatingSystem.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactOperatingSystem.cs
index b4aff4f25ca6..700c4a88cbcc 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactOperatingSystem.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactOperatingSystem.cs
@@ -8,6 +8,9 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
+    /// <summary>
+    /// The artifact platform's operating system.
+    /// </summary>
     public readonly partial struct ArtifactOperatingSystem : IEquatable<ArtifactOperatingSystem>
     {
         /// <summary> iOS. </summary>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactTagProperties.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactTagProperties.cs
index 87e78c1e54a0..29fb1adc8b05 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactTagProperties.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Models/ArtifactTagProperties.cs
@@ -15,13 +15,13 @@ public ArtifactTagProperties()
         {
         }
 
-        /// <summary> Delete enabled. </summary>
+        /// <summary> Whether or not this tag can be deleted. </summary>
         public bool? CanDelete { get; set; }
-        /// <summary> Write enabled. </summary>
+        /// <summary> Whether or not this tag can be written to. </summary>
         public bool? CanWrite { get; set;  }
-        /// <summary> List enabled. </summary>
+        /// <summary> Whether or not to include this tag in the collection returned from <see cref="RegistryArtifact.GetTagPropertiesCollection"/>. </summary>
         public bool? CanList { get; set; }
-        /// <summary> Read enabled. </summary>
+        /// <summary> Whether or not this tag can be read. </summary>
         public bool? CanRead { get; set; }
     }
 }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Repository/ContainerRepository.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Repository/ContainerRepository.cs
index 3d78cd20a433..a8e75a625452 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Repository/ContainerRepository.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Repository/ContainerRepository.cs
@@ -9,7 +9,14 @@
 
 namespace Azure.Containers.ContainerRegistry
 {
-    /// <summary> A helper class that groups information and operations about a repository in this container registry. </summary>
+    /// <summary>
+    /// A `repository` in a container registry is a logical grouping of images or artifacts that share the same name.  For example,
+    /// different versions of a `hello-world` application could have tags `v1` and `v2`, and be grouped by the repository `hello-world`.
+    /// <para>
+    /// The <see cref="ContainerRepository"/> class is a helper class that groups information and operations about a repository in this
+    /// container registry.
+    /// </para>
+    /// </summary>
     public partial class ContainerRepository
     {
         private readonly ClientDiagnostics _clientDiagnostics;
@@ -45,7 +52,7 @@ protected ContainerRepository()
         }
 
         /// <summary>
-        /// Create a new <see cref="RegistryArtifact"/> object for the specified artifact.
+        /// Create a new <see cref="RegistryArtifact"/> helper object for the artifact identified by <paramref name="tagOrDigest"/>.
         /// </summary>
         /// <param name="tagOrDigest"> Either a tag or a digest that uniquely identifies the artifact. </param>
         /// <returns> A new <see cref="RegistryArtifact"/> for the desired repository. </returns>
@@ -64,7 +71,7 @@ public virtual RegistryArtifact GetArtifact(string tagOrDigest)
         }
 
         #region Repository methods
-        /// <summary> Get repository properties. </summary>
+        /// <summary> Get the properties of the repository. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual async Task<Response<ContainerRepositoryProperties>> GetPropertiesAsync(CancellationToken cancellationToken = default)
@@ -82,7 +89,7 @@ public virtual async Task<Response<ContainerRepositoryProperties>> GetProperties
             }
         }
 
-        /// <summary> Get repository properties. </summary>
+        /// <summary> Get the properties of the repository. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual Response<ContainerRepositoryProperties> GetProperties(CancellationToken cancellationToken = default)
@@ -100,8 +107,8 @@ public virtual Response<ContainerRepositoryProperties> GetProperties(Cancellatio
             }
         }
 
-        /// <summary> Update the attribute identified by `name` where `reference` is the name of the repository. </summary>
-        /// <param name="value"> Repository attribute value. </param>
+        /// <summary> Update the properties of the repository. </summary>
+        /// <param name="value"> Repository properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="value"/> is null. </exception>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -134,8 +141,8 @@ private static RepositoryWriteableProperties GetRepositoryWriteableProperties(Co
             };
         }
 
-        /// <summary>Update the repository properties.</summary>
-        /// <param name="value"> Repository properties to set. </param>
+        /// <summary> Update the properties of the repository. </summary>
+        /// <param name="value"> Repository properties object containing values to update. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> Thrown when <paramref name="value"/> is null. </exception>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -156,7 +163,7 @@ public virtual Response<ContainerRepositoryProperties> UpdateProperties(Containe
             }
         }
 
-        /// <summary> Delete the repository. </summary>
+        /// <summary> Delete the repository and all artifacts that are part of its logical group. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual async Task<Response> DeleteAsync(CancellationToken cancellationToken = default)
@@ -174,7 +181,7 @@ public virtual async Task<Response> DeleteAsync(CancellationToken cancellationTo
             }
         }
 
-        /// <summary> Delete the repository. </summary>
+        /// <summary> Delete the repository and all artifacts that are part of its logical group. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
         public virtual Response Delete(CancellationToken cancellationToken = default)
@@ -194,7 +201,9 @@ public virtual Response Delete(CancellationToken cancellationToken = default)
         #endregion
 
         #region Registry Artifact/Manifest methods
-        /// <summary> Get the collection of registry artifacts for a repository. </summary>
+
+        /// <summary> List the manifests associated with this repository and the properties of each.
+        /// This is useful for determining the collection of artifacts associated with this repository, as each artifact is uniquely identified by its manifest. </summary>
         /// <param name="orderBy"> Requested order of manifests in the collection. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
@@ -238,7 +247,8 @@ async Task<Page<ArtifactManifestProperties>> NextPageFunc(string nextLink, int?
             return PageableHelpers.CreateAsyncEnumerable(FirstPageFunc, NextPageFunc);
         }
 
-        /// <summary> Get the collection of tags for a repository. </summary>
+        /// <summary> List the manifests associated with this repository and the properties of each.
+        /// This is useful for determining the collection of artifacts associated with this repository, as each artifact is uniquely identified by its manifest. </summary>
         /// <param name="orderBy"> Requested order of manifests in the collection. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="RequestFailedException">Thrown when a failure is returned by the Container Registry service.</exception>
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/autorest.md b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/autorest.md
index 2e6d04e932ea..0a11ad9bdbd1 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/autorest.md
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/autorest.md
@@ -3,7 +3,9 @@
 Run `dotnet build /t:GenerateCode` to generate code.
 
 ``` yaml
+title: Container Registry
 input-file:
- - https://github.com/Azure/azure-rest-api-specs/blob/5bcf8b9ce0d230830b172c2d9753cbbb4abf325b/specification/containerregistry/data-plane/Azure.ContainerRegistry/preview/2019-08-15-preview/containerregistry.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/2c33d5572dab4c6f52faf31004f0561205737107/specification/containerregistry/data-plane/Azure.ContainerRegistry/stable/2021-07-01/containerregistry.json
+ 
 model-namespace: false
 ```