diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/ErrorCode.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/ErrorCode.cs
index 4181524ecbc5..91b951a1bc7b 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/ErrorCode.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/ErrorCode.cs
@@ -27,7 +27,13 @@ public ErrorCode(string value)
         private const string UnauthorizedValue = "Unauthorized";
         private const string ForbiddenValue = "Forbidden";
         private const string NotFoundValue = "NotFound";
+        private const string ProjectNotFoundValue = "ProjectNotFound";
+        private const string OperationNotFoundValue = "OperationNotFound";
+        private const string AzureCognitiveSearchNotFoundValue = "AzureCognitiveSearchNotFound";
+        private const string AzureCognitiveSearchIndexNotFoundValue = "AzureCognitiveSearchIndexNotFound";
         private const string TooManyRequestsValue = "TooManyRequests";
+        private const string AzureCognitiveSearchThrottlingValue = "AzureCognitiveSearchThrottling";
+        private const string AzureCognitiveSearchIndexLimitReachedValue = "AzureCognitiveSearchIndexLimitReached";
         private const string InternalServerErrorValue = "InternalServerError";
         private const string ServiceUnavailableValue = "ServiceUnavailable";
 
@@ -41,8 +47,20 @@ public ErrorCode(string value)
         public static ErrorCode Forbidden { get; } = new ErrorCode(ForbiddenValue);
         /// <summary> NotFound. </summary>
         public static ErrorCode NotFound { get; } = new ErrorCode(NotFoundValue);
+        /// <summary> ProjectNotFound. </summary>
+        public static ErrorCode ProjectNotFound { get; } = new ErrorCode(ProjectNotFoundValue);
+        /// <summary> OperationNotFound. </summary>
+        public static ErrorCode OperationNotFound { get; } = new ErrorCode(OperationNotFoundValue);
+        /// <summary> AzureCognitiveSearchNotFound. </summary>
+        public static ErrorCode AzureCognitiveSearchNotFound { get; } = new ErrorCode(AzureCognitiveSearchNotFoundValue);
+        /// <summary> AzureCognitiveSearchIndexNotFound. </summary>
+        public static ErrorCode AzureCognitiveSearchIndexNotFound { get; } = new ErrorCode(AzureCognitiveSearchIndexNotFoundValue);
         /// <summary> TooManyRequests. </summary>
         public static ErrorCode TooManyRequests { get; } = new ErrorCode(TooManyRequestsValue);
+        /// <summary> AzureCognitiveSearchThrottling. </summary>
+        public static ErrorCode AzureCognitiveSearchThrottling { get; } = new ErrorCode(AzureCognitiveSearchThrottlingValue);
+        /// <summary> AzureCognitiveSearchIndexLimitReached. </summary>
+        public static ErrorCode AzureCognitiveSearchIndexLimitReached { get; } = new ErrorCode(AzureCognitiveSearchIndexLimitReachedValue);
         /// <summary> InternalServerError. </summary>
         public static ErrorCode InternalServerError { get; } = new ErrorCode(InternalServerErrorValue);
         /// <summary> ServiceUnavailable. </summary>
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswer.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswer.cs
index d589e743c21e..b4491d51ade7 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswer.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswer.cs
@@ -21,8 +21,8 @@ internal KnowledgeBaseAnswer()
         }
 
         /// <summary> Initializes a new instance of KnowledgeBaseAnswer. </summary>
-        /// <param name="questions"> List of questions. </param>
-        /// <param name="answer"> The Answer. </param>
+        /// <param name="questions"> List of questions associated with the answer. </param>
+        /// <param name="answer"> Answer text. </param>
         /// <param name="confidenceScore"> Answer confidence score, value ranges from 0 to 1. </param>
         /// <param name="id"> ID of the QnA result. </param>
         /// <param name="source"> Source of QnA result. </param>
@@ -41,9 +41,9 @@ internal KnowledgeBaseAnswer(IReadOnlyList<string> questions, string answer, dou
             AnswerSpan = answerSpan;
         }
 
-        /// <summary> List of questions. </summary>
+        /// <summary> List of questions associated with the answer. </summary>
         public IReadOnlyList<string> Questions { get; }
