about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-11 08:59:44 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-11 08:59:44 +0100
commit7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8 (patch)
tree7061d7dc8c0e31d96e35fef2adce9999713be9f2 /nixos/doc
parented8400bb9a59f267185d2d09b8f47d270a44ee99 (diff)
parent3c4f70996e46ed7e9c3a480f51398194d31e3e93 (diff)
downloadnixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.gz
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.bz2
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.lz
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.xz
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.zst
nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/development/option-types.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index e6c9eae11a72..d993e47bc914 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -106,7 +106,7 @@
      </para>
     </listitem>
    </varlistentry>
-   <varlistentry>
+   <varlistentry xml:id='types.ints.ux'>
     <term>
      <varname>types.ints.{u8, u16, u32}</varname>
     </term>
@@ -131,6 +131,17 @@
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>types.port</varname>
+    </term>
+    <listitem>
+     <para>
+      A port number. This type is an alias to
+      <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
 
   <para>