Changed references to Virt Admin Guide to Virt Deployment & Admin Guide; Added description of GNOME Boxes to Tools chapter

6 files changed, 84 insertions, 73 deletions

diff --git a/en-US/Advantages.xml b/en-US/Advantages.xml
index 36551ee..25c256a 100644
--- a/en-US/Advantages.xml
+++ b/en-US/Advantages.xml
@@ -106,20 +106,16 @@
 				<para>SELinux was developed by the US National Security Agency and others to provide Mandatory Access Control (MAC) for Linux. Under control of SELinux, all processes and files are given what is known as a <emphasis>type</emphasis>, and access is limited by fine-grained controls. SELinux limits the abilities of an attacker and works to prevent many common security exploits such as buffer overflow attacks and privilege escalation.</para>
 			</formalpara>
 			<para>SELinux strengthens the security model of Fedora hosts and virtualized Fedora guests. SELinux is configured and tested to work, by default, with all virtualization tools shipped with Fedora.</para>
-				
-		<!--<note>	Ask mprpic - owner of F17 SELinux User Guide - what to refer to here?
-		  <para>For more information on SELinux, refer to the SELinux documentation at <ulink url="http://docs.redhat.com/docs/" />. For more information on security within virtualization, refer to the <citetitle>Fedora Virtualization Security Guide</citetitle>.
-		  </para>
-		</note>-->
-		<formalpara>
+
+                  <formalpara>
 				<title>sVirt</title>
 				<para>sVirt is a technology included in Fedora that integrates SELinux and virtualization. It applies Mandatory Access Control (MAC) to improve security when using virtual machines, and improves security and hardens the system against bugs in the hypervisor that might be used as an attack vector for the host or to another virtual machine.</para>
 			</formalpara>
                <note>
-                  <para>
-                     For more information on security for virtualization, refer to the <citetitle>Fedora Virtualization Security Guide</citetitle>.
-                  </para>
+                     <para>For more information on security in Fedora, refer to the <citetitle>Fedora Security Guide</citetitle>. To find more information on security for virtualization, refer to the <citetitle>Fedora Virtualization Security Guide</citetitle>.
+                     </para>
                </note>
+               
             </section>
 		
 	</section>
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index 4bed90b..e80b648 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -5,7 +5,7 @@
     <title>Introduction</title>
     
     <para>
-       The  <citetitle>Virtualization Getting Started Guide</citetitle> introduces the basics of virtualization and assists with the navigation of other virtualization documentation and products that Fedora provides.
+       The  <citetitle>Fedora Virtualization Getting Started Guide</citetitle> introduces the basics of virtualization and assists with the navigation of other virtualization documentation and products that Fedora provides.
     </para>
       
     <para>
@@ -39,7 +39,7 @@
       </itemizedlist>
     </section>
     <section> 
-       <title>Virtualization in Fedora&nbsp;19</title>
+       <title>Virtualization in Fedora Linux</title>
        <para>
          Fedora contains packages and tools to support a variety of virtualized environments.
        </para>
@@ -61,21 +61,16 @@
                In addition to this guide, the following books cover virtualization with Fedora: 
             </para>
             <itemizedlist>
-<!--               <listitem>      
-                     <para>
-                        <citetitle>Virtualization Deployment Guide</citetitle>: This guide provides information on system requirements and restrictions, package details, host configuration and detailed instructions for installing different types of guests. 
-                     </para>
-               </listitem>-->
-               <listitem>
-                     <para>
-                        <citetitle>Virtualization Administration Guide</citetitle>: This guide provides information on servers, security, KVM, remote management of guests, KSM, administration tasks, storage, volumes, <application>virt-manager</application>, guest disk access with offline tools, virtual networking, and troubleshooting.
-                     </para>
-               </listitem>
-               <listitem>
-                     <para>
-                        <citetitle>Virtualization Security Guide</citetitle>: This guide provides information on virtualization security technologies including sVirt, configuration and recommendations for host and guest security, and network security. 
-                     </para>
-               </listitem>
+                  <listitem>
+                           <para>
+                              <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle> covers the installation, configuration, and maintenance of virtualization hosts and virtual machines.
+                           </para>
+                     </listitem>
+                     <listitem>
+                           <para>
+                              <citetitle>Fedora Virtualization Security Guide</citetitle>: This guide provides information on virtualization security technologies including sVirt, configuration and recommendations for host and guest security, and network security. 
+                           </para>
+                     </listitem>
             </itemizedlist>
          <para>
             Red Hat Enterprise Virtualization (RHEV) is another virtualization option for servers and desktops. Red Hat Enterprise Virtualization provides an end-to-end datacenter virtualization solution developed from the upstream oVirt project. Visit <ulink url="https://fedorahosted.org/ovirt/"/> for more information about oVirt. 