-        /// <summary> The Answer. </summary>
+        /// <summary> Answer text. </summary>
         public string Answer { get; }
         /// <summary> Answer confidence score, value ranges from 0 to 1. </summary>
         public double? ConfidenceScore { get; }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswerDialog.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswerDialog.cs
index fb0f8bfdfa00..8697ddf24e58 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswerDialog.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/KnowledgeBaseAnswerDialog.cs
@@ -21,7 +21,7 @@ internal KnowledgeBaseAnswerDialog()
 
         /// <summary> Initializes a new instance of KnowledgeBaseAnswerDialog. </summary>
         /// <param name="isContextOnly"> To mark if a prompt is relevant only with a previous question or not. If true, do not include this QnA as search result for queries without context; otherwise, if false, ignores context and includes this QnA in search result. </param>
-        /// <param name="prompts"> List of 0 to 20 prompts associated with the answer. </param>
+        /// <param name="prompts"> List of prompts associated with the answer. </param>
         internal KnowledgeBaseAnswerDialog(bool? isContextOnly, IReadOnlyList<KnowledgeBaseAnswerPrompt> prompts)
         {
             IsContextOnly = isContextOnly;
@@ -30,7 +30,7 @@ internal KnowledgeBaseAnswerDialog(bool? isContextOnly, IReadOnlyList<KnowledgeB
 
         /// <summary> To mark if a prompt is relevant only with a previous question or not. If true, do not include this QnA as search result for queries without context; otherwise, if false, ignores context and includes this QnA in search result. </summary>
         public bool? IsContextOnly { get; }
-        /// <summary> List of 0 to 20 prompts associated with the answer. </summary>
+        /// <summary> List of prompts associated with the answer. </summary>
         public IReadOnlyList<KnowledgeBaseAnswerPrompt> Prompts { get; }
     }
 }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryFilters.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryFilters.cs
index 3e6264239182..a244c2f5e018 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryFilters.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryFilters.cs
@@ -21,9 +21,9 @@ public QueryFilters()
 
         /// <summary> Find QnAs that are associated with the given list of metadata. </summary>
         public MetadataFilter MetadataFilter { get; set; }
-        /// <summary> Find QnAs that are associated with the given list of sources in knowledge base. </summary>
+        /// <summary> Find QnAs that are associated with any of the given list of sources in knowledge base. </summary>
         public IList<string> SourceFilter { get; }
-        /// <summary> Logical operation used to join metadata filters with source filters. </summary>
+        /// <summary> Logical operation used to join metadata filter with source filter. </summary>
         public LogicalOperationKind? LogicalOperation { get; set; }
     }
 }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryKnowledgeBaseOptions.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryKnowledgeBaseOptions.cs
