Apply suggestions from code review

Co-authored-by: Dan Davison <[email protected]>

Author: bergundy

openapi/openapiv2.json

@@ -10363,11 +10363,11 @@
         },
         "scheduleToStartTimeout": {
           "type": "string",
-          "description": "Limits time an activity task can stay in a task queue before a worker picks it up. This\ntimeout is always non retryable, as all a retry would achieve is to put it back into the same\nqueue. Defaults to `schedule_to_close_timeout` or workflow execution timeout if not\nspecified.\n"
+          "description": "Limits time an activity task can stay in a task queue before a worker picks it up. This\ntimeout is always non retryable, as all a retry would achieve is to put it back into the same\nqueue. Defaults to `schedule_to_close_timeout`.\n"
         },
         "startToCloseTimeout": {
           "type": "string",
-          "description": "Maximum time an activity is allowed to execute after being picked up by a worker. This\ntimeout is always retryable.\n"
+          "description": "Maximum time a single activity attempt is allowed to execute after being picked up by a worker. This\ntimeout is always retryable.\n"
         },
         "heartbeatTimeout": {
           "type": "string",

openapi/openapiv3.yaml

@@ -7273,16 +7273,15 @@ components:
           description: |-
             Limits time an activity task can stay in a task queue before a worker picks it up. This
              timeout is always non retryable, as all a retry would achieve is to put it back into the same
-             queue. Defaults to `schedule_to_close_timeout` or workflow execution timeout if not
-             specified.
+             queue. Defaults to `schedule_to_close_timeout`.
 
              (-- api-linter: core::0140::prepositions=disabled
                  aip.dev/not-precedent: "to" is used to indicate interval. --)
         startToCloseTimeout:
           pattern: ^-?(?:0|[1-9][0-9]{0,11})(?:\.[0-9]{1,9})?s$
           type: string
           description: |-
-            Maximum time an activity is allowed to execute after being picked up by a worker. This
+            Maximum time a single activity attempt is allowed to execute after being picked up by a worker. This
              timeout is always retryable.
 
              (-- api-linter: core::0140::prepositions=disabled

temporal/api/activity/v1/message.proto

@@ -77,13 +77,12 @@ message ActivityExecutionInfo {
     google.protobuf.Duration schedule_to_close_timeout = 7;
     // Limits time an activity task can stay in a task queue before a worker picks it up. This
     // timeout is always non retryable, as all a retry would achieve is to put it back into the same
-    // queue. Defaults to `schedule_to_close_timeout` or workflow execution timeout if not
-    // specified.
+    // queue. Defaults to `schedule_to_close_timeout`.
     //
     // (-- api-linter: core::0140::prepositions=disabled
     //     aip.dev/not-precedent: "to" is used to indicate interval. --)
     google.protobuf.Duration schedule_to_start_timeout = 8;
-    // Maximum time an activity is allowed to execute after being picked up by a worker. This
+    // Maximum time a single activity attempt is allowed to execute after being picked up by a worker. This
     // timeout is always retryable.
     //
     // (-- api-linter: core::0140::prepositions=disabled