summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/grub
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-12-17 11:40:34 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-12-17 11:45:31 +0100
commit3af715af900298476bea9f487429b1941130d0ec (patch)
tree3071c01718b9d0f283a0d98906c076bfd021efb1 /nixos/modules/system/boot/loader/grub
parent67c92e92062a0b86ff0b7a9c9f35176d9afec054 (diff)
downloadnixlib-3af715af900298476bea9f487429b1941130d0ec.tar
nixlib-3af715af900298476bea9f487429b1941130d0ec.tar.gz
nixlib-3af715af900298476bea9f487429b1941130d0ec.tar.bz2
nixlib-3af715af900298476bea9f487429b1941130d0ec.tar.lz
nixlib-3af715af900298476bea9f487429b1941130d0ec.tar.xz
nixlib-3af715af900298476bea9f487429b1941130d0ec.tar.zst
nixlib-3af715af900298476bea9f487429b1941130d0ec.zip
Revert "fix 2 xml errors in the description of boot.loader.grub.efiInstallAsRemovable"
This reverts commit 656cc3acafcb30e3503f4d3e39694ca996c66015 because it
causes building the manual to fail:

  $ nixos-rebuild build
  ...
  building path(s) ‘/nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb’
  Writing /nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb/manual.db for book(book-nixos-manual)
  ./man-pages.xml:625: element para: Relax-NG validity error : Did not expect element para there
  ./man-pages.xml:3: element variablelist: Relax-NG validity error : Element refsection has extra content: variablelist
  ./man-pages.xml:29: element refsection: Relax-NG validity error : Element refentry has extra content: refsection
  ./man-pages.xml:3: element reference: Relax-NG validity error : Element reference failed to validate content
  ./man-pages.xml fails to validate

CC @cleverca22, @Mic92
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index b5bb26fb8d20..294fc1988e9f 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -361,7 +361,7 @@ in
         example = true;
         type = types.bool;
         description = ''
-          <para>Whether to invoke <literal>grub-install</literal> with
+          Whether to invoke <literal>grub-install</literal> with
           <literal>--removable</literal>.</para>
 
           <para>Unless you turn this on, GRUB will install itself somewhere in
@@ -391,7 +391,6 @@ in
             <listitem><para>You simply dislike the idea of depending on NVRAM
             state to make your drive bootable</para></listitem>
           </itemizedlist>
-          </para>
         '';
       };