diff --git a/en-US/Products.xml b/en-US/Products.xml
index 8d9554c..1d0178d 100644
--- a/en-US/Products.xml
+++ b/en-US/Products.xml
@@ -23,7 +23,7 @@
                               </para>
                               <important>
                                     <para>
-                                       Overcommitting involves possible risks to system stability. <!--For more information on overcommitting with KVM, and the precautions that should be taken, refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle>.-->
+                                       Overcommitting involves possible risks to system stability. For more information on overcommitting with KVM, and the precautions that should be taken, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                                     </para>
                               </important>
                         </listitem>
@@ -36,7 +36,7 @@
                                  </para>
                                  <important>
                                        <para>
-                                          Thin provisioning involves possible risks to system stability. <!--For more information on thin provisioning with KVM, and the precautions that should be taken, refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle>.-->
+                                          Thin provisioning involves possible risks to system stability. <!--For more information on thin provisioning with KVM, and the precautions that should be taken, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.-->
                                        </para>
                                  </important>        
                         </listitem>
@@ -47,24 +47,24 @@
                                  <para>
                                        <firstterm>Kernel SamePage Merging (KSM)</firstterm>, used by the KVM hypervisor, allows KVM guests to share identical memory pages. These shared pages are usually common libraries or other identical, high-use data. KSM allows for greater guest density of identical or similar guest operating systems by avoiding memory duplication.
                                  </para>
-<!--                                 <note>
+                                <note>
                                        <para>
-                                             For more information on KSM, refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle>.
+                                             For more information on KSM, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                                        </para>
-                                 </note>-->
+                                 </note>
                         </listitem>
                </varlistentry>
                <varlistentry><!--Added to RHEL 6.4, adding for F19-->
-                        <term>QEMU Guest Agent</term>
+                        <term>QEMU guest agent</term>
                         <listitem>
                                  <para>
-                                       The <firstterm>QEMU Guest Agent</firstterm> runs on the guest operating system and allows the host machine to issue commands to the guest operating system.
+                                       The <firstterm>QEMU guest agent</firstterm> runs on the guest operating system and allows the host machine to issue commands to the guest operating system.
                                  </para>
-                             <!--    <note>  verify for RHEL7 - 
+                                <note> 
                                        <para>
-                                             For more information on the QEMU Guest Agent, refer to the <citetitle>Red Hat Enterprise Linux&nbsp;6 Virtualization Host Configuration and Guest Installation Guide</citetitle>.
+                                             For more information on the QEMU guest agent, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                                        </para>
-                                 </note>-->
+                                 </note>
                         </listitem>
                </varlistentry>
                <varlistentry>
@@ -229,14 +229,11 @@
                                                    <para>PS/2 mouse and keyboard</para>
                                           </listitem>
                                           <listitem>
-                                                   <para>EvTouch USB Graphics Tablet</para>
+                                                   <para>EvTouch USB graphics tablet</para>
                                           </listitem>
                                           <listitem>
                                                    <para>PCI UHCI USB controller and a virtualized USB hub</para>
                                           </listitem>
-                                          <!-- removed to fix BZ798106 <listitem>
-                                                   <para>PCI network adapters</para>
-                                          </listitem>-->
                                           <listitem>
                                                    <para>Emulated serial ports</para>
                                           </listitem>
