06/17: refcard: Update examples for disk images and reformat.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit a596808022d9e77671a2c170b9f4edf89e3e0d38
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon May 30 12:39:59 2022 +0200

    refcard: Update examples for disk images and reformat.
---
 doc/refcard/guix-refcard.lout | 60 ++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/doc/refcard/guix-refcard.lout b/doc/refcard/guix-refcard.lout
index f0c65f4..acebc66 100644
--- a/doc/refcard/guix-refcard.lout
+++ b/doc/refcard/guix-refcard.lout
@@ -202,6 +202,11 @@ print its SHA256 hash }
 @Var{name} from @Var { repo } }
 @End @Category
 
+@VExpand { }
+@Footer
+@NP
+
+# 
------------------------------------------------------------------------------
 @C { Creating Application Bundles }
 @Begin
 
@@ -217,9 +222,7 @@ manifest in @Var { file } }
 
 @End @Category
 
-@Footer
 
-# 
------------------------------------------------------------------------------
 @C { Managing the Operating System }
 @Begin
 @LEntry { guix system search @Var { regexp } }
@@ -246,34 +249,11 @@ container }
 { build a Docker image of the OS declared in @Var { file } }
 @End @Category
 
-@C { Building Virtual Machines }
-@Begin
-@LEntry { guix system vm @Var { file } }
-{ produce a script that runs the OS declared in @Var { file } in a VM }
-@LEntry { guix system vm-image @Var { file } }
-{ produce a QCOW2 image of the OS in @Var { file } }
-@End @Category
-
-@C { Building Operating System Images }
-@Begin
-@LEntry { guix system disk-image @Var { file } }
-{ create a raw disk image for the OS declared in @Var { file } }
-@LEntry { guix system disk-image {-}{-}file-system-type=iso9660 @Var { file } }
-{ create an ISO CD"/"DVD image for the OS declared in @Var { file } }
-@End @Category
-
-@C { Inspecting an Operating System }
-@Begin
-@LEntry { guix system extension-graph @Var { file } }
-{ show the graph of services extensions for the OS in @Var {
-file } }
-@LEntry { guix system shepherd-graph @Var { file } }
-{ show the dependency graph of Shepherd services for @Var { file } }
-@End @Category
-
+@LP
 @VExpand { }
 @LP
 0.5 @Scale { @IncludeGraphic { Guix-horizontal-print.eps } }
+@NP
 
 @C { Declaring an Operating System }
 @Begin
@@ -325,6 +305,32 @@ complete } configuration of an operating system, along 
these lines:
 @End @Category
 
 @NP
+
+@C { Building Virtual Machines }
+@Begin
+@LEntry { guix system vm @Var { file } }
+{ produce a script that runs the OS declared in @Var { file } in a VM }
+@LEntry { guix system image {-}{-}image-type=qcow2 @Var { file } }
+{ produce a QCOW2 image of the OS in @Var { file } }
+@End @Category
+
+@C { Building Operating System Images }
+@Begin
+@LEntry { guix system image @Var { file } }
+{ create a raw disk image for the OS declared in @Var { file } }
+@LEntry { guix system image {-}{-}image-type=iso9660 @Var { file } }
+{ create an ISO CD"/"DVD image for the OS declared in @Var { file } }
+@End @Category
+
+@C { Inspecting an Operating System }
+@Begin
+@LEntry { guix system extension-graph @Var { file } }
+{ show the graph of services extensions for the OS in @Var {
+file } }
+@LEntry { guix system shepherd-graph @Var { file } }
+{ show the dependency graph of Shepherd services for @Var { file } }
+@End @Category
+
 @VExpand { }
 @LP
 7p @Font 1fx @Break { Copyright @CopyRight 2018, 2019, 2020 Ludovic Court�s 
<@I{"ludo@gnu.org"}>