12 files changed, 93 insertions, 92 deletions

diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index dbe35f41b88..516f9d86bbe 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -28,6 +28,14 @@
 ;;; 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 "activation" helpers.  Activation is the process that
+;;; consists in setting up system-wide files and directories so that an
+;;; 'operating-system' configuration becomes active.
+;;;
+;;; Code:
+
 (define-module (gnu build activation)
   #:use-module (gnu system accounts)
   #:use-module (gnu system privilege)
@@ -53,14 +61,6 @@
             activate-current-system
             mkdir-p/perms))
 
-;;; Commentary:
-;;;
-;;; This module provides "activation" helpers.  Activation is the process that
-;;; consists in setting up system-wide files and directories so that an
-;;; 'operating-system' configuration becomes active.
-;;;
-;;; Code:
-
 (define %skeleton-directory
   ;; Directory containing skeleton files for new accounts.
   ;; Note: keep the trailing '/' so that 'scandir' enters it.
diff --git a/gnu/build/chromium-extension.scm b/gnu/build/chromium-extension.scm
index 8171c727341..881cbbbcbc7 100644
--- a/gnu/build/chromium-extension.scm
+++ b/gnu/build/chromium-extension.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:
+;;;
+;;; Tools to deal with Chromium extensions.
+;;;
+;;; Code:
+
 (define-module (gnu build chromium-extension)
   #:use-module (guix gexp)
   #:use-module (guix packages)
@@ -26,12 +32,6 @@
   #:use-module (guix build-system trivial)
   #:export (make-chromium-extension))
 
-;;; Commentary:
-;;;
-;;; Tools to deal with Chromium extensions.
-;;;
-;;; Code:
-
 (define (make-signing-key seed)
   "Return a derivation for a deterministic PKCS #8 private key using SEED."
   (computed-file
diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm
index da9016488f7..2246f45519d 100644
--- a/gnu/build/cross-toolchain.scm
+++ b/gnu/build/cross-toolchain.scm
@@ -21,6 +21,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 tools to build a cross-compiler.
+;;;
+;;; Code:
+
 (define-module (gnu build cross-toolchain)
   #:use-module (guix build utils)
   #:use-module (guix build gnu-build-system)
@@ -30,12 +36,6 @@
   #:use-module (ice-9 ftw)
   #:export (cross-gcc-build-phases))
 
-;;; Commentary:
-;;;
-;;; This module provides tools to build a cross-compiler.
-;;;
-;;; Code:
-
 (define %gcc-include-paths
   ;; Environment variables for header search paths.
   ;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index f236efd9250..d7831767b45 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -26,6 +26,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 modules provides tools to deal with disk partitions, and to mount and
+;;; check file systems.
+;;;
+;;; Code:
+
 (define-module (gnu build file-systems)
   #:use-module (gnu system uuid)
   #:use-module (gnu system file-systems)
@@ -80,13 +87,6 @@
 
             swap-space->flags-bit-mask))
 
-;;; Commentary:
-;;;
-;;; This modules provides tools to deal with disk partitions, and to mount and
-;;; check file systems.
-;;;
-;;; Code:
-
 (define (system*/console program . args)
   "Run PROGRAM with ARGS in a tty on top of /dev/console.  The return value is
 as for 'system*'."
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 67975bfa647..7de9f0ec63a 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -17,6 +17,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 modules provides tools to deal with disk partitions, and to mount and
+;;; check file systems.
+;;;
+;;; Code:
+
 (define-module (gnu build hurd-boot)
   #:use-module (system repl error-handling)
   #:autoload   (system repl repl) (start-repl)
@@ -29,12 +36,6 @@
   #:export (make-hurd-device-nodes
             boot-hurd-system))
 
-;;; Commentary:
-;;;
-;;; Utility procedures useful to boot a Hurd system.
-;;;
-;;; Code:
-
 ;; XXX FIXME c&p from linux-boot.scm
 (define (find-long-option option arguments)
   "Find OPTION among ARGUMENTS, where OPTION is something like \"--load\".
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index 58ee77d1831..df9befe058a 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -19,6 +19,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 supports the installation of the GNU system on a hard disk.
+;;; It is meant to be used both in a build environment (in derivations that
+;;; build VM images), and on the bare metal (when really installing the
+;;; system.)
+;;;
+;;; Code:
+
 (define-module (gnu build install)
   #:use-module (guix build syscalls)
   #:use-module (guix build utils)
@@ -33,15 +42,6 @@
             mount-cow-store
             unmount-cow-store))
 
-;;; Commentary:
-;;;
-;;; This module supports the installation of the GNU system on a hard disk.
-;;; It is meant to be used both in a build environment (in derivations that
-;;; build VM images), and on the bare metal (when really installing the
-;;; system.)
-;;;
-;;; Code:
-
 (define (install-boot-config bootcfg bootcfg-location mount-point)
   "Atomically copy BOOTCFG into BOOTCFG-LOCATION on the MOUNT-POINT.  Note
 that the caller must make sure that BOOTCFG is registered as a GC root so
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index e0743eae55a..c1a294db18c 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -20,6 +20,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:
+;;;
+;;; Utility procedures useful in a Linux initial RAM disk (initrd).  Note that
+;;; many of these use procedures not yet available in vanilla Guile (`mount',
+;;; `load-linux-module', etc.); these are provided by a Guile patch used in
+;;; the GNU distribution.
+;;;
+;;; Code:
+
 (define-module (gnu build linux-boot)
   #:use-module (rnrs io ports)
   #:use-module (system repl error-handling)
@@ -67,15 +76,6 @@
 
             read-linux-consoles))
 
-;;; Commentary:
-;;;
-;;; Utility procedures useful in a Linux initial RAM disk (initrd).  Note that
-;;; many of these use procedures not yet available in vanilla Guile (`mount',
-;;; `load-linux-module', etc.); these are provided by a Guile patch used in
-;;; the GNU distribution.
-;;;
-;;; Code:
-
 (define* (mount-essential-file-systems #:key (root "/"))
   "Mount /dev, /proc, and /sys under ROOT."
   (define (scope dir)
diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm
index bb2ed0db0c7..559f02fc2a0 100644
--- a/gnu/build/linux-initrd.scm
+++ b/gnu/build/linux-initrd.scm
@@ -16,6 +16,14 @@
 ;;; 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:
+;;;
+;;; Tools to create Linux initial RAM disks ("initrds").  Initrds are
+;;; essentially gzipped cpio archives, with a '/init' executable that the
+;;; kernel runs at boot time.
+;;;
+;;; Code:
+
 (define-module (gnu build linux-initrd)
   #:use-module ((guix cpio) #:prefix cpio:)
   #:use-module (guix build utils)
@@ -27,14 +35,6 @@
   #:export (write-cpio-archive
             build-initrd))
 
-;;; Commentary:
-;;;
-;;; Tools to create Linux initial RAM disks ("initrds").  Initrds are
-;;; essentially gzipped cpio archives, with a '/init' executable that the
-;;; kernel runs at boot time.
-;;;
-;;; Code:
-
 (define* (write-cpio-archive output directory
                              #:key
                              (compress? #t)
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 6bf71100e49..ae0137e1c12 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.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:
+;;;
+;;; Tools to deal with Linux kernel modules.
+;;;
+;;; Code:
+
 (define-module (gnu build linux-modules)
   #:use-module (guix elf)
   #:use-module (guix glob)
@@ -78,12 +84,6 @@
 
             make-linux-module-directory))
 
-;;; Commentary:
-;;;
-;;; Tools to deal with Linux kernel modules.
-;;;
-;;; Code:
-
 (define current-module-debugging-port
   (make-parameter (%make-void-port "w")))
 
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index 015fc8a98b7..b6d4ec0de9c 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -19,6 +19,17 @@
 ;;; 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:
+;;;
+;;; Instrumentation tools for QEMU virtual machines (VMs).  A "marionette" is
+;;; essentially a VM (a QEMU instance) with its monitor connected to a
+;;; Unix-domain socket, and with a REPL inside the guest listening on a
+;;; virtual console, which is itself connected to the host via a Unix-domain
+;;; socket--these are the marionette's strings, connecting it to the almighty
+;;; puppeteer.
+;;;
+;;; Code:
+
 (define-module (gnu build marionette)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-26)
@@ -44,17 +55,6 @@
             system-test-runner
             qemu-command))
 
-;;; Commentary:
-;;;
-;;; Instrumentation tools for QEMU virtual machines (VMs).  A "marionette" is
-;;; essentially a VM (a QEMU instance) with its monitor connected to a
-;;; Unix-domain socket, and with a REPL inside the guest listening on a
-;;; virtual console, which is itself connected to the host via a Unix-domain
-;;; socket--these are the marionette's strings, connecting it to the almighty
-;;; puppeteer.
-;;;
-;;; Code:
-
 (define-record-type <marionette>
   (marionette command pid monitor repl)
   marionette?
diff --git a/gnu/build/secret-service.scm b/gnu/build/secret-service.scm
index 5447563cd94..0c8a0c7677b 100644
--- a/gnu/build/secret-service.scm
+++ b/gnu/build/secret-service.scm
@@ -17,6 +17,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:
+;;;
+;;; Utility procedures for copying secrets into a VM.
+;;;
+;;; Note: This code runs within the 'shepherd' process, hence the use of
+;;; Fibers.
+;;;
+;;; Code:
+
 (define-module (gnu build secret-service)
   #:autoload   (fibers io-wakeup) (wait-until-port-readable-operation)
   #:autoload   (fibers operations) (perform-operation
@@ -33,15 +42,6 @@
   #:export (secret-service-receive-secrets
             secret-service-send-secrets))
 
-;;; Commentary:
-;;;
-;;; Utility procedures for copying secrets into a VM.
-;;;
-;;; Note: This code runs within the 'shepherd' process, hence the use of
-;;; Fibers.
-;;;
-;;; Code:
-
 (define-syntax log
   (lambda (s)
     "Log the given message."
diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm
index 4ead27be0be..26f75e5d533 100644
--- a/gnu/build/shepherd.scm
+++ b/gnu/build/shepherd.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 provides extensions to the GNU Shepherd.  In particular, it
+;;; provides a helper to start services in a container.
+;;;
+;;; Code:
+
 (define-module (gnu build shepherd)
   #:use-module (gnu system file-systems)
   #:use-module (gnu build linux-container)
@@ -35,13 +42,6 @@
   #:export (default-mounts
             fork+exec-command/container))
 
-;;; Commentary:
-;;;
-;;; This module provides extensions to the GNU Shepherd.  In particular, it
-;;; provides a helper to start services in a container.
-;;;
-;;; Code:
-
 (define (clean-up file)
   (when file
     (catch 'system-error