diff options
Diffstat (limited to 'nixos/doc/manual/from_md')
7 files changed, 16 insertions, 17 deletions
diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml index 0424642b978..035ee3122e1 100644 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -1,9 +1,8 @@ <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ad-hoc-network-config"> <title>Ad-Hoc Configuration</title> <para> - You can use - <link xlink:href="options.html#opt-networking.localCommands"><literal>networking.localCommands</literal></link> - to specify shell commands to be run at the end of + You can use <xref linkend="opt-networking.localCommands" /> to + specify shell commands to be run at the end of <literal>network-setup.service</literal>. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml index ebb121f75ff..24c19bb1c66 100644 --- a/nixos/doc/manual/from_md/configuration/firewall.section.xml +++ b/nixos/doc/manual/from_md/configuration/firewall.section.xml @@ -21,7 +21,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; daemon is enabled (<literal>services.openssh.enable = true</literal>). UDP ports can be opened through - <link xlink:href="options.html#opt-networking.firewall.allowedUDPPorts"><literal>networking.firewall.allowedUDPPorts</literal></link>. + <xref linkend="opt-networking.firewall.allowedUDPPorts" />. </para> <para> To open ranges of TCP ports: @@ -34,6 +34,6 @@ networking.firewall.allowedTCPPortRanges = [ </programlisting> <para> Similarly, UDP port ranges can be opened through - <link xlink:href="options.html#opt-networking.firewall.allowedUDPPortRanges"><literal>networking.firewall.allowedUDPPortRanges</literal></link>. + <xref linkend="opt-networking.firewall.allowedUDPPortRanges" />. </para> </section> diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml index 06a70b65cfb..047ba2165f0 100644 --- a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml @@ -30,7 +30,7 @@ networking.nameservers = [ "8.8.8.8" ]; </note> <para> The host name is set using - <link xlink:href="options.html#opt-networking.hostName"><literal>networking.hostName</literal></link>: + <xref linkend="opt-networking.hostName" />: </para> <programlisting language="bash"> networking.hostName = "cartman"; diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml index ac3c2cd4b21..137c3d772a8 100644 --- a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml @@ -5,10 +5,10 @@ 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.<name>.tempAddress</literal></link>. - You can disable IPv6 support globally 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: </para> <programlisting language="bash"> networking.enableIPv6 = false; diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml index fd3f26ab621..8f0d6d680ae 100644 --- a/nixos/doc/manual/from_md/configuration/network-manager.section.xml +++ b/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -25,9 +25,9 @@ users.users.alice.extraGroups = [ "networkmanager" ]; environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by enabling - <link xlink:href="options.html#opt-programs.nm-applet.enable"><literal>programs.nm-applet.enable</literal></link>, - the graphical applet will be installed and will launch automatically - when the graphical session is started. + <xref linkend="opt-programs.nm-applet.enable" />, the graphical + applet will be installed and will launch automatically when the + graphical session is started. </para> <note> <para> diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml index 80c162ca85e..1c32e30b3f8 100644 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -18,8 +18,8 @@ change</link>. If this is undesirable, for example if you have a single ethernet card, you can revert to the traditional scheme by setting - <link xlink:href="options.html#opt-networking.usePredictableInterfaceNames"><literal>networking.usePredictableInterfaceNames</literal></link> - to <literal>false</literal>. + <xref linkend="opt-networking.usePredictableInterfaceNames" /> to + <literal>false</literal>. </para> <section xml:id="sec-custom-ifnames"> <title>Assigning custom names</title> diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml index 46046064535..037418d8ea4 100644 --- a/nixos/doc/manual/from_md/configuration/ssh.section.xml +++ b/nixos/doc/manual/from_md/configuration/ssh.section.xml @@ -9,8 +9,8 @@ services.openssh.enable = true; <para> By default, root logins using a password are disallowed. They can be disabled entirely by setting - <link xlink:href="options.html#opt-services.openssh.permitRootLogin"><literal>services.openssh.permitRootLogin</literal></link> - to <literal>"no"</literal>. + <xref linkend="opt-services.openssh.permitRootLogin" /> to + <literal>"no"</literal>. </para> <para> You can declaratively specify authorised RSA/DSA public keys for a |