[install-guide] Restored hostname directions, note, and updated screenshot

Jack Reed jjr at fedoraproject.org
Wed Jan 2 03:56:53 UTC 2013


commit 26b906ae9a3eb026b0b78954c82c9b79a93652b8
Author: Jack Reed <jreed at redhat.com>
Date:   Wed Jan 2 13:56:38 2013 +1000

    Restored hostname directions, note, and updated screenshot

 en-US/Netconfig-x86.xml                  |   15 ++++++++-------
 en-US/Netconfig_common-para-2.xml        |    2 +-
 en-US/images/netconfig/networkconfig.png |  Bin 31338 -> 34495 bytes
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/en-US/Netconfig-x86.xml b/en-US/Netconfig-x86.xml
index be7f675..695ab30 100644
--- a/en-US/Netconfig-x86.xml
+++ b/en-US/Netconfig-x86.xml
@@ -13,23 +13,24 @@
 	<xi:include href="Netconfig_common-indexterm-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Netconfig_common-indexterm-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Netconfig_common-indexterm-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<!--  end Indexterms  --> 
-	 
-	<!-- <xi:include href="Netconfig_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-	<!--  Setup prompts you to supply a host name and domain name for this computer,  --> 
+	<!--  end Indexterms  -->  
 	
 	<xi:include href="Netconfig_common-para-20.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<!--  Select Network Configuration from the Installation Summary Menu  --> 
 	
 	<xi:include href="Netconfig_common-para-21.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<!--  Detected network connections will be listed in the left-hand pane  --> 
-	
-	<!-- <xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	    Valid Hostnames  --> 
+
 	
 	<xi:include href="Netconfig_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<!--   Setting the hostname  --> 
 	
+	<xi:include href="Netconfig_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<!--  Setup prompts you to supply a host name and domain name for this computer,  -->
+	
+	<xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	    <!-- Valid Hostnames  --> 
+	
 	<xi:include href="Netconfig_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<!--  If your Fedora system is connected directly to the Internet,  --> 
 	
diff --git a/en-US/Netconfig_common-para-2.xml b/en-US/Netconfig_common-para-2.xml
index 11038de..ee472f8 100644
--- a/en-US/Netconfig_common-para-2.xml
+++ b/en-US/Netconfig_common-para-2.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	Setup prompts you to supply a host name for this computer, either as a <firstterm>fully-qualified domain name</firstterm> (FQDN) in the format <replaceable>hostname</replaceable>.<replaceable>domainname</replaceable> or as a <firstterm>short host name</firstterm> in the format <replaceable>hostname</replaceable>. Many networks have a <firstterm>Dynamic Host Configuration Protocol</firstterm> (DHCP) service that automatically supplies connected systems with a domain name. To allow the DHCP service to assign the domain name to this machine, specify the short host name only.
+      Enter a host name for this computer in the <guilabel>Hostname</guilabel> box. The hostname can be either a <firstterm>fully-qualified domain name</firstterm> (FQDN) in the format <replaceable>hostname</replaceable>.<replaceable>domainname</replaceable> or a <firstterm>short host name</firstterm> in the format <replaceable>hostname</replaceable>. Many networks have a <firstterm>Dynamic Host Configuration Protocol</firstterm> (DHCP) service that automatically supplies connected systems with a domain name. To allow the DHCP service to assign the domain name to this machine, specify the short host name only.
 </para>
 
diff --git a/en-US/images/netconfig/networkconfig.png b/en-US/images/netconfig/networkconfig.png
index a9a7e5f..3e38ec9 100644
Binary files a/en-US/images/netconfig/networkconfig.png and b/en-US/images/netconfig/networkconfig.png differ


More information about the docs-commits mailing list