diff --git a/ChangeLog b/ChangeLog index bb5e916..3a795e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 13 Oct 2012; Robin H. Johnson doc/genkernel.8.txt: + Document resume parameters. + 13 Oct 2012; Robin H. Johnson arch/alpha/modules_load, arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load, diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 0377828..0f88334 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -550,7 +550,9 @@ which the ramdisk scripts would recognize. *real_resume*=<...>:: *resume*=<...>:: *noresume*:: - TO BE DOCUMENTED + *noresume* disables any default resume parameters. *resume* and + *real_resume* specify a device via LABEL or UUID to use for for loading a + TuxOnICE, SWSUSP or Suspend2 resume image. *cdroot*[=<...>]:: *cdroot_type*=<...>::