Initial commit of Ubuntu-Natty docs in Launchpad

[Jeremy Bicha]

On 9 April 2011 03:48, Jeremy Bicha <jeremy at bicha.net> wrote:
> Ok, I'm attempting to attach a simple merge proposal for the Cheese
> blurb. I thought it would be a good example page of a bridge between
> the User Guide and the individual application manuals. If the proposal
> is ok, I can do similar work for the other app stubs we have.
>
> Jeremy Bicha
>
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110409071718-k0e9cw1ksgt844om
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/gnome-user-docs/natty-unity/
# testament_sha1: b453df3d7910c69cebb90254d9b38ea70c0195df
# timestamp: 2011-04-09 03:35:45 -0400
# base_revision_id: jwcampbell at gmail.com-20110408172705-\
#   4llxuvfvbwaqk65f
# 
# Begin patch
=== renamed file 'gnome-help/C/app-cheese.page.stub' => 'gnome-help/C/app-cheese.page'
--- gnome-help/C/app-cheese.page.stub	2011-03-22 15:37:40 +0000
+++ gnome-help/C/app-cheese.page	2011-04-09 07:17:18 +0000
@@ -11,12 +11,21 @@
       <email>gnome-doc-list at gnome.org</email>
     </credit>
 
-    <desc>XXXXXXXX</desc>
+    <desc>Take photos and videos with your webcam.</desc>
   </info>
 
 <title>Cheese Webcam Booth</title>
 
-<p>XXXXX <link href="ghelp:cheese">Cheese help guide</link></p>
+<p>Cheese uses your webcam to take photos and videos, applies fancy special effects and lets you share the fun with others. With Cheese it is easy to take photos of you, your friends, pets or whatever you want.</p>
+
+
+<note style="important">
+  <p><link href="ghelp:cheese">Cheese Help</link></p>
+</note>
+
+<note style="tip">
+  <p><link href="apt:cheese">Install Cheese</link></p>
+</note>
 
 <media type="image" mime="image/png" src="figures/app-cheese.png">
  <p>XXXXXXX</p>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSUJ2A0AAYtfgEAQUGf/91tw
BIC////wUAQb13r0OYk6Z7WPCShEYjJpk02kyaZTJPyU8moAaepoMoBNpNDRPU1PUyAANAAACSIC
CaZTCMiep5E2Uep6h6RoADFET1ANAaA00NqNAAAAJTU0miYpnqjT1A9R6ENMgGgNNND9sGvYPTz6
mOicwYoZacKRQWV0dsdVbISwTq7HlNmTe3o33GTwLFbEdPf4Wm/Z8euG1sJwoVHzVtdz3MrwupL6
QumnP1bBbyI++L2k6rC4f1uhfp3W9IZtnMf86KERDPS0U2xNgPIUKHJsQcKhkr3I3Q7CUIljgvrU
pm6MVejATklpkpjGPIDdj5g0gNOEGRxA0BGEoXcswO86FkyLFKVy7nkDQJwoQFybSjpzydO3vgwL
2Huy2zbqKhVLJovlXr/tNakbvqGlcOs8i6OpQRvN9u1bG0UWSMgMBJfVeuqpRZIJiICGl2tGYB72
qKPcQGGocJo2wHNgejjkMIaNqZg3JcVWnfRUdQYKsNFWh1H7DRMS+tbAxZvBQgMWgpGJjguMSWJE
2B0DzA6tbUeksZhls1wmDYu4Xs4ISEnzGYKBL75TcxY4KZuFbJPZCxRiWTgmdpkgnRttt/Mh0PlA
2wHHGzzMsGyIeTvc2va/GBE8Bh2aVvuS2KuZkx1z3LF2aXteDs9kGxgZ9YBiRcx+OJxHOLix58Pl
rkcpugdV+9pmMiKWtWi+pQZ38CBrlur2I27BzJcu6s6ZZmT8y2GU0TJ1f3S9Oy9UQmGNw5s47Amn
LFLPu58x+KC+k7KK+HsoYIhVcZbdeWWstmpKjxHiqk2731RM3Dp4F0uuHPyfom4nJ/2xyTJym/jB
9UBS50oWE6OzwqF3s4Gnsrwr4v5eHGjSz2lEYVGyzdTyZH3aTqQP1IBcwzTFiNZbb/PKV8lsjohs
ojaUJaLdUwMUOD+/W88W14ZYY0NHNOUhp7lYrVGHTvpX0IklKbAAswbzraJAcBjBDCJ2u6CFJDPZ
fOHBTE4UQEXI+liW7V5VQ3R6R8ytXL3gK9p4CiMPe58HAI4pwY/zaZb4peJOMlmYuGkrE3/JxvVg
eorocFuDAIuDKB6DPp35zEsO6xV9eSgi0OZRkM2xcE6g2uw7oRCJGoDFsgzymiQTl6pQ7quFjTJm
+utIJJk3XmJ5OIL2XQyhSGyRKkKm5SApCQIafCsFqiT09hQqVHWntYtCOGuAI4GVA/S0IJEpgg7o
zIgQYlfWR6rsTXPbRFIIoyvB0nfj2xykhX4+Yt0C/C8HsV0bNjUDVFmH7CycxM7bhZSlH/FTEy7A
jhWZtvTzi1Mx4yLQuU027MVgrbaK+DlVBZazTKSvxUZK1X61McMBPsXVOiK0LvxhcvBTSVmAOOIj
/i7kinChIEoTsBo=