Merge lp:~ubuntu-branches/ubuntu/precise/ubuntu-docs/precise-201202051639 into lp:ubuntu/precise/ubuntu-docs

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/ubuntu-docs reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/ubuntu-docs/precise-201202051639. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

104. By Jan Simon on 2012-01-30

Removed outdated information (LP: #913926)

=== modified file 'ubuntu-help/C/display-2monitors.page'
--- ubuntu-help/C/display-2monitors.page	2011-10-20 07:41:14 +0000
+++ ubuntu-help/C/display-2monitors.page	2012-02-05 16:46:22 +0000
@@ -57,5 +57,4 @@
 
 <p>By default, different images are displayed on each monitor.
 To enable the same image across both monitors, check the box entitled <gui>Same image in all monitors</gui> and then click <gui>Apply</gui>.</p>
-<p>You also have the option to create a shortcut to the <gui>Monitors</gui> application by enabling <gui>Show monitors in panel</gui>, which will then place itself in the panel.</p>
 </page>