[install-guide: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/install-guide

[Pete Travis]

commit 17248a798acc9f91d4f300286d16b4198f5f3637
Merge: c6dc0dd 4d2327b
Author: Pete Travis <immanetize at fedoraproject.org>
Date:   Thu Dec 12 00:30:48 2013 -0700

    Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/install-guide

 en-US/Netconfig_common-para-17.xml            |    2 +-
 en-US/X86_Uninstall-Linux-expand.xml          |    2 +-
 en-US/X86_Uninstall-Windows-extend-note-1.xml |    2 +-
 en-US/pxe-server.xml                          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---