@@ -462,11 +459,11 @@
                                     <para>
                                        Device assignment is supported on PCI Express devices, with the exception of graphics cards. Parallel PCI devices may be supported as assigned devices, but they have severe limitations due to security and system configuration conflicts.
                                     </para>
-<!--                                       <note>
+                                       <note>
                                           <para>
-                                             For more information on device assignment, refer to the <citetitle>Fedora Virtualization Deployment Guide</citetitle>.
+                                             For more information on device assignment, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                                           </para>
-                                       </note> -->
+                                       </note> 
                               </listitem>
                            </varlistentry>
                            <varlistentry>
@@ -491,11 +488,11 @@
                                     <para>
                                        An SR-IOV capable PCI-e device, provides a Single Root Function (for example, a single Ethernet port) and presents multiple, separate virtual devices as unique PCI device functions. Each virtual device may have its own unique PCI configuration space, memory-mapped registers, and individual MSI-based interrupts.
                                     </para> 
-<!--                                       <note>
+                                      <note>
                                           <para>
-                                             For more information on SR-IOV, refer to the <citetitle>Fedora Virtualization Deployment Guide</citetitle>.
+                                             For more information on SR-IOV, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                                           </para>
-                                       </note>-->
+                                       </note>
                               </listitem>
                            </varlistentry>
                            <varlistentry>
@@ -600,11 +597,11 @@
                                        Storage pools are further divided into storage volumes. Storage volumes are an abstraction of physical partitions, LVM logical volumes, file-based disk images and other storage types handled by <application>libvirt</application>. Storage volumes are presented to virtual machines as local storage devices regardless of the underlying hardware.
                                     </para>
 
-<!--            <note>
+            <note>
                <para>
-                  For more information on storage and virtualization, refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle>.
+                  For more information on storage and virtualization, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
                </para>
-            </note>-->
+            </note>
         </section>
 </section>
 </chapter>
\ No newline at end of file
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index d8984ce..a366166 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -9,6 +9,22 @@
 		<revhistory>
 			<!--EDIT MY REVNUMBER AND DESCRIPTION AT RELEASE TIME FOR MAJOR REVISION-->
                         <revision>
+                                <revnumber>1.0-11</revnumber>
+                                <date>Monday June 10, 2013</date>
+                                <author>
+                                        <firstname>Dayle</firstname>
+                                        <surname>Parker</surname>
+                                        <email>dayleparker@redhat.com</email>
+                                </author>
+                                <revdescription>
+                                        <simplelist>
+                                          <member>Revised Para-virtualized Devices section based on SME feedback.</member>
+                                          <member>Verified references to other Fedora virtualization guides.</member>
+                                          <member>Added GNOME Boxes description to Tools.</member>
+                                       </simplelist>
+                                </revdescription>
+                        </revision>
+			<revision>
                                 <revnumber>1.0-10</revnumber>
                                 <date>Thursday May 30, 2013</date>
                                 <author>
@@ -19,7 +35,6 @@
                                 <revdescription>
                                         <simplelist>
                                           <member>Added virtio-rng description to Para-virtualized Devices section.</member>
-                                          <member>Revised Para-virtualized Devices section based on SME feedback.</member>
                                         </simplelist>
                                 </revdescription>
                         </revision>
diff --git a/en-US/Tools.xml b/en-US/Tools.xml
index 82e9350..98c68e7 100644
--- a/en-US/Tools.xml
+++ b/en-US/Tools.xml
@@ -16,11 +16,11 @@
       <para>
         <firstterm>virsh</firstterm> is a command line interface (CLI) tool for managing the hypervisor and guest virtual machines. The <command>virsh</command> command line tool is built on the <application>libvirt</application> management API and operates as an alternative to the <command>qemu-kvm</command> command and the graphical <application>virt-manager</application> application. The <command>virsh</command> command can be used in read-only mode by unprivileged users or, with root access, full administrative functionality. The <command>virsh</command> command is ideal for scripting virtualization administration. In addition the <command>virsh</command> tool is a main management interface for <command>virsh</command> guest domains and can be used to create, pause, and shut down domains, as well as list current domains. This tool is installed as part of the <package>libvirt-client</package> package.
       </para>
