[install-guide/f18] Adding missing conditional info to publican.cfg and fixing some conditional tagging
Jack Reed
jjr at fedoraproject.org
Wed Feb 13 04:15:45 UTC 2013
commit 03899ca5712d70775f04b1ff3b4a24de67132db8
Author: Jack Reed <jreed at redhat.com>
Date: Wed Feb 13 14:14:49 2013 +1000
Adding missing conditional info to publican.cfg and fixing some conditional tagging
.gitignore | 6 +++
en-US/Disk_Partitioning_Setup-x86.xml | 48 +++++++++++------------
en-US/Write_changes_to_disk_common-figure-1.xml | 8 ++--
publican.cfg | 3 +-
4 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f86c117..fc07153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,9 @@ en-US/images/storagedevices/.directory
publish/**/*
tmp/**/*
en-US/.directory
+en-US/*.xml~
+en-US/*.ent~
+publican.cfg~
+quickstart.cfg~
+*/*.po~
+pot/*.pot~
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index 63269f4..7bbe342 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -9,16 +9,16 @@
<xi:include href="Disk_Partitioning_Setup_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Automatic_Partitioning_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Automatic_Partitioning_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- End Index terms --> <xi:include href="Automatic_Partitioning_common-caution-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- It is always a good idea to back up any data ... --> <xi:include href="Automatic_Partitioning_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- End Index terms --> <xi:include href="Automatic_Partitioning_common-caution-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- It is always a good idea to back up any data ... --> <xi:include href="Automatic_Partitioning_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- Installation in text mode... --> <important condition="install-guide">
<title>Important — Booting from RAIDs</title>
- <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- If you have a RAID card, be aware that some BIOSes... --> <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- A /boot/ partition is also necessary for ... --> <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- If you have a RAID card, be aware that some BIOSes... --> <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- A /boot/ partition is also necessary for ... --> <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- If you have chosen to automatically partition your system ... -->
</important>
- <para>
+ <para >
Select <guilabel>Installation Destination</guilabel> from the Installation Summary Menu to select and partition the disks Fedora will be installed on.
</para>
<para condition="install-guide">
@@ -27,38 +27,36 @@
<xi:include href="Disk_Partitioning_Setup_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Disk_Partitioning_Setup_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- On this screen, you can choose between three different automatic partitioning... -->
- <xi:include href="Disk_Partitioning_Setup_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <xi:include href="Disk_Partitioning_Setup_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- If you do not feel comfortable with partitioning your system --> <!-- <xi:include href="Automatic_Partitioning_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<!-- Your options are: --> <!-- <xi:include href="Automatic_Partitioning_x86-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Remove all partitions on selected drives and create default layout
Remove linux partitions on selected drives and create default layout
Caution
Use free space on selected drives and create default layout --> <xi:include href="Automatic_Partitioning_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose your preferred partitioning method... --> <xi:include href="Automatic_Partitioning_quickstart-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
- <!-- You may want to simply install Fedora on all available disks... --> <xi:include href="Automatic_Partitioning_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- To encrypt all partitions except the /boot partition... --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
- <!-- During installation, all data will be erased... --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose your preferred partitioning method... --> <xi:include href="Automatic_Partitioning_quickstart-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start"/>
+ <!-- You may want to simply install Fedora on all available disks... --> <xi:include href="Automatic_Partitioning_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- To encrypt all partitions except the /boot partition... --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start"/>
+ <!-- During installation, all data will be erased... --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Click Continue once you have made your selections... --> <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- The Installation Options dialog now appears... --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- If there is sufficient space... --> <xi:include href="Automatic_Partitioning_quickstart-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
- <!-- To create and edit the partitions yourself... --> <xi:include href="Automatic_Partitioning_quickstart-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- If there is sufficient space... --> <xi:include href="Automatic_Partitioning_quickstart-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start"/>
+ <!-- To create and edit the partitions yourself... --> <xi:include href="Automatic_Partitioning_quickstart-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start"/>
<!-- Click Continue to allow Fedora... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- Click Cancel and add more disks... --> <xi:include href="Disk_Partitioning_Setup_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- If there is not enough space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- Free space available... --> <xi:include href="Automatic_Partitioning_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- If there is not enough space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Free space available... --> <xi:include href="Automatic_Partitioning_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- Choose from the following paths... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
- <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- Whichever path you choose... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- Click Partition Scheme Configuration to choose... --> <xi:include href="Automatic_Partitioning_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- Standard Partition... --> <xi:include href="Disk_Partitioning_Setup_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
- <!-- Important - chain loading... --> <xi:include href="Disk_Partitioning_Setup_common-important-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Whichever path you choose... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Click Partition Scheme Configuration to choose... --> <xi:include href="Automatic_Partitioning_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Standard Partition... --> <xi:include href="Disk_Partitioning_Setup_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Important - chain loading... --> <xi:include href="Disk_Partitioning_Setup_common-important-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- Important - multipath and non-multipath... -->
<xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- x86, AMD64, and Intel 64 Boot Loader Configuration -->
-</section>
-
-
+</section>
\ No newline at end of file
diff --git a/en-US/Write_changes_to_disk_common-figure-1.xml b/en-US/Write_changes_to_disk_common-figure-1.xml
index 5182c91..2c543dc 100644
--- a/en-US/Write_changes_to_disk_common-figure-1.xml
+++ b/en-US/Write_changes_to_disk_common-figure-1.xml
@@ -6,11 +6,11 @@
<figure float="0">
<title>Ready to install</title>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG" width="444" condition="install-guide"/>
+ <imageobject condition="install-guide">
+ <imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG" width="444" />
</imageobject>
- <imageobject>
- <imagedata fileref="images/diskpartitioning/write_changes-live.png" format="PNG" width="444" condition="quick-start"/>
+ <imageobject condition="quick-start">
+ <imagedata fileref="images/diskpartitioning/write_changes-live.png" format="PNG" width="444" />
</imageobject>
<textobject>
<para>
diff --git a/publican.cfg b/publican.cfg
index 1c99a15..534892c 100644
--- a/publican.cfg
+++ b/publican.cfg
@@ -4,4 +4,5 @@
debug: 1
xml_lang: en-US
brand: fedora
-
+condition: install-guide
+mainfile: Installation_Guide
More information about the docs-commits
mailing list