diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-09-08 15:33:31 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2021-09-08 16:35:16 +0800 |
| commit | 2e808c8144bc864d8b837cc59ffbf52dc360a1d4 (patch) | |
| tree | 3262ff97c857a886c5b0e5ac5e435dd1148c1d61 /nixos/doc | |
| parent | 4c10e0ff9ddea45b344134228dd5874b9ae0bd06 (diff) | |
| download | nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar.gz nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar.bz2 nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar.lz nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar.xz nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.tar.zst nixpkgs-2e808c8144bc864d8b837cc59ffbf52dc360a1d4.zip | |
nixos: nixos/doc/manual/configuration/networking.xml to CommonMark
Diffstat (limited to 'nixos/doc')
4 files changed, 32 insertions, 21 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 6f59262eae7..58a2b840059 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -21,7 +21,7 @@ <xi:include href="../from_md/configuration/wayland.chapter.xml" /> <xi:include href="../from_md/configuration/gpu-accel.chapter.xml" /> <xi:include href="../from_md/configuration/xfce.chapter.xml" /> - <xi:include href="networking.xml" /> + <xi:include href="../from_md/configuration/networking.chapter.xml" /> <xi:include href="../from_md/configuration/linux-kernel.chapter.xml" /> <xi:include href="../from_md/configuration/subversion.chapter.xml" /> <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> diff --git a/nixos/doc/manual/configuration/networking.chapter.md b/nixos/doc/manual/configuration/networking.chapter.md new file mode 100644 index 00000000000..529dc0610bd --- /dev/null +++ b/nixos/doc/manual/configuration/networking.chapter.md @@ -0,0 +1,16 @@ +# Networking {#sec-networking} + +This section describes how to configure networking components +on your NixOS machine. + +```{=docbook} +<xi:include href="network-manager.section.xml" /> +<xi:include href="ssh.section.xml" /> +<xi:include href="ipv4-config.section.xml" /> +<xi:include href="ipv6-config.section.xml" /> +<xi:include href="firewall.section.xml" /> +<xi:include href="wireless.section.xml" /> +<xi:include href="ad-hoc-network-config.section.xml" /> +<xi:include href="renaming-interfaces.section.xml" /> +``` +<!-- TODO: OpenVPN, NAT --> diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml deleted file mode 100644 index 5dd0278569b..00000000000 --- a/nixos/doc/manual/configuration/networking.xml +++ /dev/null @@ -1,20 +0,0 @@ -<chapter 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-networking"> - <title>Networking</title> - <para> - This section describes how to configure networking components on your NixOS - machine. - </para> - <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="../from_md/configuration/ipv6-config.section.xml" /> - <xi:include href="../from_md/configuration/firewall.section.xml" /> - <xi:include href="../from_md/configuration/wireless.section.xml" /> - <xi:include href="../from_md/configuration/ad-hoc-network-config.section.xml" /> - <xi:include href="../from_md/configuration/renaming-interfaces.section.xml" /> -<!-- TODO: OpenVPN, NAT --> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/networking.chapter.xml b/nixos/doc/manual/from_md/configuration/networking.chapter.xml new file mode 100644 index 00000000000..2ed86ea3b58 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/networking.chapter.xml @@ -0,0 +1,15 @@ +<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"> + <title>Networking</title> + <para> + This section describes how to configure networking components on + your NixOS machine. + </para> + <xi:include href="network-manager.section.xml" /> + <xi:include href="ssh.section.xml" /> + <xi:include href="ipv4-config.section.xml" /> + <xi:include href="ipv6-config.section.xml" /> + <xi:include href="firewall.section.xml" /> + <xi:include href="wireless.section.xml" /> + <xi:include href="ad-hoc-network-config.section.xml" /> + <xi:include href="renaming-interfaces.section.xml" /> +</chapter> |