Branch 'f14' - en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml en-US/Beginning_Installation_URL-x86.xml en-US/Kickstart2.xml en-US/Revision_History.xml en-US/Steps_Hd_Install-x86.xml en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml en-US/Steps_Network_Install_x86_section_2.xml en-US/Steps_Network_Install-x86.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Sun Oct 10 23:48:03 UTC 2010
en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml | 6 ++---
en-US/Beginning_Installation_URL-x86.xml | 4 +--
en-US/Kickstart2.xml | 2 -
en-US/Revision_History.xml | 14 +++++++++++++
en-US/Steps_Hd_Install-x86.xml | 2 -
en-US/Steps_Network_Install-x86.xml | 2 -
en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml | 4 +--
en-US/Steps_Network_Install_x86_section_2.xml | 2 -
8 files changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 41ab38e672b64353933845b4698d9cf6d34052ae
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Mon Oct 11 09:48:36 2010 +1000
rm more telnet and rhel references
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
index 0b9e5a8..ae264a0 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
@@ -3,8 +3,8 @@
]>
<screen>
- <command><![CDATA[mount -t iso9660 /path/to/RHEL6.iso /mnt/point -o loop,ro]]></command>
- <command><![CDATA[cp -pr /mnt/point/images /path/images/]]></command>
- <command><![CDATA[umount /mnt/point]]></command>
+ <command>mount -t iso9660 /path/to/F&PRODVER;.iso /mnt/point -o loop,ro</command>
+ <command>cp -pr /mnt/point/images /path/images/</command>
+ <command>umount /mnt/point</command>
</screen>
diff --git a/en-US/Beginning_Installation_URL-x86.xml b/en-US/Beginning_Installation_URL-x86.xml
index 9a49609..a28e87b 100644
--- a/en-US/Beginning_Installation_URL-x86.xml
+++ b/en-US/Beginning_Installation_URL-x86.xml
@@ -26,7 +26,7 @@
<!-- Enter the name or IP address of the FTP or HTTP site from which you are installing, -->
<para>
- <filename>/mirrors/redhat/rhel-&PRODVER;/Server/i386/</filename>
+ <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os/</filename>
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-2.xml"/>
@@ -42,7 +42,7 @@
For example:
</para>
<para>
- <literal>http://install:rhel&PRODVER;pw@name.example.com/mirrors/redhat/rhel-&PRODVER;/Server/i386/</literal>
+ <literal>http://install:f&PRODVER;pw@name.example.com/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os/</literal>
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-figure-1.xml"/>
diff --git a/en-US/Kickstart2.xml b/en-US/Kickstart2.xml
index 4512ac9..302f337 100644
--- a/en-US/Kickstart2.xml
+++ b/en-US/Kickstart2.xml
@@ -2220,7 +2220,7 @@ If the <command>selinux</command> option is not present in the kickstart file, S
</secondary>
</indexterm>
<para>
- The installer can start <application>ssh</application> to provide interactivity and inspection, just like it can with <application>telnet</application>. This command controls the accounts created in the installation environment that may be remotely logged into. Each instance of this command creates a user. These users will not be created on the final system — they only exist for use while the installer is running.
+ The installer can start <application>ssh</application> to provide interactivity and inspection. This command controls the accounts created in the installation environment that may be remotely logged into. Each instance of this command creates a user. These users will not be created on the final system — they only exist for use while the installer is running.
</para>
<screen>sshpw --username=<replaceable><name></replaceable> <replaceable><password></replaceable> [--iscrypted|--plaintext] [--lock]</screen>
<itemizedlist>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 1d2173c..3ce9fe9 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -10,6 +10,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1.0-1</revnumber>
+ <date>Mon Oct 11 2010</date>
+ <author>
+ <firstname>Rüdiger</firstname>
+ <surname>Landmann</surname>
+ <email>r.landmann at redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Fix references to RHEL and Telnet BZ#640271 and BZ#640309</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1.0-0</revnumber>
<date>Thu Sep 9 2010</date>
<author>
diff --git a/en-US/Steps_Hd_Install-x86.xml b/en-US/Steps_Hd_Install-x86.xml
index f7d708d..21f845e 100644
--- a/en-US/Steps_Hd_Install-x86.xml
+++ b/en-US/Steps_Hd_Install-x86.xml
@@ -44,7 +44,7 @@
<!-- Obtain an ISO image of the -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_screen_1.xml"/>
- <!-- dd if=/dev/<dvd> of=</location/of/disk/space>/RHEL6.iso -->
+ <!-- dd if=/dev/<dvd> of=</location/of/disk/space>/F&PRODVER;.iso -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_para_4.xml"/>
<!-- where dvd refers to your DVD drive device -->
diff --git a/en-US/Steps_Network_Install-x86.xml b/en-US/Steps_Network_Install-x86.xml
index 5ec0745..a0c0dec 100644
--- a/en-US/Steps_Network_Install-x86.xml
+++ b/en-US/Steps_Network_Install-x86.xml
@@ -64,7 +64,7 @@
<!-- To copy the files from the installation DVD to a Linux machine -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_screen_1.xml"/>
- <!-- dd if=/dev/<dvd> of=</location/of/disk/space>/RHEL6.iso -->
+ <!-- dd if=/dev/<dvd> of=</location/of/disk/space>/F&PRODVER;.iso -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_para_4.xml"/>
<!-- where dvd refers to your DVD drive device -->
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml b/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
index 3286611..4399f2c 100644
--- a/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
@@ -6,10 +6,10 @@
<title>Note</title>
<para>
- The public directory used to access the installation files over FTP, NFS, or HTTP is mapped to local storage on the network server. For example, the local directory <filename>/var/www/inst/rhel&PRODVER;</filename> on the network server can be accessed as <filename>http://network.server.com/inst/rhel&PRODVER;</filename>.
+ The public directory used to access the installation files over FTP, NFS, or HTTP is mapped to local storage on the network server. For example, the local directory <filename>/var/www/inst/f&PRODVER;</filename> on the network server can be accessed as <filename>http://network.server.com/inst/f&PRODVER;</filename>.
</para>
<para>
- In the following examples, the directory on the installation staging server that will contain the installation files will be specified as <filename><replaceable>/location/of/disk/space</replaceable></filename>. The directory that will be made publicly available via FTP, NFS, or HTTP will be specified as <replaceable>/publicly/available/directory</replaceable>. For example, <filename><replaceable>/location/of/disk/space</replaceable></filename> may be a directory you create called <filename>/var/isos</filename>. <filename><replaceable>/publicly/available/directory</replaceable></filename> might be <filename>/var/www/html/rhel&PRODVER;</filename>, for an HTTP install.
+ In the following examples, the directory on the installation staging server that will contain the installation files will be specified as <filename><replaceable>/location/of/disk/space</replaceable></filename>. The directory that will be made publicly available via FTP, NFS, or HTTP will be specified as <replaceable>/publicly/available/directory</replaceable>. For example, <filename><replaceable>/location/of/disk/space</replaceable></filename> may be a directory you create called <filename>/var/isos</filename>. <filename><replaceable>/publicly/available/directory</replaceable></filename> might be <filename>/var/www/html/f&PRODVER;</filename>, for an HTTP install.
</para>
</note>
diff --git a/en-US/Steps_Network_Install_x86_section_2.xml b/en-US/Steps_Network_Install_x86_section_2.xml
index 0b98893..3ceeebb 100644
--- a/en-US/Steps_Network_Install_x86_section_2.xml
+++ b/en-US/Steps_Network_Install_x86_section_2.xml
@@ -15,7 +15,7 @@
<!-- Transfer the ISO image to the NFS exported directory. -->
<xi:include href="Steps_Network_Install_section_2-common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <!-- mv /location/of/disk/space/RHEL6.iso /publicly/available/directory/ -->
+ <!-- mv /location/of/disk/space/F&PRODVER;.iso /publicly/available/directory/ -->
</step>
<step>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-4.xml"/>
More information about the docs-commits
mailing list