diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
commit | aadaa913792b0fdeb68b02425e4f03d2f8286a1f (patch) | |
tree | ea582b078a00e6ba27e2c887a9df5a792c37fb0e /nixos/doc/manual/installation/installing.xml | |
parent | 2362891dc815160e343e52458f25db22508ac487 (diff) | |
parent | e7d3166656af0d98da9f59c78e2213cec842d743 (diff) | |
download | nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.gz nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.bz2 nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.lz nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.xz nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.zst nixlib-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix
Diffstat (limited to 'nixos/doc/manual/installation/installing.xml')
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 4a0b3fee7c18..3e53062c3e84 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -270,5 +270,6 @@ $ reboot</screen> <xi:include href="installing-uefi.xml" /> <xi:include href="installing-usb.xml" /> +<xi:include href="installing-pxe.xml" /> </chapter> |