doc: Move Commentary above module definition.

Merges: https://codeberg.org/guix/guix/pulls/9052
Reviewed-by: Ludovic Courtès <ludo@gnu.org>
Reviewed-by: Maxim Cournoyer <maxim@guixotic.coop>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>

31 files changed, 210 insertions, 211 deletions

diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 907f7d37f4a..bad9d38e369 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -21,6 +21,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides basic system administration tools: log rotation,
+;;; unattended upgrades, etc.
+;;;
+;;; Code:
+
 (define-module (gnu services admin)
   #:use-module (gnu system file-systems)
   #:use-module (gnu packages admin)
@@ -102,13 +109,6 @@
             resize-file-system-configuration-btrfs-progs
             resize-file-system-configuration-bcachefs-tools))
 
-;;; Commentary:
-;;;
-;;; This module provides basic system administration tools: log rotation,
-;;; unattended upgrades, etc.
-;;;
-;;; Code:
-
 
 ;;;
 ;;; Shepherd's log rotation service.
diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm
index 2981b89ed8c..2e17c02513b 100644
--- a/gnu/services/audio.scm
+++ b/gnu/services/audio.scm
@@ -19,6 +19,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Audio related services
+;;;
+;;; Code:
+
 (define-module (gnu services audio)
   #:use-module (guix gexp)
   #:use-module (guix deprecation)
@@ -163,12 +169,6 @@
             snapserver-configuration-extra-content
             snapserver-service-type))
 
