[pull] main from containerd:main

docs/transfer.md

@@ -104,7 +104,7 @@ Streaming is used by the transfer service to send or receive data streams as par
 
 ### Progress
 
-Progress is an asynchronous callback sent from the server to the client. It is normally representing in the Go interface as a simple callback function, which the the client implements and the server calls.
+Progress is an asynchronous callback sent from the server to the client. It is normally representing in the Go interface as a simple callback function, which the client implements and the server calls.
 
 From Go types progress uses these types
 ```go

integration/image_load_test.go

@@ -68,7 +68,7 @@ func TestImageLoad(t *testing.T) {
 	// Add --local=true option since currently the transfer service
 	// does not provide enough progress to avoid timeout
 	// and --platform to only check for manifests for this platform. The "ctr image import"
-	// command otherwise might fail, if the the above docker commands use the containerd image
+	// command otherwise might fail, if the above docker commands use the containerd image
 	// store, as in that case `docker save` produces OCI artifacts referencing manifests for
 	// other platforms that are not included in what we downloaded. By specifying a platform, we
 	// just ignore the references to other platforms.

script/test/test2annotation.jq

@@ -56,7 +56,7 @@ def filter_test_item:
 # Take a list of test groups and make a map of tests keyed on the package name +
 # test name with all the output concatenated.
 #
-# This uses the last test log message to get the the file/line number for the test (as .Details)
+# This uses the last test log message to get the file/line number for the test (as .Details)
 def merge_output: reduce (.[][] | filter_test_item) as $item (
     {};  (
         "\($item.Package).\($item.Test)" as $key