[install-guide] Restructured layout and XML for Installation Source section
Jack Reed
jjr at fedoraproject.org
Wed Jan 2 05:10:38 UTC 2013
commit 141d548ee9043285f2414afff9539e61061044c1
Author: Jack Reed <jreed at redhat.com>
Date: Wed Jan 2 15:10:20 2013 +1000
Restructured layout and XML for Installation Source section
en-US/Installation_Source-common-para-1.xml | 11 +++
en-US/Installation_Source-common-para-2.xml | 11 +++
en-US/Installation_Source-common-para-3.xml | 9 ++
en-US/Installation_Source-common-para-4.xml | 8 ++
en-US/Installation_Source-common-variable-list.xml | 12 +++
.../Installation_Source-common-varlistentry-1.xml | 13 +++
.../Installation_Source-common-varlistentry-2.xml | 13 +++
.../Installation_Source-common-varlistentry-3.xml | 55 ++++++++++++
en-US/Installation_Source-x86.xml | 93 +++----------------
.../installationsource/installationsource.png | Bin 28908 -> 30754 bytes
10 files changed, 147 insertions(+), 78 deletions(-)
---
diff --git a/en-US/Installation_Source-common-para-1.xml b/en-US/Installation_Source-common-para-1.xml
new file mode 100644
index 0000000..f4d3815
--- /dev/null
+++ b/en-US/Installation_Source-common-para-1.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Select <guilabel>Installation Source</guilabel> from the Installation Summary Menu.
+</para>
+
+
+
diff --git a/en-US/Installation_Source-common-para-2.xml b/en-US/Installation_Source-common-para-2.xml
new file mode 100644
index 0000000..e544656
--- /dev/null
+++ b/en-US/Installation_Source-common-para-2.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ In this section you can specify the location you would like to install Fedora from. Choose between locally available installation media (such as a DVD or an ISO file) or a network location.
+</para>
+
+
+
diff --git a/en-US/Installation_Source-common-para-3.xml b/en-US/Installation_Source-common-para-3.xml
new file mode 100644
index 0000000..592426f
--- /dev/null
+++ b/en-US/Installation_Source-common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Select one of the following options:
+</para>
+
diff --git a/en-US/Installation_Source-common-para-4.xml b/en-US/Installation_Source-common-para-4.xml
new file mode 100644
index 0000000..4bd6532
--- /dev/null
+++ b/en-US/Installation_Source-common-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Once you have selected your installation source, click <guibutton>Done</guibutton> to return to the Installation Summary Menu.
+</para>
diff --git a/en-US/Installation_Source-common-variable-list.xml b/en-US/Installation_Source-common-variable-list.xml
new file mode 100644
index 0000000..9acbd8d
--- /dev/null
+++ b/en-US/Installation_Source-common-variable-list.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<variablelist>
+<xi:include href="Installation_Source-common-varlistentry-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Auto-detected install media --> <xi:include href="Installation_Source-common-varlistentry-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- ISO file --> <xi:include href="Installation_Source-common-varlistentry-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- On the network -->
+</variablelist>
+
diff --git a/en-US/Installation_Source-common-varlistentry-1.xml b/en-US/Installation_Source-common-varlistentry-1.xml
new file mode 100644
index 0000000..18dfed1
--- /dev/null
+++ b/en-US/Installation_Source-common-varlistentry-1.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<varlistentry>
+ <term>Auto-detected install media</term>
+ <listitem>
+ <para>
+ If you initiated the installation using locally available media, the installer will detect it and display it graphically under this option. Select the media to use it as the installation source, and click <guibutton>Verify</guibutton> to check that the file is suitable for installation.
+ </para>
+ </listitem>
+</varlistentry>
diff --git a/en-US/Installation_Source-common-varlistentry-2.xml b/en-US/Installation_Source-common-varlistentry-2.xml
new file mode 100644
index 0000000..bf94852
--- /dev/null
+++ b/en-US/Installation_Source-common-varlistentry-2.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<varlistentry>
+ <term>ISO file</term>
+ <listitem>
+ <para>
+ If installation media has not been detected automatically or you want to use a different file as the installation media, specify a locally-stored ISO file. Select this option and browse to the file's location on your system. Click <guibutton>Verify</guibutton> to check that the file is suitable for installation.
+ </para>
+ </listitem>
+</varlistentry>
diff --git a/en-US/Installation_Source-common-varlistentry-3.xml b/en-US/Installation_Source-common-varlistentry-3.xml
new file mode 100644
index 0000000..1bc7730
--- /dev/null
+++ b/en-US/Installation_Source-common-varlistentry-3.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<varlistentry>
+ <term>On the network</term>
+ <listitem>
+ <para>
+ To specify a network location, select this option and choose from the following options in the drop-down menu:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <guilabel>Closest mirror</guilabel>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guilabel>http://</guilabel>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guilabel>https://</guilabel>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guilabel>ftp://</guilabel>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guilabel>nfs</guilabel>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+
+ <para>
+ Using your selection as the start of the location URL, type the rest into the address box. (If you selected <guilabel>Closest mirror</guilabel>, an address is not required.) If you choose NFS, the address box will be grayed out and another box will appear for you to specify any NFS mount options.
+ </para>
+
+ <para>
+ To configure a proxy, click <guibutton>Proxy setup</guibutton> unless you are installing via FTP and NFS (proxies are unavailable for these methods). Check <guilabel>Enable HTTP proxy</guilabel> and type the URL into the <guilabel>Proxy URL</guilabel> box. If your proxy requires authentication, check <guilabel>Use Authentication</guilabel> and enter a username and password. Click <guibutton>Add</guibutton>.
+ </para>
+
+ </listitem>
+</varlistentry>
diff --git a/en-US/Installation_Source-x86.xml b/en-US/Installation_Source-x86.xml
index a43212e..ebb98c5 100644
--- a/en-US/Installation_Source-x86.xml
+++ b/en-US/Installation_Source-x86.xml
@@ -5,90 +5,27 @@
]>
<section id="installation-source-x86">
<title>Installation Source</title>
- <para>
- Select <guilabel>Installation Source</guilabel> from the Installation Summary Menu.
- </para>
-
- <para>
- Specify the location you would like to install Fedora from. Choose between an ISO file or a network location.
- </para>
-
-<xi:include href="Installation_Source-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
- <para>
- If you initiated the installation using a full DVD ISO, the installer will detect the ISO and display it under <guilabel>Auto-detected install media</guilabel>. Select the ISO to use it as the installation source.
- </para>
-
- <para>
- If an ISO has not been detected automatically, specify a locally-stored ISO file. Click <guibutton>Choose an ISO</guibutton> and browse to the file's location on your system. After selecting an ISO, click <guibutton>Verify</guibutton> to check that the file is suitable for installation.
- </para>
-
- <para>
- To specify a network location, choose from the following options in the drop-down menu:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- <guilabel>Closest mirror</guilabel>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <guilabel>http://</guilabel>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <guilabel>https://</guilabel>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <guilabel>ftp://</guilabel>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <guilabel>nfs</guilabel>
- </para>
- </listitem>
- </itemizedlist>
-
-
- <para>
- Using your selection as the start of the location URL, type the rest into the address box. (If you selected <guilabel>Closest mirror</guilabel>, an address is not required.)
- </para>
-
- <para>
- If you choose NFS, the address box will be grayed out. Another box will appear for you to specify any NFS mount options.
- </para>
-
- <para>
- To configure a proxy, click <guibutton>Proxy setup</guibutton> unless you are installing via FTP and NFS. Proxies are unavailable for these methods.
- </para>
-
- <para>
- Check <guilabel>Enable HTTP proxy</guilabel> and type the URL into the <guilabel>Proxy URL</guilabel> box. If your proxy requires authentication, check <guilabel>Use Authentication</guilabel> and enter a username and password. Click <guibutton>Add</guibutton>.
- </para>
-
- <para>
+
+<xi:include href="Installation_Source-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Select Installation Source from the Installation Summary Menu. --> <xi:include href="Installation_Source-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- In this section you can specify the location you would like to install Fedora from. --> <xi:include href="Installation_Source-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include href="Installation_Source-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Select one of the following options: --> <xi:include href="Installation_Source-common-variable-list.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Auto-detected install media -->
+
+ <!-- <para>
Any Fedora updates available on the network will be automatically installed unless you check the <guilabel>Updates</guilabel> option in this section. This ensures that only the software versions available on the installation media are installed.
- </para>
+ </para>
<important>
<para>
- Choosing not to install available updates may pose a security risk to your system.
+ Choosing not to install available updates may pose a security risk to your system.
</para>
- </important>
+ </important> -->
- <para>
- Once you have selected your installation source, click <guibutton>Done</guibutton> to return to the Installation Summary Menu.
- </para>
+ <xi:include href="Installation_Source-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Once you have selected your installation source -->
+
<!-- <figure float="0">
<title>Language Configuration</title>
diff --git a/en-US/images/installationsource/installationsource.png b/en-US/images/installationsource/installationsource.png
index 68dc7aa..52f2ab0 100644
Binary files a/en-US/images/installationsource/installationsource.png and b/en-US/images/installationsource/installationsource.png differ
More information about the docs-commits
mailing list