-;;; Commentary:
-;;;
-;;; Audio related services
-;;;
-;;; Code:
-
 (define (uglify-field-name field-name)
   (let ((str (symbol->string field-name)))
     (string-join (string-split (if (string-suffix? "?" str)
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index d0e6fedf59d..77d6f950b9f 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -16,6 +16,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides service definitions for the Avahi
+;;; "zero-configuration" tool set.
+;;;
+;;; Code:
+
 (define-module (gnu services avahi)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -42,13 +49,6 @@
 
             avahi-service-type))
 
-;;; Commentary:
-;;;
-;;; This module provides service definitions for the Avahi
-;;; "zero-configuration" tool set.
-;;;
-;;; Code:
-
 (define-record-type* <avahi-configuration>
   avahi-configuration make-avahi-configuration
   avahi-configuration?
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 5108187d1ee..4bfc484b898 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -40,6 +40,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Base system services---i.e., services that 99% of the users will want to
+;;; use.
+;;;
+;;; Code:
+
 (define-module (gnu services base)
   #:use-module (guix store)
   #:use-module (guix deprecation)
@@ -321,13 +328,6 @@
 
             %base-services))
 
-;;; Commentary:
-;;;
-;;; Base system services---i.e., services that 99% of the users will want to
-;;; use.
-;;;
-;;; Code:
-
 
 
 ;;;
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
index 7a7c2a9e00e..f1ab9149f6a 100644
--- a/gnu/services/certbot.scm
+++ b/gnu/services/certbot.scm
@@ -24,6 +24,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Automatically obtaining TLS certificates from Let's Encrypt.
+;;;
+;;; Code:
+
 (define-module (gnu services certbot)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -42,12 +48,6 @@
             certbot-configuration?
             certificate-configuration))
 
-;;; Commentary:
-;;;
-;;; Automatically obtaining TLS certificates from Let's Encrypt.
-;;;
-;;; Code:
-
 
 (define-record-type* <certificate-configuration>
   certificate-configuration make-certificate-configuration
diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm
index 684ab73f76d..f2d1be04f05 100644
--- a/gnu/services/cgit.scm
+++ b/gnu/services/cgit.scm
@@ -19,6 +19,16 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides a service definition for the Cgit a web frontend for
+;;; Git repositories written in C.
+;;;
+;;; Note: fields of <cgit-configuration> and <repository-cgit-configuration>
+;;; should be specified in the specific order.
+;;;
+;;; Code:
+
 (define-module (gnu services cgit)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages version-control)
@@ -42,16 +52,6 @@
             opaque-cgit-configuration
             cgit-service-type))
 
-;;; Commentary:
-;;;
-;;; This module provides a service definition for the Cgit a web frontend for
-;;; Git repositories written in C.
-;;;
-;;; Note: fields of <cgit-configuration> and <repository-cgit-configuration>
-;;; should be specified in the specific order.
-;;;
-;;; Code:
-
 (define %cgit-configuration-nginx
   (nginx-server-configuration
    (root cgit)
diff --git a/gnu/services/ci.scm b/gnu/services/ci.scm
index 08416e99620..61c0166eed2 100644
--- a/gnu/services/ci.scm
+++ b/gnu/services/ci.scm
@@ -19,6 +19,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;;; Commentary:
+;;;
+;;; This module implements a service that to run instances of Laminar, a
+;;; continuous integration tool.
+;;;
+;;;; Code:
+
 (define-module (gnu services ci)
   #:use-module (guix gexp)
   #:use-module (guix records)
@@ -59,13 +66,6 @@
 
             forgejo-runner-service-type))
 
-;;;; Commentary:
-;;;
-;;; This module implements a service that to run instances of Laminar, a
-;;; continuous integration tool.
-;;;
-;;;; Code:
-
 (define-record-type* <laminar-configuration>
   laminar-configuration make-laminar-configuration
   laminar-configuration?
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index d42f04f1161..956f4451fd1 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -24,6 +24,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Syntax for creating Scheme bindings to complex configuration files.
+;;;
+;;; Code:
+
 (define-module (gnu services configuration)
   #:use-module (guix packages)
   #:use-module (guix records)
@@ -92,12 +98,6 @@
             generic-serialize-alist-entry
             generic-serialize-alist))
 
-;;; Commentary:
-;;;
-;;; Syntax for creating Scheme bindings to complex configuration files.
-;;;
-;;; Code:
-
 (define-condition-type &configuration-error &error
   configuration-error?)
 
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index b594fe78d7a..77d7cab96ce 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -21,6 +21,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;;; Commentary:
+;;;
+;;; This module implements a service that to run instances of Cuirass, a
+;;; continuous integration tool.
+;;;
+;;;; Code:
+
 (define-module (gnu services cuirass)
   #:use-module (guix channels)
   #:use-module (guix gexp)
@@ -50,13 +57,6 @@
             cuirass-remote-worker-configuration?
             cuirass-remote-worker-service-type))
 
-;;;; Commentary:
-;;;
-;;; This module implements a service that to run instances of Cuirass, a
-;;; continuous integration tool.
-;;;
-;;;; Code:
-
 (define %cuirass-default-database
   "dbname=cuirass")
 
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm
index 27aac7a16ac..e2102a07f8b 100644
--- a/gnu/services/cups.scm
+++ b/gnu/services/cups.scm
@@ -22,6 +22,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Service defininition for the CUPS printing system.
+;;;
+;;; Code:
+
 (define-module (gnu services cups)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
@@ -47,12 +53,6 @@
             operation-access-control
             method-access-control))
 
-;;; Commentary:
-;;;
-;;; Service defininition for the CUPS printing system.
-;;;
-;;; Code:
-
 (define %cups-accounts
   (list (or
          ;; The "lp" group should already exist; try to reuse it.
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 6742032f112..9ee30192eb5 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -28,6 +28,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Database services.
+;;;
+;;; Code:
+
 (define-module (gnu services databases)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -106,12 +112,6 @@
             redis-configuration?
             redis-service-type))
 
-;;; Commentary:
-;;;
-;;; Database services.
-;;;
-;;; Code:
-
 (define %default-postgres-hba
   (plain-file "pg_hba.conf"
               "
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index c9fe5024319..e481361b9e6 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -40,6 +40,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module contains service definitions for a "desktop" environment.
+;;;
+;;; Code:
+
 (define-module (gnu services desktop)
   #:use-module ((gnu home services utils) #:select (object->camel-case-string))
   #:use-module (gnu services)
@@ -243,12 +249,6 @@
 
             %desktop-services))
 
-;;; Commentary:
-;;;
-;;; This module contains service definitions for a "desktop" environment.
-;;;
-;;; Code:
-
 
 ;;;
 ;;; Helpers.
diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm
index b44ca2ae3de..bea61d21a00 100644
--- a/gnu/services/getmail.scm
+++ b/gnu/services/getmail.scm
@@ -16,6 +16,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Service for the getmail mail retriever.
+;;;
+;;; Code:
+
 (define-module (gnu services getmail)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -41,12 +47,6 @@
             getmail-configuration
             getmail-service-type))
 
-;;; Commentary:
-;;;
-;;; Service for the getmail mail retriever.
-;;;
-;;; Code:
-
 (define (uglify-field-name field-name)
   (let ((str (symbol->string field-name)))
     (string-join (string-split (if (string-suffix? "?" str)
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index adf4990fde4..93f526d1c08 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -19,6 +19,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;;; Commentary:
+;;;
+;;; Services specifically related to GNU Guix.
+;;;
+;;;; Code:
+
 (define-module (gnu services guix)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
@@ -165,12 +171,6 @@
             shared-cache-configuration
             user-cache))
 
-;;;; Commentary:
-;;;
-;;; Services specifically related to GNU Guix.
-;;;
-;;;; Code:
-
 (define-record-type* <guix-build-coordinator-configuration>
   guix-build-coordinator-configuration make-guix-build-coordinator-configuration
   guix-build-coordinator-configuration?
diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm
index d276ba1b74c..777a8f8a3ae 100644
--- a/gnu/services/herd.scm
+++ b/gnu/services/herd.scm
@@ -18,6 +18,15 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides an interface to the GNU Shepherd, similar to the
+;;; 'herd' command.  Essentially it implements a subset of the (shepherd comm)
+;;; module, but focusing only on the parts relevant to 'guix system
+;;; reconfigure'.
+;;;
+;;; Code:
+
 (define-module (gnu services herd)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
@@ -63,15 +72,6 @@
             restart-service
             wait-for-service))
 
-;;; Commentary:
-;;;
-;;; This module provides an interface to the GNU Shepherd, similar to the
-;;; 'herd' command.  Essentially it implements a subset of the (shepherd comm)
-;;; module, but focusing only on the parts relevant to 'guix system
-;;; reconfigure'.
-;;;
-;;; Code:
-
 (define %shepherd-socket-file
   (let ((uid (getuid)))
     (make-parameter (if (zero? uid)     ;root
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 1ee38e8cd01..53fdfb86043 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -16,6 +16,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module implements services for the Hurd.
+;;;
+;;; Code:
+
 (define-module (gnu services hurd)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages hurd)
@@ -33,12 +39,6 @@
             hurd-login-configuration
             hurd-login-service-type))
 
-;;; Commentary:
-;;;
-;;; This module implements services for the Hurd.
-;;;
-;;; Code:
-
 ;;;
 ;;; The Hurd VGA console service.
 ;;;
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index 92784b65ca6..923cf83137a 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -17,6 +17,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; LIRC service.
+;;;
+;;; Code:
+
 (define-module (gnu services lirc)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
@@ -30,12 +36,6 @@
             lirc-service  ; deprecated
             lirc-service-type))
 
-;;; Commentary:
-;;;
-;;; LIRC service.
-;;;
-;;; Code:
-
 (define-record-type* <lirc-configuration>
   lirc-configuration make-lirc-configuration
   lirc-configuation?
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index d31cad5645d..93eea095853 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -27,6 +27,13 @@
 ;;;
 ;;; Some of the help text was taken from the default dovecot.conf files.
 
+;;; Commentary:
+;;;
+;;; This module provides service definitions for the Dovecot POP3 and IMAP
+;;; mail server.
+;;;
+;;; Code:
+
 (define-module (gnu services mail)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -105,13 +112,6 @@
             %default-rspamd-config-file
             %default-rspamd-group))
 
-;;; Commentary:
-;;;
-;;; This module provides service definitions for the Dovecot POP3 and IMAP
-;;; mail server.
-;;;
-;;; Code:
-
 (define (uglify-field-name field-name)
   (let ((str (symbol->string field-name)))
     (string-join (string-split (if (string-suffix? "?" str)
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index 68d02ef4d7c..c8099480b84 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -18,6 +18,21 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module implements a service that to run instances of GNU mcron, a
+;;; periodic job execution daemon.  Example of a service:
+;;
+;;  (service mcron-service-type
+;;           (mcron-configuration
+;;            (jobs (list #~(job next-second-from
+;;                               (lambda ()
+;;                                 (call-with-output-file "/dev/console"
+;;                                   (lambda (port)
+;;                                     (display "hello!\n" port)))))))))
+;;;
+;;; Code:
+
 (define-module (gnu services mcron)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
@@ -39,21 +54,6 @@
 
             mcron-service-type))
 
-;;; Commentary:
-;;;
-;;; This module implements a service that to run instances of GNU mcron, a
-;;; periodic job execution daemon.  Example of a service:
-;;
-;;  (service mcron-service-type
-;;           (mcron-configuration
-;;            (jobs (list #~(job next-second-from
-;;                               (lambda ()
-;;                                 (call-with-output-file "/dev/console"
-;;                                   (lambda (port)
-;;                                     (display "hello!\n" port)))))))))
-;;;
-;;; Code:
-
 ;; Configuration of mcron.
 ;; XXX: 'define-configuration' cannot be used here due to the need for
 ;; 'thunked' and 'innate' fields as well as 'this-mcron-configuration'.
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 0be175d8af2..79c8d2a312c 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -22,6 +22,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Messaging services.
+;;;
+;;; Code:
+
 (define-module (gnu services messaging)
   #:use-module ((gnu home services utils) #:select (object->camel-case-string))
   #:use-module (gnu packages admin)
@@ -254,12 +260,6 @@
             zulip-irc-bridge-configuration
             zulip-irc-bridge-service-type))
 
-;;; Commentary:
-;;;
-;;; Messaging services.
-;;;
-;;; Code:
-
 (define-syntax define-all-configurations
   (lambda (stx)
     (define-syntax-rule (id ctx parts ...)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 752f3e3e890..5cce50010dd 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -41,6 +41,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Networking services.
+;;;
+;;; Code:
+
 (define-module (gnu services networking)
   #:use-module (gnu home services utils)
   #:use-module (gnu services)
@@ -308,12 +314,6 @@
             keepalived-configuration?
             keepalived-service-type))
 
-;;; Commentary:
-;;;
-;;; Networking services.
-;;;
-;;; Code:
-
 (define %unroutable-ipv4
   ;; Unroutable address, as per <https://www.rfc-editor.org/rfc/rfc5737>.
   "203.0.113.1")
diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm
index 83ba78ce7e6..46f5c975056 100644
--- a/gnu/services/nix.scm
+++ b/gnu/services/nix.scm
@@ -17,6 +17,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides a service definition for the Nix daemon.
+;;;
+;;; Code:
+
 (define-module (gnu services nix)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages bash)
@@ -42,12 +48,6 @@
             nix-configuration
             nix-configuration?))
 
-;;; Commentary:
-;;;
-;;; This module provides a service definition for the Nix daemon.
-;;;
-;;; Code:
-
 (define-record-type* <nix-configuration>
   nix-configuration make-nix-configuration
   nix-configuration?
diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm
index c9de8e710c0..fcdfed34db2 100644
--- a/gnu/services/rsync.scm
+++ b/gnu/services/rsync.scm
@@ -18,6 +18,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;;; Commentary:
+;;;
+;;; This module implements a service that to run instance of Rsync,
+;;; files synchronization tool.
+;;;
+;;;; Code:
+
 (define-module (gnu services rsync)
   #:use-module ((gnu build linux-container) #:select (%namespaces))
   #:use-module (gnu services)
@@ -50,13 +57,6 @@
 
             rsync-service-type))
 
-;;;; Commentary:
-;;;
-;;; This module implements a service that to run instance of Rsync,
-;;; files synchronization tool.
-;;;
-;;;; Code:
-
 (define-record-type* <rsync-configuration>
   rsync-configuration
   make-rsync-configuration
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index b1e8b040375..1a8eea67757 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -20,6 +20,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Instantiating system services as a shepherd configuration file.
+;;;
+;;; Code:
+
 (define-module (gnu services shepherd)
   #:use-module (guix ui)
   #:use-module (guix sets)
@@ -101,13 +107,6 @@
 
             assert-valid-graph))
 
-;;; Commentary:
-;;;
-;;; Instantiating system services as a shepherd configuration file.
-;;;
-;;; Code:
-
-
 (define-record-type* <shepherd-configuration>
   shepherd-configuration make-shepherd-configuration
   shepherd-configuration?
diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm
index 4c319153448..cf535eb6e18 100644
--- a/gnu/services/sound.scm
+++ b/gnu/services/sound.scm
@@ -20,6 +20,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Sound services.
+;;;
+;;; Code:
+
 (define-module (gnu services sound)
   #:use-module (gnu services base)
   #:use-module (gnu services configuration)
@@ -79,12 +85,6 @@
             speakersafetyd-configuration?
             speakersafetyd-service-type))
 
-;;; Commentary:
-;;;
-;;; Sound services.
-;;;
-;;; Code:
-
 
 ;;;
 ;;; ALSA
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index e167d2f689f..a6ecd06d35a 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -24,6 +24,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module implements secure shell (SSH) services.
+;;;
+;;; OpenSSH.
+;;;
+
 (define-module (gnu services ssh)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages admin)
@@ -90,13 +97,6 @@
             webssh-service-type
             %webssh-configuration-nginx))
 
-;;; Commentary:
-;;;
-;;; This module implements secure shell (SSH) services.
-;;;
-;;; OpenSSH.
-;;;
-
 (define-record-type* <openssh-configuration>
   openssh-configuration make-openssh-configuration
   openssh-configuration?
diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm
index 577672ab0c5..0d5e7cc8a94 100644
--- a/gnu/services/syncthing.scm
+++ b/gnu/services/syncthing.scm
@@ -18,6 +18,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides a service definition for the syncthing service.
+;;;
+;;; Code:
+
 (define-module (gnu services syncthing)
   #:use-module (gnu packages syncthing)
   #:use-module (gnu services)
@@ -41,12 +47,6 @@
             syncthing-shepherd-service
             syncthing-files-service))
 
-;;; Commentary:
-;;;
-;;; This module provides a service definition for the syncthing service.
-;;;
-;;; Code:
-
 (define (bool->xml-string bool)
   ;; add compatibility for the short duration where #f was specified as
   ;; "false"
diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm
index 16c32463534..70b242e5980 100644
--- a/gnu/services/upnp.scm
+++ b/gnu/services/upnp.scm
@@ -16,6 +16,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; UPnP services.
+;;;
+;;; Code:
+
 (define-module (gnu services upnp)
   #:use-module (gnu build linux-container)
   #:use-module (gnu packages admin)
@@ -54,12 +60,6 @@
             readymedia-activation
             readymedia-shepherd-service))
 
-;;; Commentary:
-;;;
-;;; UPnP services.
-;;;
-;;; Code:
-
 (define* (%readymedia-default-cache-directory #:key (home-service? #f))
   (if home-service?
       ".cache/readymedia"
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index 55af92c9f5a..8efa4996c5b 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -24,6 +24,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Version Control related services.
+;;;
+;;; Code:
+
 (define-module (gnu services version-control)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -135,12 +141,6 @@
 
             fossil-service-type))
 
-;;; Commentary:
-;;;
-;;; Version Control related services.
-;;;
-;;; Code:
-
 
 ;;;
 ;;; Git daemon.
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 4a323dbd96e..351a7daf6dd 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -37,6 +37,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Web services.
+;;;
+;;; Code:
+
 (define-module (gnu services web)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
@@ -390,12 +396,6 @@
 
             miniflux-service-type))
 
-;;; Commentary:
-;;;
-;;; Web services.
-;;;
-;;; Code:
-
 (define-record-type* <httpd-module>
   httpd-module make-httpd-module
   httpd-module?
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index a65dc20244c..5f8065b06d5 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -33,6 +33,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Services that relate to the X Window System.
+;;;
+;;; Code:
+
 (define-module (gnu services xorg)
   #:autoload   (gnu services sddm) (sddm-service-type)
   #:use-module (gnu artwork)
@@ -144,12 +150,6 @@
             handle-xorg-configuration
             set-xorg-configuration))
 
-;;; Commentary:
-;;;
-;;; Services that relate to the X Window System.
-;;;
-;;; Code:
-
 (define* (default-xorg-modules
            #:optional
            (system (or (and=>