X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=README;h=f71f64306ed774aeadfba8b42c9a97ee2a2bcdea;hb=175cf089388948672b5b4b6f9a8cf5a96a7015f2;hp=72669bb4658496a349cd4a30f66dcf280e2cd3d8;hpb=efcfb463ceda4de1d9953da31a2c0737471e5cf8;p=automated-distro-installer

diff --git a/README b/README
index 72669bb..f71f643 100644
--- a/README
+++ b/README
@@ -55,8 +55,8 @@ fai-redep # Deploy fai configuration to host "faiserver"
 faiserver-revm # using pxe & preseed, create a vm which is a fai server
 faiserver-uninstall # uninstall fai-server
 faiserver-setup # install fai-server on the current machine
-myfai-chboot # setup fai tftp and nfs. useful with pxe-kexec
-pxe-server # disable/enable pxe dhcp, tfp, and nfs
+myfai-chboot # setup fai tftp and nfs. useful for doing pxe-kexec
+pxe-server # disable/enable pxe dhcp, tfp, and nfs. calls myfai-chboot
 wrt-setup-remote  # setup my router in general: dhcp, dns, etc.
 
 
@@ -86,6 +86,6 @@ fresize # resize swap or boot partitions in a host
 
 License stuff:
 The license for the project is GPLv2 or later, mostly because fai is and
-I periodically rebase off their example config, which contains small
+I periodically merge the upstream example config, which contains small
 scripts. Also, there is a modified encrypt.upstream, which is from the
 cryptsetup package in arch, which is under the same license.