Doc fixes

glennmatthews · Jun 3, 2016 · 9c7a7ab · 9c7a7ab
1 parent 42bb5dc
commit 9c7a7ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -79,7 +79,8 @@ of the COT installation process, or they can be installed as-needed by COT:
 * The ``cot add-disk`` command requires either `qemu-img`_ (version 2.1 or
   later) or vmdktool_ as a helper program when adding hard disks to an OVF.
 * The ``cot inject-config`` command requires mkisofs_ (or its fork
-  ``genisoimage``) to create ISO (CD-ROM) images for platforms that use ISOs.
+  ``genisoimage``) and/or xorriso_ to create ISO (CD-ROM) images for
+  platforms that use ISOs to package the configuration.
 * Similarly, for platforms using hard disks for bootstrap configuration,
   ``cot inject-config`` requires `fatdisk`_ to format hard disk images.
 * The ``cot deploy ... esxi`` command requires ovftool_ to communicate
@@ -114,6 +115,7 @@ to install the helper in question.
 .. _qemu-img: http://www.qemu.org
 .. _vmdktool: http://www.freshports.org/sysutils/vmdktool/
 .. _mkisofs: http://cdrecord.org/
+.. _xorriso: https://www.gnu.org/software/xorriso/
 .. _fatdisk: http://github.com/goblinhack/fatdisk
 .. _ovftool: https://www.vmware.com/support/developer/ovf/
 .. _MacPorts: http://www.macports.org/
diff --git a/docs/thanks.rst b/docs/thanks.rst
@@ -7,8 +7,8 @@ We would like to thank:
 
   * Arun Arunkumar
   * Mark Coverdill
-  * Jonathan Muslow
   * Myles Dear
+  * Jonathan Muslow
   * Rick Ogg
   * David Rosenfeld
   * Rafal Skorka