Merge lp:~kgunn72/mir/instructional_updates into lp:~mir-team/mir/trunk

[kevin gunn]

update to xmir instructions

updates to instructions for running based on some feedback

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:782
http://jenkins.qa.ubuntu.com/job/mir-ci/839/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1061
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/77/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/839/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Some fixed in lp:~robert-ancell/mir/instructional_updates, otherwise looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:783
http://jenkins.qa.ubuntu.com/job/mir-ci/840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/78/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/840/rebuild

review: Approve (continuous-integration)

=== modified file 'doc/installing_prebuilt_on_pc.md'
--- doc/installing_prebuilt_on_pc.md	2013-06-25 13:37:19 +0000
+++ doc/installing_prebuilt_on_pc.md	2013-06-26 22:18:24 +0000
@@ -1,21 +1,20 @@
 Installing pre-built packages on a PC {#installing_prebuilt_on_pc}
 =====================================
 
-1. Install raring if you haven' t done so already.  Uninstall any proprietary
-   drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
+Install raring if you haven' t done so already.  Uninstall any proprietary
+drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
 
-2. 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
 
-3. Update your package list:
+Update your package list:
 
        sudo apt-get update
 
-4. Create the `/etc/apt/preferences.d/50-pin-mir.pref` file with the
-following contents:
+Create the `/etc/apt/preferences.d/50-pin-mir.pref` file with the following
+contents:
 
        Package: *
        Pin: origin "private-ppa.launchpad.net"
@@ -25,7 +24,7 @@
        Pin: release o=LP-PPA-mir-team-system-compositor-testing
        Pin-Priority: 1002
 
-5. 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-25 13:37:19 +0000
+++ doc/using_mir_on_pc.md	2013-06-26 22:18:24 +0000
@@ -5,9 +5,8 @@
 ----------------
 
 Make sure your hardware is supported. That means you're using a Mesa driver,
-of which intel, radeon, and nouveau families are supported. If you're
-logged in to X then run this command to verify an appropriate DRI driver
-is active:
+of which intel, radeon, and nouveau families are supported. If you're logged
+in to X then run this command to verify an appropriate DRI driver is active:
 
     sudo pmap `pidof X` | grep dri.so
 
@@ -15,17 +14,16 @@
 
     lsmod | grep drm
 
-Before you can use Mir you need to ensure you have the proper custom Mesa build
-installed. If you installed Mir using the packages from mir-team
-system-compositor-testing PPA
-(see \ref installing_prebuilt_on_pc), you should be good to go.
+Before you can use Mir you need to ensure you have the proper custom Mesa
+build installed. If you installed Mir using the packages from mir-team
+system-compositor-testing PPA (see \ref installing_prebuilt_on_pc), you
+should be good to go.
 
-If you built Mir from source code (see \ref building_source_for_pc), you need
-to ensure you are using the proper Mesa at runtime. You can do that by
+If you built Mir from source code (see \ref building_source_for_pc), you
+nee to ensure you are using the proper Mesa at runtime. You can do that by
 installing the Mesa packages manually from the system-compositor-testing PPA,
-or by building the
-custom Mesa yourself and ensuring it can be found by Mir, e.g., by using
-LD_LIBRARY_PATH.
+or by building the custom Mesa yourself and ensuring it can be found by Mir,
+e.g., by using LD_LIBRARY_PATH.
 
 Using Mir as system compositor with X
 -------------------------------------
@@ -34,18 +32,23 @@
 include lightdm, Mesa and the Xorg drivers). The easiest way is to install
 pre-built packages from the system-compositor-testing PPA.
 
-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:
+If you have installed the unity-system-compositor from
+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]
     type=unity
-    user-session=ubuntu
-    greeter-session=unity-greeter
 
 Now restart lightdm:
 
     $ sudo restart lightdm
 
+Or you may simply reboot.
+
 In theory, you should now find yourself back in Ubuntu and not notice
 anything different. You can verify you're in Mir several ways:
 
@@ -53,6 +56,15 @@
     $ grep -i xmir /var/log/Xorg.0.log
     $ ls -l /var/log/lightdm/unity-system-compositor.log
 
+
+In any case, if you wish to deactivate XMir upon boot, simply comment out
+the type=unity line from
+/etc/lightdm/lightdm.conf.d10-unity-system-compositor.conf, like this:
+
+    [SeatDefaults]
+    #type=unity
+
+
 Running Mir natively
 --------------------