[install-guide/F21-rewrite] Bringing links to other guides into line

pbokoc pbokoc at fedoraproject.org
Mon Sep 15 22:32:29 UTC 2014


commit aa6f7ee552c9e37fa49b4146b2523ad407fd5852
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Tue Sep 16 00:19:31 2014 +0200

    Bringing links to other guides into line

 en-US/Introduction.xml                |   16 ++++++++--------
 en-US/Network_based_Installations.xml |    4 ++--
 en-US/Troubleshooting.xml             |    8 ++++----
 en-US/VNC_Installations.xml           |    2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index 57b239e..928d582 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -18,14 +18,14 @@
         <section id="sect-introduction-about">
             <title>About Fedora</title>
             <para>
-                To find out more about Fedora, visit the <ulink url="http://fedoraproject.org/">Fedora Project Website</ulink>. Other documentation describing additional topics related to Fedora is available at the <ulink url="http://docs.fedoraproject.org/">Fedora Documentation</ulink> website. Also see the <ulink url="https://fedoraproject.org/wiki/Fedora_Project_Wiki">Fedora Project Wiki</ulink>.
+                To find out more about &PRODUCT;, visit the <ulink url="http://fedoraproject.org/">&PRODUCT; Project Website</ulink>. Other documentation describing additional topics related to &PRODUCT; is available at <ulink url="http://docs.fedoraproject.org/">&PRODUCT; Documentation</ulink>. Also see the <ulink url="https://fedoraproject.org/wiki/Fedora_Project_Wiki">&PRODUCT; Project Wiki</ulink>.
             </para>
         </section>
 
         <section id="sect-introduction-additional-help">
             <title>Getting Additional Help</title>
             <para>
-                If you encounter any problems which are not described in documentation, you might get help from members of the community - developers, users, and others. There are many ways to get help - the Ask Fedora website, mailing lists, forums, or IRC; for a summary of available resources, see the <ulink url="https://fedoraproject.org/wiki/Communicating_and_getting_help">Communicating and Getting Help</ulink> page on the Fedora wiki.
+                If you encounter any problems which are not described in documentation, you might get help from members of the community - developers, users, and others. There are many ways to get help: the Ask Fedora website, mailing lists, forums, or IRC. For a summary of available resources, see the <ulink url="https://fedoraproject.org/wiki/Communicating_and_getting_help">Communicating and Getting Help</ulink> page on the &PRODUCT; wiki.
             </para>
         </section>
 
@@ -42,28 +42,28 @@
             <itemizedlist>
                 <listitem>
                     <para>
-                        Understand how to locate the Fedora distribution online
+                        Understand how to locate the &PRODUCT; distribution online
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        Create configuration data that allows a computer to boot Fedora
+                        Create configuration data that allows a computer to boot &PRODUCT;
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        Understand and interact with the Fedora installation program
+                        Understand and interact with the &PRODUCT; installation program
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        Complete basic post-installation configuration of a Fedora system
+                        Complete basic post-installation configuration of a &PRODUCT; system
                     </para>
                 </listitem>
             </itemizedlist>
             <note>
                 <para>
-                    This guide does not cover <emphasis>use</emphasis> of Fedora. To learn how to use an installed Fedora system, see the other manuals available at the <ulink url="http://docs.fedoraproject.org/">Fedora Documentation</ulink> website.
+                    This guide does not cover <emphasis>use</emphasis> of &PRODUCT;. To learn how to use an installed &PRODUCT; system, see the other manuals available at <ulink url="http://docs.fedoraproject.org/">Fedora Documentation</ulink>.
                 </para>
             </note>
         </section>
@@ -71,7 +71,7 @@
         <section id="sect-introduction-target-audience">
             <title>Target Audience</title>
             <para>
-                This guide is intended for Fedora users of all levels of experience. However, it describes the installation process and its many options in far greater detail than most users are likely to require. You do not need to read and understand this entire document to install Fedora on a computer. This document is most likely to help experienced users perform advanced and unusual installations.
+                This guide is intended for &PRODUCT; users of all levels of experience. However, it describes the installation process and its many options in far greater detail than most users are likely to require. You do not need to read and understand this entire document to install &PRODUCT; on a computer. This document is most likely to help experienced users perform advanced and unusual installations.
             </para>
         </section>
 
diff --git a/en-US/Network_based_Installations.xml b/en-US/Network_based_Installations.xml
index da789f0..f4dc714 100644
--- a/en-US/Network_based_Installations.xml
+++ b/en-US/Network_based_Installations.xml
@@ -24,7 +24,7 @@
       <section id="pxe-overview">
         <title>PXE Installation Overview</title>
       <para>
-        Pre-Execution Environment, or PXE, is a techonology that allows computers to boot directly from resources provided over the network.  Installing Fedora over the network means you don't have to create media, and you can install to multiple computers or virtual machine simultaneously.  The process involves a number of components and features working together to provide the resources required.
+        Preboot Execution Environment, or PXE, is a techonology that allows computers to boot directly from resources provided over the network.  Installing Fedora over the network means you don't have to create media, and you can install to multiple computers or virtual machine simultaneously.  The process involves a number of components and features working together to provide the resources required.
       </para>
       <formalpara>
         <title>PXE-capable computer</title>
@@ -305,7 +305,7 @@ menuentry 'Rescue installed system'  --class fedora --class gnu-linux --class gn
               The examples in this section use the public Fedora mirrors as the package source.  For faster installations, installing to many systems, or more isolated environments, you may wish to maintain a local repository.
             </para>
             <para>
