about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2017-12-04 12:05:05 +0000
committerGitHub <noreply@github.com>2017-12-04 12:05:05 +0000
commit3807408c383b57805d27eb8293bd19cac591291a (patch)
tree099e98855804e0bda7a06e16621148b3a3edd9b0 /nixos/doc
parent852fe5582292ce5ea826673da9497c75fc04139d (diff)
parenta8f1ebf52c9a30b0beef2d4c895aa28e5e644921 (diff)
downloadnixlib-3807408c383b57805d27eb8293bd19cac591291a.tar
nixlib-3807408c383b57805d27eb8293bd19cac591291a.tar.gz
nixlib-3807408c383b57805d27eb8293bd19cac591291a.tar.bz2
nixlib-3807408c383b57805d27eb8293bd19cac591291a.tar.lz
nixlib-3807408c383b57805d27eb8293bd19cac591291a.tar.xz
nixlib-3807408c383b57805d27eb8293bd19cac591291a.tar.zst
nixlib-3807408c383b57805d27eb8293bd19cac591291a.zip
Merge pull request #32212 from ryantrinkle/nat-port-forwarding-ranges
Nat port forwarding ranges
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/development/option-types.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 83dcf0232d9d..ec940d5d2b86 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -110,6 +110,12 @@
     <listitem><para>A string. Multiple definitions are concatenated with a 
         collon <literal>":"</literal>.</para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term><varname>types.strMatching</varname></term>
+    <listitem><para>A string matching a specific regular expression. Multiple
+    definitions cannot be merged.  The regular expression is processed using
+    <literal>builtins.match</literal>.</para></listitem>
+  </varlistentry>
 </variablelist>
 
  </section>