-<!--          <note>
+          <note>
               <para>
-                Refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle> for more information about managing virtual machines with <command>virsh</command>.
+                Refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle> for more information about managing virtual machines with <command>virsh</command>.
               </para>
-          </note>-->
+          </note>
    </section>
    
    <section>
@@ -32,11 +32,11 @@
          machines, and view performance statistics. This tool ships in its own
          package called <package>virt-manager</package>.
       </para>
-<!--            <note>
+           <note>
               <para>
-                Refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle> for more information about managing virtual machines with <command>virt-manager</command>.
+                Refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle> for more information about managing virtual machines with <command>virt-manager</command>.
               </para>
-            </note>-->
+            </note>
    </section>
    
    <section>
@@ -49,11 +49,11 @@
          complete, allowing for easy automation of installation. This tool is
          installed as part of the <package>python-virtinst</package> package.
        </para>
-<!--              <note>      
+              <note>      
                 <para>
-                  Refer to the <citetitle>Fedora Virtualization Deployment Guide</citetitle> for more information about <command>virt-install</command>.
+                  Refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle> for more information about <command>virt-install</command>.
               </para>
-            </note>-->
+            </note>
    </section>
    
    <section>
@@ -71,13 +71,21 @@
             option if the disk image is being used by a running virtual machine.
          </para>
       </warning>
-          <!--     <note>
+         <note>
             <para>
-               Refer to the <citetitle>Fedora Virtualization Administration Guide</citetitle> for more information about <command>guestfish</command>.
+               Refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle> for more information about <command>guestfish</command>.
             </para>
-         </note>-->
+         </note>
    </section>
-   
+   <section>
+      <title><command>GNOME Boxes</command></title>
+      <para>
+         <firstterm>GNOME Boxes</firstterm> is a lightweight graphical desktop virtualization tool
+         used to view and access virtual machines and remote systems. It provides a way to test 
+         different operating systems and applications from the desktop with minimal configuration. 
+          <application>GNOME Boxes</application> is based on QEMU and is built into the GNOME 3 desktop in Fedora.
+       </para>
+   </section>   
    
    <section>
       <title>Other useful tools</title>
diff --git a/en-US/What_Is_It.xml b/en-US/What_Is_It.xml
index ea5e90b..e4aacff 100644
--- a/en-US/What_Is_It.xml
+++ b/en-US/What_Is_It.xml
@@ -33,11 +33,11 @@
                         </listitem>
                      </varlistentry>
                 </variablelist>
-<!--                     <note> Include once VDAG is published.
+                    <note>
 			<para>
 				For more information and detailed instructions on guest installation, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
 			</para>
-                     </note>-->
+                     </note>
 	</section>
         <section id="sec-migration">
         <title>What is migration?</title>
@@ -103,14 +103,14 @@
                                              </listitem>
                                     </varlistentry>
                               </variablelist>
-            <!--  F18 WAS:    <para>
-                                 Shared, networked storage must be used for storing guest images to be migrated. Without shared storage, migration is not possible. It is recommended to use <application>libvirt</application>-managed storage pools for shared storage.
-                              </para>-->
-<!--                              <note>
-                                 <para>
-                                    For more information on migration, refer to the <citetitle>Fedora Virtualization Depolyment and Administration Guide</citetitle>.
-                                 </para>
-                              </note>-->
+                                    <para>
+                                       Shared, networked storage must be used for storing guest images to be migrated. Without shared storage, migration is not possible. It is recommended to use <application>libvirt</application>-managed storage pools for shared storage.
+                                    </para>
+                                       <note>
+                                          <para>
+                                             For more information on migration, refer to the <citetitle>Fedora Virtualization Deployment and Administration Guide</citetitle>.
+                                          </para>
+                                       </note>
                      </section>
          <!--        <section id="Virtualized_to_virtualized">
                 <title>Virtualized to virtualized migration (V2V)</title>