Mir

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

  1. instructional_updates
  2. Merge into instructional_updates
Proposed by Robert Ancell
Status: Merged
Merged at revision: 783
Proposed branch: lp:~robert-ancell/mir/instructional_updates
Merge into: lp:~kgunn72/mir/instructional_updates
Diff against target: 60 lines (+11/-12)
2 files modified
doc/installing_prebuilt_on_pc.md (+3/-3)
doc/using_mir_on_pc.md (+8/-9)
To merge this branch: bzr merge lp:~robert-ancell/mir/instructional_updates
Reviewer Review Type Date Requested Status
kevin gunn Approve
Review via email: mp+171677@code.launchpad.net
To post a comment you must log in.
Revision history for this message
kevin gunn (kgunn72) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/installing_prebuilt_on_pc.md'
2--- doc/installing_prebuilt_on_pc.md 2013-06-26 19:59:05 +0000
3+++ doc/installing_prebuilt_on_pc.md 2013-06-26 22:06:24 +0000
4@@ -4,8 +4,8 @@
5 Install raring if you haven' t done so already. Uninstall any proprietary
6 drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
7
8-Add the ppa:mir-team/system-compositor-testing. Note that besides mir itself,
9-the PPA includes custom builds of Mesa and Xorg drivers with support for mir:
10+Add the ppa:mir-team/system-compositor-testing. Note that besides Mir itself,
11+the PPA includes custom builds of Mesa and Xorg drivers with support for Mir:
12
13 sudo add-apt-repository ppa:mir-team/system-compositor-testing
14
15@@ -24,7 +24,7 @@
16 Pin: release o=LP-PPA-mir-team-system-compositor-testing
17 Pin-Priority: 1002
18
19-Install mir and dist-upgrade:
20+Install Mir and dist-upgrade:
21
22 sudo apt-get install mir-demos
23 sudo apt-get dist-upgrade
24
25=== modified file 'doc/using_mir_on_pc.md'
26--- doc/using_mir_on_pc.md 2013-06-26 20:01:28 +0000
27+++ doc/using_mir_on_pc.md 2013-06-26 22:06:24 +0000
28@@ -33,14 +33,14 @@
29 pre-built packages from the system-compositor-testing PPA.
30
31 If you have installed the unity-system-compositor from
32-the system-compositor-testing PPA, it will have modified your
33-/etc/lightdm/lightdm.conf to run XMir. If you have build from source, to
34-run X sessions under Mir, with Mir acting as the system compositor, edit
35-your /etc/lightdm/lightdm.conf to look to look like this:
36+the system-compositor-testing PPA, it will have created a file in
37+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to run XMir. If you
38+have build from source, to run X sessions under Mir, with Mir acting as the
39+system compositor, create the file
40+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to look to look like
41+this:
42
43 [SeatDefaults]
44- user-session=ubuntu
45- greeter-session=unity-greeter
46 type=unity
47
48 Now restart lightdm:
49@@ -58,11 +58,10 @@
50
51
52 In any case, if you wish to deactivate XMir upon boot, simply comment out
53-the type=unity line from /etc/lightdm/lightdm.conf, like this:
54+the type=unity line from
55+/etc/lightdm/lightdm.conf.d10-unity-system-compositor.conf, like this:
56
57 [SeatDefaults]
58- user-session=ubuntu
59- greeter-session=unity-greeter
60 #type=unity
61
62

Subscribers

People subscribed via source and target branches

to all changes: