nixos: nixos/doc/manual/configuration/ipv6-config.xml to CommonMark

4 files changed, 90 insertions, 55 deletions

diff --git a/nixos/doc/manual/configuration/ipv6-config.section.md b/nixos/doc/manual/configuration/ipv6-config.section.md
new file mode 100644
index 00000000000..6d51a21aa64
--- /dev/null
+++ b/nixos/doc/manual/configuration/ipv6-config.section.md
@@ -0,0 +1,42 @@
+# IPv6 Configuration {#sec-ipv6}
+
+IPv6 is enabled by default. Stateless address autoconfiguration is used
+to automatically assign IPv6 addresses to all interfaces, and Privacy
+Extensions (RFC 4946) are enabled by default. You can adjust the default
+for this by setting [`networking.tempAddresses`](options.html#opt-networking.tempAddresses). This option
+may be overridden on a per-interface basis by
+[`networking.interfaces.<name>.tempAddress`](options.html#opt-networking.interfaces._name_.tempAddress). You can disable
+IPv6 support globally by setting:
+
+```nix
+networking.enableIPv6 = false;
+```
+
+You can disable IPv6 on a single interface using a normal sysctl (in
+this example, we use interface `eth0`):
+
+```nix
+boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
+```
+
+As with IPv4 networking interfaces are automatically configured via
+DHCPv6. You can configure an interface manually:
+
+```nix
+networking.interfaces.eth0.ipv6.addresses = [ {
+  address = "fe00:aa:bb:cc::2";
+  prefixLength = 64;
+} ];
+```
+
+For configuring a gateway, optionally with explicitly specified
+interface:
+
+```nix
+networking.defaultGateway6 = {
+  address = "fe00::1";
+  interface = "enp0s3";
+};
+```
+
+See [](#sec-ipv4) for similar examples and additional information.
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
deleted file mode 100644
index 45e85dbf3df..00000000000
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="sec-ipv6">
- <title>IPv6 Configuration</title>
-
- <para>
-  IPv6 is enabled by default. Stateless address autoconfiguration is used to
-  automatically assign IPv6 addresses to all interfaces, and Privacy
-  Extensions (RFC 4946) are enabled by default. You can adjust the default
-  for this by setting <xref linkend="opt-networking.tempAddresses"/>.
-  This option may be overridden on a per-interface basis by
-  <xref linkend="opt-networking.interfaces._name_.tempAddress"/>.
-  You can disable IPv6 support globally by setting:
-<programlisting>
-<xref linkend="opt-networking.enableIPv6"/> = false;
-</programlisting>
- </para>
-
- <para>
-  You can disable IPv6 on a single interface using a normal sysctl (in this
-  example, we use interface <varname>eth0</varname>):
-<programlisting>
-<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
-</programlisting>
- </para>
-
- <para>
-  As with IPv4 networking interfaces are automatically configured via DHCPv6.
-  You can configure an interface manually:
-<programlisting>
-<link linkend="opt-networking.interfaces._name_.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
-  address = "fe00:aa:bb:cc::2";
-  prefixLength = 64;
-} ];
-</programlisting>
- </para>
-
- <para>
-  For configuring a gateway, optionally with explicitly specified interface:
-<programlisting>
-<xref linkend="opt-networking.defaultGateway6"/> = {
-  address = "fe00::1";
-  interface = "enp0s3";
-};
-</programlisting>
- </para>
-
- <para>
-  See <xref linkend='sec-ipv4' /> for similar examples and additional
-  information.
- </para>
-</section>
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
index 6203d2ba8dc..10265922432 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -11,7 +11,7 @@
  <xi:include href="../from_md/configuration/network-manager.section.xml" />
  <xi:include href="../from_md/configuration/ssh.section.xml" />
  <xi:include href="../from_md/configuration/ipv4-config.section.xml" />
- <xi:include href="ipv6-config.xml" />
+ <xi:include href="../from_md/configuration/ipv6-config.section.xml" />
  <xi:include href="firewall.xml" />
  <xi:include href="wireless.xml" />
  <xi:include href="ad-hoc-network-config.xml" />
diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml
new file mode 100644
index 00000000000..ac3c2cd4b21
--- /dev/null
+++ b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml
@@ -0,0 +1,47 @@
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ipv6">
+  <title>IPv6 Configuration</title>
+  <para>
+    IPv6 is enabled by default. Stateless address autoconfiguration is
+    used to automatically assign IPv6 addresses to all interfaces, and
+    Privacy Extensions (RFC 4946) are enabled by default. You can adjust
+    the default for this by setting
+    <link xlink:href="options.html#opt-networking.tempAddresses"><literal>networking.tempAddresses</literal></link>.
+    This option may be overridden on a per-interface basis by
+    <link xlink:href="options.html#opt-networking.interfaces._name_.tempAddress"><literal>networking.interfaces.&lt;name&gt;.tempAddress</literal></link>.
+    You can disable IPv6 support globally by setting:
+  </para>
+  <programlisting language="bash">
+networking.enableIPv6 = false;
+</programlisting>
+  <para>
+    You can disable IPv6 on a single interface using a normal sysctl (in
+    this example, we use interface <literal>eth0</literal>):
+  </para>
+  <programlisting language="bash">
+boot.kernel.sysctl.&quot;net.ipv6.conf.eth0.disable_ipv6&quot; = true;
+</programlisting>
+  <para>
+    As with IPv4 networking interfaces are automatically configured via
+    DHCPv6. You can configure an interface manually:
+  </para>
+  <programlisting language="bash">
+networking.interfaces.eth0.ipv6.addresses = [ {
+  address = &quot;fe00:aa:bb:cc::2&quot;;
+  prefixLength = 64;
+} ];
+</programlisting>
+  <para>
+    For configuring a gateway, optionally with explicitly specified
+    interface:
+  </para>
+  <programlisting language="bash">
+networking.defaultGateway6 = {
+  address = &quot;fe00::1&quot;;
+  interface = &quot;enp0s3&quot;;
+};
+</programlisting>
+  <para>
+    See <xref linkend="sec-ipv4" /> for similar examples and additional
+    information.
+  </para>
+</section>