commit bca33147239ff2fbf2d5fc1529b0a1e9e795ff56 Merge: 616443c 444cded Author: Jack Reed jreed@redhat.com Date: Wed Mar 28 11:06:52 2012 +1000
resolving merge problems
...ginning_Installation_Network_x86_ppc-para-3.xml | 3 +- en-US/Boot-x86.xml | 14 ++++--- ...hical_Installation_x86-Installation-methods.xml | 24 ++---------- en-US/Installation_Method-x86.xml | 2 +- en-US/Iseries_Rescuemode.xml | 2 +- en-US/Kickstart2.xml | 18 --------- en-US/Making_Minimal_Boot_Media.xml | 2 +- en-US/Netboot_TFTP.xml | 14 ++++-- en-US/Netboot_syslinux.xml | 40 ++++++++++++++++++++ en-US/adminoptions.xml | 11 +++-- en-US/new-users.xml | 9 ++-- en-US/pxe-server-para-1.xml | 2 +- en-US/pxe-server.xml | 4 ++ 13 files changed, 82 insertions(+), 63 deletions(-) ---
docs-commits@lists.fedoraproject.org