[install-guide] Further updates to 'Installing from additional repositories' section
Jack Reed
jjr at fedoraproject.org
Fri May 17 01:02:12 UTC 2013
commit cc5591c4e46c52eba60eb99decf2194388451a69
Author: Jack Reed <jreed at redhat.com>
Date: Fri May 17 11:02:05 2013 +1000
Further updates to 'Installing from additional repositories' section
...ackage_Selection_Repositories-common-note-2.xml | 2 +-
...ackage_Selection_Repositories-common-para-3.xml | 2 +-
...ackage_Selection_Repositories-common-para-6.xml | 2 +-
...ackage_Selection_Repositories-common-para-7.xml | 2 +-
...ackage_Selection_Repositories-common-para-8.xml | 2 +-
en-US/Package_Selection_Repositories-x86.xml | 16 +++++++---------
6 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/en-US/Package_Selection_Repositories-common-note-2.xml b/en-US/Package_Selection_Repositories-common-note-2.xml
index 2050e2b..6fd9b65 100644
--- a/en-US/Package_Selection_Repositories-common-note-2.xml
+++ b/en-US/Package_Selection_Repositories-common-note-2.xml
@@ -7,6 +7,6 @@
<note>
<title>Network Access Required</title>
<para>
- If you change the repository information during a non-network installation, such as from a Fedora DVD, the installer prompts you for network configuration information.
+ If you add repositories during a non-network installation, such as from a Fedora DVD, you will need to configure a network connection via the Installation Summary Menu before the installation can proceed (refer to <xref linkend="sn-Netconfig-x86" />).
</para>
</note>
\ No newline at end of file
diff --git a/en-US/Package_Selection_Repositories-common-para-3.xml b/en-US/Package_Selection_Repositories-common-para-3.xml
index c5540f8..632a724 100644
--- a/en-US/Package_Selection_Repositories-common-para-3.xml
+++ b/en-US/Package_Selection_Repositories-common-para-3.xml
@@ -5,5 +5,5 @@
]>
<para>
- To include software from extra <firstterm>repositories</firstterm>, select <guilabel>Add additional software repositories</guilabel> and provide the location of the repository.
+ To include software from extra repositories, click the <guibutton>+</guibutton> button in the <guilabel>Additional repositories</guilabel> area to add a repository and provide a name and URL for its location.
</para>
diff --git a/en-US/Package_Selection_Repositories-common-para-6.xml b/en-US/Package_Selection_Repositories-common-para-6.xml
index 0d1a5cc..f58224a 100644
--- a/en-US/Package_Selection_Repositories-common-para-6.xml
+++ b/en-US/Package_Selection_Repositories-common-para-6.xml
@@ -5,5 +5,5 @@
]>
<para>
- If you select <guilabel>Add additional software repositories</guilabel>, the <guilabel>Edit repository</guilabel> dialog appears. Provide a <guilabel>Repository name</guilabel> and the <guilabel>Repository URL</guilabel> for its location.
+ Optionally, provide a URL, username, and password to connect to a proxy server.
</para>
diff --git a/en-US/Package_Selection_Repositories-common-para-7.xml b/en-US/Package_Selection_Repositories-common-para-7.xml
index b528439..6744e62 100644
--- a/en-US/Package_Selection_Repositories-common-para-7.xml
+++ b/en-US/Package_Selection_Repositories-common-para-7.xml
@@ -5,5 +5,5 @@
]>
<para>
- Once you have located a mirror, to determine the URL to use, find the directory on the mirror that <emphasis>contains</emphasis> a directory named <filename class="directory">repodata</filename>.
+ To determine the URL to use, find the directory on the mirror you are using that <emphasis>contains</emphasis> a directory named <filename class="directory">repodata</filename>.
</para>
diff --git a/en-US/Package_Selection_Repositories-common-para-8.xml b/en-US/Package_Selection_Repositories-common-para-8.xml
index aecf016..7e42ffb 100644
--- a/en-US/Package_Selection_Repositories-common-para-8.xml
+++ b/en-US/Package_Selection_Repositories-common-para-8.xml
@@ -5,5 +5,5 @@
]>
<para>
- Once you provide information for an additional repository, the installer reads the package metadata over the network. Software that is specially marked is then included in the package group selection system.
+ Once you provide information for an additional repository, the installer reads the package metadata over the network. Software that is specially marked is then included in the package listings in the <guilabel>Software Selection</guilabel> section of the Installation Summary Menu (refer to <xref linkend="s1-pkgselection-x86" />).
</para>
diff --git a/en-US/Package_Selection_Repositories-x86.xml b/en-US/Package_Selection_Repositories-x86.xml
index 580feee..39cffce 100644
--- a/en-US/Package_Selection_Repositories-x86.xml
+++ b/en-US/Package_Selection_Repositories-x86.xml
@@ -37,12 +37,6 @@
<xi:include href="Package_Selection_Repositories-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- To include software from extra repositories, select Add... -->
- <xi:include href="Package_Selection_Repositories-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- To edit an existing software repository location, select the repository in the list and then select -->
-
- <xi:include href="Package_Selection_Repositories-common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- If you change the repository information during a non-network installation -->
-
<!-- xi:include href="Package_Selection_Repositories-common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<!-- If you change the repository information during a non-network installation, such as from a Red Hat -->
@@ -62,17 +56,21 @@
For details of how to use <application>NetworkManager</application>, refer to <xref linkend="sn-Netconfig-x86"/>
</para> -->
- <xi:include href="Package_Selection_Repositories-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- If you select Add additional software repositories, the Edit repository dialog -->
<xi:include href="Package_Selection_Repositories-common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- To find a Fedora software mirror near you, refer to -->
<xi:include href="Package_Selection_Repositories-common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!--Once you have located a mirror, to determine the URL to use, find the directory on the mirror that -->
+ <!--To determine the URL to use, find the directory on the mirror you -->
+
+ <xi:include href="Package_Selection_Repositories-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Optionally, provide a URL, username, and password to connect to a proxy server. -->
<xi:include href="Package_Selection_Repositories-common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Once you provide information for an additional repository, the installer reads the package metadata -->
+
+ <xi:include href="Package_Selection_Repositories-common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If you change the repository information during a non-network installation -->
</section>
More information about the docs-commits
mailing list