Merge branch 'main' into 6519-kms-getting-started-python

Author: meyertst-aws

.doc_gen/cross-content/phrases-code-examples.ent

@@ -146,5 +146,9 @@
 <!ENTITY cloudwatch-netmon '&CW; Network Monitoring'>
 
 <!-- Marketplace Agreement Service -->
-<!ENTITY MKTAgreementlong '&MKTlong; Agreement Service'>
-<!ENTITY MKTAgreement '&MKT; Agreement Service'>
+<!ENTITY MKTAgreementlong '&MKTlong; Agreement API'>
+<!ENTITY MKTAgreement '&MKT; Agreement API'>
+
+<!-- Marketplace Catalog Service -->
+<!ENTITY MKTCataloglong '&MKTlong; Catalog API'>
+<!ENTITY MKTCatalog '&MKT; Catalog API'>

.doc_gen/metadata/cloudwatch_metadata.yaml

@@ -61,7 +61,7 @@ cloudwatch_DeleteAlarms:
           excerpts:
             - description:
               snippet_tags:
-                - cloudwatch.java2.delete_metrics.main
+                - cloudwatch.java2.delete_alarm.main
     Python:
       versions:
         - sdk_version: 3
@@ -227,7 +227,7 @@ cloudwatch_DescribeAlarms:
           excerpts:
             - description:
               snippet_tags:
-                - cloudwatch.java2.scenario.describe.alarm.main
+                - cloudwatch.java2.describe_alarms.main
     .NET:
       versions:
         - sdk_version: 3
@@ -1026,6 +1026,7 @@ cloudwatch_PutMetricData:
   services:
     cloudwatch: {PutMetricData}
 cloudwatch_GetStartedMetricsDashboardsAlarms:
+  title: Learn core operations for &CW; using an &AWS; SDK
   synopsis_list:
     - List &CW; namespaces and metrics.
     - Get statistics for a metric and for estimated billing.
@@ -1042,7 +1043,7 @@ cloudwatch_GetStartedMetricsDashboardsAlarms:
           github: kotlin/services/cloudwatch
           sdkguide:
           excerpts:
-            - description:
+            - description: Run an interactive scenario demonstrating &CW; features.
               snippet_tags:
                 - cloudwatch.kotlin.scenario.main
     Java:
@@ -1051,9 +1052,12 @@ cloudwatch_GetStartedMetricsDashboardsAlarms:
           github: javav2/example_code/cloudwatch
           sdkguide:
           excerpts:
-            - description:
+            - description: Run an interactive scenario demonstrating &CW; features.
               snippet_tags:
                 - cloudwatch.java2.scenario.main
+            - description: A wrapper class for &CW; SDK methods.
+              snippet_tags:
+                - cloudwatch.java2.actions.main
     .NET:
       versions:
         - sdk_version: 3

.doc_gen/metadata/dynamodb_metadata.yaml

@@ -81,6 +81,10 @@ dynamodb_CreateTable:
             - description:
               snippet_tags:
                 - dynamodb.cpp.create_table.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
+
     Go:
       versions:
         - sdk_version: 2
@@ -623,11 +627,13 @@ dynamodb_PutItem:
       versions:
         - sdk_version: 1
           github: cpp/example_code/dynamodb
-          sdkguide:
           excerpts:
             - description:
               snippet_tags:
                 - dynamodb.cpp.put_item.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
     Go:
       versions:
         - sdk_version: 2
@@ -890,6 +896,9 @@ dynamodb_UpdateItem:
             - description:
               snippet_tags:
                 - dynamodb.cpp.update_item.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
     Go:
       versions:
         - sdk_version: 2
@@ -1109,11 +1118,13 @@ dynamodb_DeleteItem:
       versions:
         - sdk_version: 1
           github: cpp/example_code/dynamodb
-          sdkguide:
           excerpts:
             - description:
               snippet_tags:
                 - cpp.example_code.dynamodb.delete_item
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
     Swift:
       versions:
         - sdk_version: 1
@@ -1774,6 +1785,21 @@ dynamodb_BatchExecuteStatement:
                 - cpp.example_code.dynamodb.BatchExecuteStatement.Delete
   services:
     dynamodb: {BatchExecuteStatement}
+dynamodb_UpdateTable:
+  languages:
+    C++:
+      versions:
+        - sdk_version: 1
+          github: cpp/example_code/dynamodb
+          excerpts:
+            - description:
+              snippet_tags:
+                - dynamodb.cpp.update_table.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
+  services:
+    dynamodb: {UpdateTable}
 dynamodb_Usage_DaxDemo:
   title: Accelerate &DDB; reads with &DAX; using an &AWS; SDK
   title_abbrev: Accelerate reads with &DAX;

.doc_gen/metadata/ec2_metadata.yaml

@@ -470,6 +470,7 @@ ec2_StartInstances:
             - description:
               snippet_tags:
                 - EC2.dotnetv3.StartInstances
+                - EC2.dotnetv3.WaitForInstanceState
     Kotlin:
       versions:
         - sdk_version: 1
@@ -569,6 +570,7 @@ ec2_StopInstances:
             - description:
               snippet_tags:
                 - EC2.dotnetv3.StopInstances
+                - EC2.dotnetv3.WaitForInstanceState
     Kotlin:
       versions:
         - sdk_version: 1
@@ -1393,6 +1395,7 @@ ec2_TerminateInstances:
             - description:
               snippet_tags:
                 - EC2.dotnetv3.TerminateInstances
+                - EC2.dotnetv3.WaitForInstanceState
     Kotlin:
       versions:
         - sdk_version: 1
@@ -1682,9 +1685,10 @@ ec2_RebootInstances:
           github: dotnetv3/EC2
           sdkguide:
           excerpts:
-            - description:
+            - description: Reboot an instance by its Id.
               snippet_tags:
                 - EC2.dotnetv3.RebootInstances
+                - EC2.dotnetv3.WaitForInstanceState
             - description: Replace the profile for an instance, reboot, and restart a web server.
               snippet_tags:
                 - ResilientService.dotnetv3.Ec2.ReplaceInstanceProfile

.doc_gen/metadata/glue_metadata.yaml

@@ -498,6 +498,15 @@ glue_GetTables:
     glue: {GetTables}
 glue_CreateJob:
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.create_job.main
     .NET:
       versions:
         - sdk_version: 3
@@ -568,6 +577,15 @@ glue_CreateJob:
     glue: {CreateJob}
 glue_StartJobRun:
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.start.job.main
     .NET:
       versions:
         - sdk_version: 3
@@ -715,6 +733,15 @@ glue_GetJobRuns:
             - description:
               snippet_tags:
                 - Glue.dotnetv3.GetJobRuns
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.get_job.main
     PHP:
       versions:
         - sdk_version: 3
@@ -836,6 +863,15 @@ glue_GetJobRun:
     glue: {GetJobRun}
 glue_DeleteJob:
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.delete_job.main
     .NET:
       versions:
         - sdk_version: 3
@@ -961,6 +997,15 @@ glue_DeleteTable:
     glue: {DeleteTable}
 glue_DeleteDatabase:
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.delete_database.main
     .NET:
       versions:
         - sdk_version: 3
@@ -1029,6 +1074,15 @@ glue_DeleteDatabase:
     glue: {DeleteDatabase}
 glue_DeleteCrawler:
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/glue
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - glue.java2.delete_crawler.main
     .NET:
       versions:
         - sdk_version: 3