about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-05-21 09:13:59 +0100
committerGitHub <noreply@github.com>2017-05-21 09:13:59 +0100
commitf2795086489711ee31de7e52552679741cf75872 (patch)
tree57eca7eee3515e7d3f0e8228590111fbd0c78b43 /nixos/doc
parentde9f19f178c44538da7489a1b5655aa40bd3ab45 (diff)
parentaed1986f2f27b309f675c2e210ef2ab07453f14c (diff)
downloadnixlib-f2795086489711ee31de7e52552679741cf75872.tar
nixlib-f2795086489711ee31de7e52552679741cf75872.tar.gz
nixlib-f2795086489711ee31de7e52552679741cf75872.tar.bz2
nixlib-f2795086489711ee31de7e52552679741cf75872.tar.lz
nixlib-f2795086489711ee31de7e52552679741cf75872.tar.xz
nixlib-f2795086489711ee31de7e52552679741cf75872.tar.zst
nixlib-f2795086489711ee31de7e52552679741cf75872.zip
Merge pull request #25934 from nh2/nixos-manual-module-option-never-fix
Fix typo in manual about options without defaults
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/development/option-declarations.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index d62d0896bb7c..e322b6458a1a 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -41,8 +41,9 @@ options = {
     <term><varname>default</varname></term>
     <listitem>
       <para>The default value used if no value is defined by any
-      module.  A default is not required; in that case, if the option
-      value is never used, an error will be thrown.</para>
+      module.  A default is not required; but if a default is not given,
+      then users of the module will have to define the value of the
+      option, otherwise an error will be thrown.</para>
     </listitem>
   </varlistentry>