-              Fedora Infrastructure maintains instructions for a configuring a local mirror at <ulink url="https://fedoraproject.org/wiki/Infrastructure/Mirroring" />.  The preferred method for providing repositories is via HTTP, and you can refer to the Fedora <citetitle>System Adminsitrators Guide</citetitle> for Fedora &PRODVER; to configure <systemitem class="daemon">httpd</systemitem>.
+              Fedora Infrastructure maintains instructions for a configuring a local mirror at <ulink url="https://fedoraproject.org/wiki/Infrastructure/Mirroring" />.  The preferred method for providing repositories is via HTTP, and you can refer to the <citetitle>Fedora System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">Fedora Documentation</ulink>, to configure <systemitem class="daemon">httpd</systemitem>.
             </para>
           </section>
 
diff --git a/en-US/Troubleshooting.xml b/en-US/Troubleshooting.xml
index 21531c7..eb41d2e 100644
--- a/en-US/Troubleshooting.xml
+++ b/en-US/Troubleshooting.xml
@@ -585,7 +585,7 @@ GRUB_CMDLINE_LINUX="rd.lvm.lv=rhel/root rd.md=0 rd.dm=0 vconsole.keymap=us $([ -
                 After you finish this procedure, you can reboot your computer. &PRODUCT; will not use the graphical boot sequence any more. If you wish to enable graphical boot, follow the same procedure, add the <literal>rhgb</literal> option to the <literal>GRUB_CMDLINE_LINUX</literal> line in the <filename>/etc/default/grub</filename> file and refresh the boot loader configuration again using the <command>grub2-mkconfig</command> command.
             </para>
             <para>
-                See the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at the <ulink url="http://docs.fedoraproject.org">Fedora Documentation website</ulink>, for more information about working with the <application>GRUB2</application> boot loader.
+                See the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation</ulink>, for more information about working with the <application>GRUB2</application> boot loader.
             </para>
         </section>
 
@@ -620,7 +620,7 @@ GRUB_CMDLINE_LINUX="rd.lvm.lv=rhel/root rd.md=0 rd.dm=0 vconsole.keymap=us $([ -
 <prompt>#</prompt> <command>systemctl set-default multi-user.target</command>
             </screen>
             <para>
-                For more information about targets in <application>systemd</application>, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at the <ulink url="http://docs.fedoraproject.org">Fedora Documentation website</ulink>.
+                For more information about targets in <application>systemd</application>, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation</ulink>.
             </para>
         </section>
 
@@ -677,7 +677,7 @@ tmpfs                                       1.8G  2.6M  1.8G   1% /tmp
                     Some hardware configurations have a part of the system's RAM reserved and unavailable to the main system. Notably, laptop computers with integrated graphics cards will reserve some memory for the GPU. For example, a laptop with 4&nbsp;GB of RAM and an integrated Intel graphics card will show only roughly 3.7&nbsp;GB of available memory, even with a 64-bit system.
                 </para>
                 <para>
-                    Additionally, the <application>kdump</application> crash kernel dumping mechanism reserves some memory for the secondary kernel used in case of the primary kernel crashing. This reserved memory will also not be displayed as available when using the <command>free</command> command. For details about <application>kdump</application> and its memory requirements, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at the <ulink url="http://docs.fedoraproject.org">Fedora Documentation website</ulink>.
+                    Additionally, the <application>kdump</application> crash kernel dumping mechanism reserves some memory for the secondary kernel used in case of the primary kernel crashing. This reserved memory will also not be displayed as available when using the <command>free</command> command. For details about <application>kdump</application> and its memory requirements, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation</ulink>.
                 </para>
             </note>
             <para>
@@ -744,7 +744,7 @@ GRUB_CMDLINE_LINUX="rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 rd.lvm.l
 GRUB_DISABLE_RECOVERY="true"
             </programlisting>
             <para>
-                See the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at the <ulink url="http://docs.fedoraproject.org">Fedora Documentation website</ulink>, for more information about working with the <application>GRUB2</application> boot loader.
+                See the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation</ulink>, for more information about working with the <application>GRUB2</application> boot loader.
             </para>
         </section>
 
diff --git a/en-US/VNC_Installations.xml b/en-US/VNC_Installations.xml
index 75adc01..7178b9f 100644
--- a/en-US/VNC_Installations.xml
+++ b/en-US/VNC_Installations.xml
@@ -194,7 +194,7 @@
         <section id="sect-vnc-installations-connect-mode">
             <title>Installing in VNC Connect Mode</title>
             <para>
-                VNC connect mode is when the system being installed initiates a connection to the VNC viewer running on a remote system. Before you start, make sure the remote system is configured to accept incoming connection on the port you want to use for VNC. The exact way to make sure the connection will not be blocked depends on your network and on your workstation's configuration. Information about configuring the firewall in &PRODUCT; is available in the <citetitle>&PRODUCT; Security&nbsp;Guide</citetitle>, available at the <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation website</ulink>.
+                VNC connect mode is when the system being installed initiates a connection to the VNC viewer running on a remote system. Before you start, make sure the remote system is configured to accept incoming connection on the port you want to use for VNC. The exact way to make sure the connection will not be blocked depends on your network and on your workstation's configuration. Information about configuring the firewall in &PRODUCT; is available in the <citetitle>&PRODUCT; Security&nbsp;Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org">&PRODUCT; Documentation</ulink>.
             </para>
             <procedure id="proc-vnc-installations-connect-mode">
                 <title>Starting VNC in Connect Mode</title>


More information about the docs-commits mailing list