index 41e9cde0a771..d9d698456ca3 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryKnowledgeBaseOptions.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/QueryKnowledgeBaseOptions.cs
@@ -9,7 +9,7 @@
 
 namespace Azure.AI.Language.QuestionAnswering
 {
-    /// <summary> The question parameters to answer using a knowledge base. </summary>
+    /// <summary> Parameters to query a knowledge base. </summary>
     public partial class QueryKnowledgeBaseOptions
     {
         /// <summary> Max number of answers to be returned for the question. </summary>
@@ -20,9 +20,9 @@ public partial class QueryKnowledgeBaseOptions
         public double? ConfidenceScoreThreshold { get; set; }
         /// <summary> Context object with previous QnA&apos;s information. </summary>
         public KnowledgeBaseAnswerRequestContext Context { get; set; }
-        /// <summary> (Optional) Set to &apos;QuestionOnly&apos; for using a question only Ranker. </summary>
+        /// <summary> Type of ranker to be used. </summary>
         public RankerType? RankerType { get; set; }
-        /// <summary> Filter QnAs based on give metadata list and knowledge base source names. </summary>
+        /// <summary> Filter QnAs based on given metadata list and knowledge base sources. </summary>
         public QueryFilters Filters { get; set; }
         /// <summary> To configure Answer span prediction feature. </summary>
         public AnswerSpanRequest AnswerSpanRequest { get; set; }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/RankerType.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/RankerType.cs
index 16eaf726ced6..823fd25aa730 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/RankerType.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Models/RankerType.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.AI.Language.QuestionAnswering.Models
 {
-    /// <summary> (Optional) Set to &apos;QuestionOnly&apos; for using a question only Ranker. </summary>
+    /// <summary> Type of ranker to be used. </summary>
     public readonly partial struct RankerType : IEquatable<RankerType>
     {
         private readonly string _value;
@@ -22,13 +22,13 @@ public RankerType(string value)
             _value = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        private const string DefaultValue = "Default";
         private const string QuestionOnlyValue = "QuestionOnly";
+        private const string DefaultValue = "Default";
 
-        /// <summary> Default. </summary>
-        public static RankerType Default { get; } = new RankerType(DefaultValue);
-        /// <summary> QuestionOnly. </summary>
+        /// <summary> Question only ranker. </summary>
         public static RankerType QuestionOnly { get; } = new RankerType(QuestionOnlyValue);
+        /// <summary> Default ranker. </summary>
+        public static RankerType Default { get; } = new RankerType(DefaultValue);
         /// <summary> Determines if two <see cref="RankerType"/> values are the same. </summary>
         public static bool operator ==(RankerType left, RankerType right) => left.Equals(right);
         /// <summary> Determines if two <see cref="RankerType"/> values are not the same. </summary>
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/QuestionAnsweringModelFactory.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/QuestionAnsweringModelFactory.cs
index d66501af0cc6..2ace82769cdd 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/QuestionAnsweringModelFactory.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/QuestionAnsweringModelFactory.cs
@@ -24,8 +24,8 @@ public static KnowledgeBaseAnswers KnowledgeBaseAnswers(IEnumerable<KnowledgeBas
         }
 
         /// <summary> Initializes a new instance of KnowledgeBaseAnswer. </summary>
-        /// <param name="questions"> List of questions. </param>
-        /// <param name="answer"> The Answer. </param>
+        /// <param name="questions"> List of questions associated with the answer. </param>
+        /// <param name="answer"> Answer text. </param>
         /// <param name="confidenceScore"> Answer confidence score, value ranges from 0 to 1. </param>
         /// <param name="id"> ID of the QnA result. </param>
         /// <param name="source"> Source of QnA result. </param>
@@ -43,7 +43,7 @@ public static KnowledgeBaseAnswer KnowledgeBaseAnswer(IEnumerable<string> questi
 
         /// <summary> Initializes a new instance of KnowledgeBaseAnswerDialog. </summary>
         /// <param name="isContextOnly"> To mark if a prompt is relevant only with a previous question or not. If true, do not include this QnA as search result for queries without context; otherwise, if false, ignores context and includes this QnA in search result. </param>
-        /// <param name="prompts"> List of 0 to 20 prompts associated with the answer. </param>
+        /// <param name="prompts"> List of prompts associated with the answer. </param>
         /// <returns> A new <see cref="Models.KnowledgeBaseAnswerDialog"/> instance for mocking. </returns>
         public static KnowledgeBaseAnswerDialog KnowledgeBaseAnswerDialog(bool? isContextOnly = null, IEnumerable<KnowledgeBaseAnswerPrompt> prompts = null)
         {
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/autorest.md b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/autorest.md
index a4add7f63a6c..bcf1e593e516 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/autorest.md
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/autorest.md
@@ -8,7 +8,7 @@ title: Question Answering
 license-header: MICROSOFT_MIT_NO_VERSION
 
 batch:
-- input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/68e7988aba481206f08019d3efb585683d5bc577/specification/cognitiveservices/data-plane/Language/preview/2021-07-15-preview/questionanswering.json
+- input-file: https://github.com/Azure/azure-rest-api-specs/blob/694fe69245024447f8d3647be1da88e9ad942058/specification/cognitiveservices/data-plane/Language/preview/2021-07-15-preview/questionanswering.json
   clear-output-folder: true
 
 # TODO: Uncomment when we ship authoring support and remove ./QuestionAnsweringClientOptions.cs.