en-US/Installation_Guide.ent | 6 - en-US/Steps_Hd_Install-x86.xml | 3 en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml | 6 - en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml | 6 + en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml | 42 ++----------- en-US/adminoptions.xml | 52 +++++------------ en-US/vnc_Installation_Chapter.xml | 15 +--- en-US/vnc_Modes_Chapter.xml | 16 +---- en-US/vnc_Viewer_Chapter.xml | 8 -- 9 files changed, 52 insertions(+), 102 deletions(-)
New commits: commit 943eeb193619e2acb4f5e31ae89ac587fc897efe Author: Ruediger Landmann r.landmann@redhat.com Date: Fri Apr 30 21:48:53 2010 +1000
move verbatim content out of block elements
diff --git a/en-US/Steps_Hd_Install-x86.xml b/en-US/Steps_Hd_Install-x86.xml index 00d77bb..7bb3214 100644 --- a/en-US/Steps_Hd_Install-x86.xml +++ b/en-US/Steps_Hd_Install-x86.xml @@ -28,6 +28,9 @@ <listitem> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_1.xml"/> <!-- Using a set of CD-ROMs - Create CD-ROM ISO image files from each --> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml"/> + <!-- screen --> </listitem> <listitem> diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml index 39352b1..1c50cd7 100644 --- a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml +++ b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml @@ -1,13 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ - - - ]>
<para> Using a set of CD-ROMs, or a DVD — Create ISO image files from each installation CD-ROM, or from the DVD. For each CD-ROM (once for the DVD), execute the following command on a Linux system: -<screen> -<command>dd if=/dev/cdrom of=/tmp/<replaceable>file-name</replaceable>.iso</command> -</screen> </para> \ No newline at end of file diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml new file mode 100644 index 0000000..d6db5b4 --- /dev/null +++ b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ +]> + +<screen><command>dd if=/dev/cdrom of=/tmp/<replaceable>file-name</replaceable>.iso</command> +</screen> diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml b/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml index 50eee6b..a25f74b 100644 --- a/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml +++ b/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml @@ -15,28 +15,16 @@ <para> For DVD: </para> - - <para> - <screen> - <command> - mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory/</replaceable> - </command> - </screen> - </para> +<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory/</replaceable> +</command></screen> </listitem> <listitem> <para> For CDROMs: </para> - - <para> - <screen> - <command> - mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;-disk*.iso <replaceable>/publicly/available/directory/</replaceable> - </command> - </screen> - </para> +<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;-disk*.iso <replaceable>/publicly/available/directory/</replaceable> +</command></screen> </listitem> </itemizedlist> <para> @@ -66,27 +54,13 @@ <para> To export to a specific system: </para> - - <para> - <screen> - <command> - <replaceable>/publicly/available/directory</replaceable> <replaceable>client.ip.address</replaceable> - </command> - </screen> - </para> - +<screen><command><replaceable>/publicly/available/directory</replaceable> <replaceable>client.ip.address</replaceable> +</command></screen> <para> To export to all systems use an entry such as: </para> - - <para> - <screen> - <command> - <replaceable>/publicly/available/directory</replaceable> * - </command> - </screen> - </para> - +<screen><command><replaceable>/publicly/available/directory</replaceable> * +</command></screen> <para> Start the NFS daemon (on a Fedora system, use <command>/sbin/service nfs start</command>). If NFS is already running, reload the configuration file (on a Fedora system use <command>/sbin/service nfs reload</command>). </para> diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml index f8bbd10..b0444e3 100644 --- a/en-US/adminoptions.xml +++ b/en-US/adminoptions.xml @@ -18,8 +18,7 @@ If you specify more than one option, separate each of the options by a single space. For example: </para> -<screen> -<userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput> +<screen><userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput> </screen> <note> <title>Anaconda Boot Options</title> @@ -100,8 +99,7 @@ <userinput>gr</userinput> identify the Greek language and the Greek keyboard layout: </para> -<screen> -<userinput>linux lang=<replaceable>el_GR</replaceable> keymap=<replaceable>gr</replaceable></userinput> +<screen><userinput>linux lang=<replaceable>el_GR</replaceable> keymap=<replaceable>gr</replaceable></userinput> </screen> </section>
@@ -116,8 +114,7 @@ as a boot option. For example, to set the display resolution to 1024x768, enter: </para> -<screen> -<userinput>linux resolution=<replaceable>1024x768</replaceable></userinput> +<screen><userinput>linux resolution=<replaceable>1024x768</replaceable></userinput> </screen> <para> To run the installation process in @@ -126,8 +123,7 @@ </indexterm> <option>text</option> mode, enter: </para> -<screen> -<userinput>linux text</userinput> +<screen><userinput>linux text</userinput> </screen> <para> To enable support for a @@ -156,8 +152,7 @@ <para> The boot option </para> -<screen> - <userinput>linux updates</userinput> +<screen><userinput>linux updates</userinput> </screen> <para> presents you with a prompt that asks you for a floppy disk containing <application>anaconda</application> updates. You do not need to specify this option if you are performing a network installation and have already placed the updates image contents in <filename>rhupdates/</filename> on the server. @@ -254,8 +249,7 @@ system that uses the IP address <systemitem class="ipaddress">192.168.1.10</systemitem>: </para> -<screen> -<userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput> +<screen><userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput> </screen> <!-- <note> <title>Configuring the Installed System</title> @@ -316,8 +310,7 @@ To enable remote graphical access to the installation system, enter two options at the prompt: </para> -<screen> -<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput> +<screen><userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput> </screen> <para> The <option>vnc</option> option enables the VNC service. The @@ -375,8 +368,7 @@ Press <enter> for a shell</screen> <application>vncviewer</application> as a listener. In a terminal window, enter the command: </para> -<screen> - <userinput>vncviewer -listen</userinput> +<screen><userinput>vncviewer -listen</userinput> </screen> <note> <title>Firewall Reconfiguration Required</title> @@ -416,8 +408,7 @@ Press <enter> for a shell</screen> <prompt>boot:</prompt> prompt: </para> -<screen> -<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput> +<screen><userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput> </screen> </section>
@@ -434,8 +425,7 @@ Press <enter> for a shell</screen> prompt: </para> <!--SE: The "text" option is necessary to stop the installer switching to graphical mode and losing the telnet interface. This is expected behavior. --> -<screen> -<userinput>linux text telnet</userinput> +<screen><userinput>linux text telnet</userinput> </screen> <para> You may then connect to the installation system with the @@ -443,8 +433,7 @@ Press <enter> for a shell</screen> command requires the name or IP address of the installation system: </para> -<screen> -<userinput>telnet computer.mydomain.com</userinput> +<screen><userinput>telnet computer.mydomain.com</userinput> </screen> <warning> <title>Telnet Access Requires No Password</title> @@ -485,8 +474,7 @@ Press <enter> for a shell</screen> <prompt>boot:</prompt> prompt: </para> -<screen> -<userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput> +<screen><userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput> </screen> <section id="sn-remote-logging-logserver"> <title>Configuring a Log Server</title> @@ -517,16 +505,14 @@ Press <enter> for a shell</screen> <filename>/etc/rsyslog.conf</filename>. You must use <systemitem class="username">root</systemitem> privileges to edit the file <filename>/etc/rsyslog.conf</filename>. Uncomment the - following lines by removing the hash preceding them: - <screen><computeroutput>$ModLoad imudp.so</computeroutput> - <computeroutput>$UDPServerRun 514</computeroutput></screen> - </para> + following lines by removing the hash preceding them:</para> +<screen><computeroutput>$ModLoad imudp.so</computeroutput> +<computeroutput>$UDPServerRun 514</computeroutput></screen> <para> Restart the <command>rsyslog</command> service to apply the change: </para> -<screen> -<userinput>su -c '/sbin/service rsyslog restart'</userinput> +<screen><userinput>su -c '/sbin/service rsyslog restart'</userinput> </screen> <para> Enter the <systemitem class="username">root</systemitem> @@ -597,8 +583,7 @@ Press <enter> for a shell</screen> the <option>ks</option> option to specify the name and location of the file: </para> -<screen> - <userinput>linux ks=<replaceable>location/kickstart-file.cfg</replaceable></userinput> +<screen><userinput>linux ks=<replaceable>location/kickstart-file.cfg</replaceable></userinput> </screen> <para> You may use Kickstart files that are held on either removable @@ -655,8 +640,7 @@ Press <enter> for a shell</screen> the application <wordasword>http://server.mydomain.com/kickstart.cgi</wordasword>: </para> -<screen> -<userinput>linux ks=http://server.mydomain.com/kickstart.cgi kssendmac</userinput> +<screen><userinput>linux ks=http://server.mydomain.com/kickstart.cgi kssendmac</userinput> </screen> </section> <section id="sn-bootoptions-hardware"> diff --git a/en-US/vnc_Installation_Chapter.xml b/en-US/vnc_Installation_Chapter.xml index b825812..e8f3943 100644 --- a/en-US/vnc_Installation_Chapter.xml +++ b/en-US/vnc_Installation_Chapter.xml @@ -87,11 +87,8 @@ prompt: </para>
- <para> - <screen> -boot: <userinput>linux vnc</userinput> - </screen> - </para> +<screen>boot: <userinput>linux vnc</userinput></screen> + </listitem>
<listitem> @@ -120,11 +117,9 @@ boot: <userinput>linux vnc</userinput> at the prompt: </para>
- <para> - <screen> -boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput> - </screen> - </para> + +<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen> + </listitem> </orderedlist> </listitem> diff --git a/en-US/vnc_Modes_Chapter.xml b/en-US/vnc_Modes_Chapter.xml index 38fd124..988aec0 100644 --- a/en-US/vnc_Modes_Chapter.xml +++ b/en-US/vnc_Modes_Chapter.xml @@ -44,11 +44,9 @@ format: </para>
- <para> - <screen> -Running anaconda <replaceable>VERSION</replaceable>, the <replaceable>PRODUCT</replaceable> system installer - please wait... - </screen> - </para> + +<screen>Running anaconda <replaceable>VERSION</replaceable>, the <replaceable>PRODUCT</replaceable> system installer - please wait...</screen> +
<para> Anaconda will also tell you the IP address and @@ -115,11 +113,9 @@ Running anaconda <replaceable>VERSION</replaceable>, the <replaceable>PRODUCT</r <command>vncconnect</command> boot parameter: </para>
- <para> - <screen> -boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput> - </screen> - </para> + +<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen> +
<para> Replace HOST with your VNC viewer's IP address or diff --git a/en-US/vnc_Viewer_Chapter.xml b/en-US/vnc_Viewer_Chapter.xml index fc06b91..92553dd 100644 --- a/en-US/vnc_Viewer_Chapter.xml +++ b/en-US/vnc_Viewer_Chapter.xml @@ -34,11 +34,9 @@ <para> VNC clients are available in the repositories of most Linux distributions. Use your package manager to search for a client for your chosen distribution. For example, on Fedora, install the <!-- RHEL vnc --><package>tigervnc</package> package: </para> - <para> - <screen> -# <userinput>yum install tigervnc</userinput><!-- RHEL vnc --> - </screen> - </para> + +<screen># <userinput>yum install tigervnc</userinput><!-- RHEL vnc --></screen> + </listitem> <listitem> <para>
commit 819a16a92f9dd30893cd30a67f47cae791fb8785 Author: Ruediger Landmann r.landmann@redhat.com Date: Fri Apr 30 21:16:06 2010 +1000
update ent file
diff --git a/en-US/Installation_Guide.ent b/en-US/Installation_Guide.ent index 91c07da..0dbe2dc 100644 --- a/en-US/Installation_Guide.ent +++ b/en-US/Installation_Guide.ent @@ -1,6 +1,6 @@ <!ENTITY PRODUCT "Fedora Documentation"> -<!ENTITY PRODVER "12"> -<!ENTITY PREVVER "11"> +<!ENTITY PRODVER "13"> +<!ENTITY PREVVER "12"> <!ENTITY BOOKID "install-guide"> -<!ENTITY YEAR "2009"> +<!ENTITY YEAR "2010"> <!ENTITY HOLDER "Red Hat, Inc. and others">
docs-commits@lists.fedoraproject.org