[readme-live-image/f16: 2/3] Merge conflicts

[Petr Kovář]

commit bd82b0636ca5932dd7ecc38943fd0048024c8e52
Merge: 89bcb7e 782661c
Author: Petr Kovar <pkovar at redhat.com>
Date:   Tue Nov 8 17:34:54 2011 +0100

    Merge conflicts

 en-US/Fedora_Live_Images.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --cc en-US/Fedora_Live_Images.xml
index 71c3bc2,a6e1553..b6e0eaa
--- a/en-US/Fedora_Live_Images.xml
+++ b/en-US/Fedora_Live_Images.xml
@@@ -228,7 -228,7 +228,7 @@@
  				<para>In GNOME (the default desktop environment), move the mouse to the top left corner of the screen to activate the activities overview. Then click on the <guimenuitem>Install to Hard Disk</guimenuitem> icon at the bottom of the dash (the vertical strip of icons on the left hand side of the activities overview).</para>
  				<note>
  					<para>
--						If your computer does not support the graphical effects used in GNOME 3, you will automatically be logged in to a simpler version of the GNOME desktop called 'Fallback Mode'. The standard GNOME desktop has a single black bar across the top of the screen, whereas the Fallback Mode desktop has two black bars, one across the top and one across the bottom. To install Fedora to your hard disk in Fallback Mode, press <keycombo><keycap>Alt</keycap>+<keycap>F2</keycap></keycombo> together. In the box that appears, type 'liveinst' (without the quotation marks) and press <keycap>Enter</keycap>.
++						If your computer does not support the graphical effects used in GNOME 3, you will automatically be logged in to a simpler version of the GNOME desktop called 'Fallback Mode'. The standard GNOME desktop has a single black bar across the top of the screen, whereas the Fallback Mode desktop has two black bars, one across the top and one across the bottom. To install Fedora to your hard disk in Fallback Mode, press <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. In the box that appears, type 'liveinst' (without the quotation marks) and press <keycap>Enter</keycap>.
  					</para>
  				</note>
  			</listitem>