commit 2e808c8144bc864d8b837cc59ffbf52dc360a1d4 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/configuration/configuration.xml

···

       21
        
        <xi:include href="../from_md/configuration/wayland.chapter.xml" />

     

       22
        
        <xi:include href="../from_md/configuration/gpu-accel.chapter.xml" />

     

       23
        
        <xi:include href="../from_md/configuration/xfce.chapter.xml" />

     

       24
       -
        <xi:include href="networking.xml" />

     

       25
        
        <xi:include href="../from_md/configuration/linux-kernel.chapter.xml" />

     

       26
        
        <xi:include href="../from_md/configuration/subversion.chapter.xml" />

     

       27
        
        <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />

···

       21
        
        <xi:include href="../from_md/configuration/wayland.chapter.xml" />

     

       22
        
        <xi:include href="../from_md/configuration/gpu-accel.chapter.xml" />

     

       23
        
        <xi:include href="../from_md/configuration/xfce.chapter.xml" />

     

       24
       +
        <xi:include href="../from_md/configuration/networking.chapter.xml" />

     

       25
        
        <xi:include href="../from_md/configuration/linux-kernel.chapter.xml" />

     

       26
        
        <xi:include href="../from_md/configuration/subversion.chapter.xml" />

     

       27
        
        <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />

+16

nixos/doc/manual/configuration/networking.chapter.md

···

       1
       +
       # Networking {#sec-networking}

     

       2
       +
       

     

       3
       +
       This section describes how to configure networking components

     

       4
       +
       on your NixOS machine.

     

       5
       +
       

     

       6
       +
       ```{=docbook}

     

       7
       +
       <xi:include href="network-manager.section.xml" />

     

       8
       +
       <xi:include href="ssh.section.xml" />

     

       9
       +
       <xi:include href="ipv4-config.section.xml" />

     

       10
       +
       <xi:include href="ipv6-config.section.xml" />

     

       11
       +
       <xi:include href="firewall.section.xml" />

     

       12
       +
       <xi:include href="wireless.section.xml" />

     

       13
       +
       <xi:include href="ad-hoc-network-config.section.xml" />

     

       14
       +
       <xi:include href="renaming-interfaces.section.xml" />

     

       15
       +
       ```

     

       16
       +
       <!-- TODO: OpenVPN, NAT -->

-20

nixos/doc/manual/configuration/networking.xml

···

       1
       -
       <chapter xmlns="http://docbook.org/ns/docbook"

     

       2
       -
                xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
       -
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       4
       -
                version="5.0"

     

       5
       -
                xml:id="sec-networking">

     

       6
       -
        <title>Networking</title>

     

       7
       -
        <para>

     

       8
       -
         This section describes how to configure networking components on your NixOS

     

       9
       -
         machine.

     

       10
       -
        </para>

     

       11
       -
        <xi:include href="../from_md/configuration/network-manager.section.xml" />

     

       12
       -
        <xi:include href="../from_md/configuration/ssh.section.xml" />

     

       13
       -
        <xi:include href="../from_md/configuration/ipv4-config.section.xml" />

     

       14
       -
        <xi:include href="../from_md/configuration/ipv6-config.section.xml" />

     

       15
       -
        <xi:include href="../from_md/configuration/firewall.section.xml" />

     

       16
       -
        <xi:include href="../from_md/configuration/wireless.section.xml" />

     

       17
       -
        <xi:include href="../from_md/configuration/ad-hoc-network-config.section.xml" />

     

       18
       -
        <xi:include href="../from_md/configuration/renaming-interfaces.section.xml" />

     

       19
       -
       <!-- TODO: OpenVPN, NAT -->

     

       20
       -
       </chapter>

+15

nixos/doc/manual/from_md/configuration/networking.chapter.xml

···

       1
       +
       <chapter xmlns="http://docbook.org/ns/docbook"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-networking">

     

       2
       +
         <title>Networking</title>

     

       3
       +
         <para>

     

       4
       +
           This section describes how to configure networking components on

     

       5
       +
           your NixOS machine.

     

       6
       +
         </para>

     

       7
       +
         <xi:include href="network-manager.section.xml" />

     

       8
       +
         <xi:include href="ssh.section.xml" />

     

       9
       +
         <xi:include href="ipv4-config.section.xml" />

     

       10
       +
         <xi:include href="ipv6-config.section.xml" />

     

       11
       +
         <xi:include href="firewall.section.xml" />

     

       12
       +
         <xi:include href="wireless.section.xml" />

     

       13
       +
         <xi:include href="ad-hoc-network-config.section.xml" />

     

       14
       +
         <xi:include href="renaming-interfaces.section.xml" />

     

       15
       +
       </chapter>