Merge lp:~robert-ancell/mir/instructional_updates into lp:~kgunn72/mir/instructional_updates

[Robert Ancell]

[kevin gunn (kgunn72)]

looks good

review: Approve

=== modified file 'doc/installing_prebuilt_on_pc.md'
--- doc/installing_prebuilt_on_pc.md	2013-06-26 19:59:05 +0000
+++ doc/installing_prebuilt_on_pc.md	2013-06-26 22:06:24 +0000
@@ -4,8 +4,8 @@
 Install raring if you haven' t done so already.  Uninstall any proprietary
 drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
 
-Add the ppa:mir-team/system-compositor-testing. Note that besides mir itself,
-the PPA includes custom builds of Mesa and Xorg drivers with support for mir:
+Add the ppa:mir-team/system-compositor-testing. Note that besides Mir itself,
+the PPA includes custom builds of Mesa and Xorg drivers with support for Mir:
 
        sudo add-apt-repository ppa:mir-team/system-compositor-testing
 
@@ -24,7 +24,7 @@
        Pin: release o=LP-PPA-mir-team-system-compositor-testing
        Pin-Priority: 1002
 
-Install mir and dist-upgrade:
+Install Mir and dist-upgrade:
 
        sudo apt-get install mir-demos
        sudo apt-get dist-upgrade
 
=== modified file 'doc/using_mir_on_pc.md'
--- doc/using_mir_on_pc.md	2013-06-26 20:01:28 +0000
+++ doc/using_mir_on_pc.md	2013-06-26 22:06:24 +0000
@@ -33,14 +33,14 @@
 pre-built packages from the system-compositor-testing PPA.
 
 If you have installed the unity-system-compositor from
-the system-compositor-testing PPA, it will have modified your
-/etc/lightdm/lightdm.conf to run XMir. If you have build from source, to
-run X sessions under Mir, with Mir acting as the system compositor, edit
-your /etc/lightdm/lightdm.conf to look to look like this:
+the system-compositor-testing PPA, it will have created a file in
+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to run XMir. If you
+have build from source, to run X sessions under Mir, with Mir acting as the
+system compositor, create the file
+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to look to look like
+this:
 
     [SeatDefaults]
-    user-session=ubuntu
-    greeter-session=unity-greeter
     type=unity
 
 Now restart lightdm:
@@ -58,11 +58,10 @@
 
 
 In any case, if you wish to deactivate XMir upon boot, simply comment out
-the type=unity line from /etc/lightdm/lightdm.conf, like this:
+the type=unity line from
+/etc/lightdm/lightdm.conf.d10-unity-system-compositor.conf, like this:
 
     [SeatDefaults]
-    user-session=ubuntu
-    greeter-session=unity-greeter
     #type=unity