From 4a43267f103cfb7d9c802ea7f858907a1b5b75d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Roth?= <neolynx@gmail.com>
Date: Wed, 1 Jul 2026 16:04:07 +0200
Subject: [PATCH 1/2] swagger: fix validation error

---
 api/gpg.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/gpg.go b/api/gpg.go
index 088ab0de4..800c55df8 100644
--- a/api/gpg.go
+++ b/api/gpg.go
@@ -141,7 +141,7 @@ func apiGPGAddKey(c *gin.Context) {
 // @Description Returns all public keys currently installed in the aptly GPG keyring.
 // @Description
 // @Tags Mirrors
-// @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)" example(trustedkeys.gpg)
+// @Param keyring query string false "Keyring file to list keys from (default: trustedkeys.gpg)"
 // @Produce json
 // @Success 200 {object} gpgKeyListResponse "OK"
 // @Failure 400 {object} Error "Bad Request"

From 3026decd064bdb750c29a8428c84de3ffa4c9405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Roth?= <neolynx@gmail.com>
Date: Wed, 1 Jul 2026 16:04:48 +0200
Subject: [PATCH 2/2] docs: fix comment order in aptly.conf

---
 debian/aptly.conf | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/aptly.conf b/debian/aptly.conf
index 043b46ebe..5669f0c2d 100644
--- a/debian/aptly.conf
+++ b/debian/aptly.conf
@@ -185,18 +185,6 @@ filesystem_publish_endpoints:
     #     # * size (compare file size)
     #     verify_method: md5
 
-# S3 Endpoint Support
-#
-# cloud storage). First, publishing
-# endpoints should be described in aptly configuration file. Each endpoint has name
-# and associated settings.
-#
-# In order to publish to S3, specify endpoint as `s3:endpoint-name:` before
-# publishing prefix on the command line, e.g.:
-#
-#   `aptly publish snapshot wheezy-main s3:test:`
-#
-
 # JFrog Artifactory Endpoint Support
 #
 # aptly can be configured to publish repositories directly to JFrog Artifactory. First,
@@ -225,6 +213,17 @@ jfrog_publish_endpoints:
     #     api_key: api_key
     #     access_token: access_token
 
+# S3 Endpoint Support
+#
+# cloud storage). First, publishing
+# endpoints should be described in aptly configuration file. Each endpoint has name
+# and associated settings.
+#
+# In order to publish to S3, specify endpoint as `s3:endpoint-name:` before
+# publishing prefix on the command line, e.g.:
+#
+#   `aptly publish snapshot wheezy-main s3:test:`
+#
 s3_publish_endpoints:
     # # Endpoint Name
     # test: