GNOME.org
 

[cheese] help: Reviewed and improved new Mallard help

commit f274a56fd43d90848e4e2106e73df1cbf12c3d02
Author: Ekaterina Gerasimova <kittykat3756 googlemail com>
Date:   Mon Sep 5 23:52:59 2011 +0200

    help: Reviewed and improved new Mallard help
    
    Reviewed the new help. Made some wording improvements. Improved
    indentation and tag useage.

 help/C/apply-effects.page                          |   31 ++++++++--
 help/C/burst-mode.page                             |   49 ++++++++++-----
 .../{card-graphic.page => card-graphic.page.stub}  |    0
 help/C/{closed.page => closed.page.stub}           |    0
 help/C/delete-photo.page                           |   27 ++++++--
 help/C/disable-countdown.page                      |   16 ++++-
 help/C/disable-flash.page                          |   18 ++++--
 help/C/{full-screen.page => full-screen.page.stub} |    0
 help/C/image-properties.page                       |   36 ++++++++----
 help/C/introduction.page                           |   35 ++++++++---
 help/C/{no-device.page => no-device.page.stub}     |    7 +-
 help/C/record-video.page                           |   38 +++++++++----
 help/C/resolution-photo.page                       |   35 ++++++++---
 help/C/save-photo.page                             |   28 ++++++---
 help/C/take-photo.page                             |   62 ++++++++++++--------
 help/C/view-photo.page                             |   19 +++++--
 help/C/{webcams.page => webcams.page.stub}         |    0
 help/C/wide-mode.page                              |   32 ++++++++--
 help/Makefile.am                                   |   37 +++++++++---
 19 files changed, 331 insertions(+), 139 deletions(-)
---
diff --git a/help/C/apply-effects.page b/help/C/apply-effects.page
index 868d051..ff477e0 100644
--- a/help/C/apply-effects.page
+++ b/help/C/apply-effects.page
@@ -3,14 +3,20 @@
       id="apply-effects">
   <info>
     <revision version="3.0" date="2011-08-24" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
     <link type="guide" xref="index"/>
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Add fun effects to your photos and videos, like turning yourself green or distorting the picture like a funhouse mirror.</desc>
+    <desc>Add fun effects to your photos and videos, like turning yourself green
+    or distorting the picture like a funhouse mirror.</desc>
   </info>
 
   <title>Apply effects to photos and videos</title>
@@ -19,16 +25,27 @@
   <steps>
     <item><p>Click <gui>Effects</gui>.</p></item>
     <item>
-     <p>Select the effect you want by clicking one of the options.</p>
-     <p>You can select multiple effects if you like. For example, if you select Hulk and Kun-Fu, the picture will be altered to have a green shade and be upside down.</p>
+     <p>Select the effect you want to use by clicking one of the options.</p>
+     <p>If you like, you can select multiple effects. For example, if you select
+     <gui>Hulk</gui> and <gui>Kung-Fu</gui>, the video will be altered to have a
+     green shade and will show a repeated image.</p>
     </item>
     <item>
-     <p>Click <gui>Effects</gui> to hide the effects menu and bring you back to the normal view.</p>
+!     <p>Click <gui>Effects</gui> to hide the effects menu and return to the
+     normal view.</p>
     </item>
   </steps>
-  <p><app>Cheese</app> offers 34 effects, of which only 9 are shown by default. If you want see more, click <gui>Next Effects</gui> and <gui>Previous Effects</gui> to get back again. These are some of them, from left to right: Bulge, Edge and Mirror.</p>
-  <p><media type="image" src="figures/effects.png" width="840" height="320"/></p>
 
-<note style="tip"><p>To remove any effects that you added, click <gui>Effects</gui> and select <gui>No Effect</gui>.</p></note>
+  <p><app>Cheese</app> offers 34 effects, of which only 9 are shown on the first
+  page. Click <gui>Next Effects</gui> and <gui>Previous Effects</gui> to
+  navigate to the other pages.</p>
+
+  <figure>
+    <title>Some of the effects, from left to right: Bulge, Edge and Mirror</title>
+    <media type="image" src="figures/effects.png" width="840" height="320"/>
+  </figure>
+
+  <note style="tip"><p>To deselect all effects, click <gui>Effects</gui> and
+  select <gui>No Effect</gui>.</p></note>
 
 </page>
diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
index 8aafefe..dc4acc7 100644
--- a/help/C/burst-mode.page
+++ b/help/C/burst-mode.page
@@ -2,46 +2,61 @@
       type="topic" style="task"
       id="burst-mode">
   <info>
-    <link type="guide" xref="index#multiple-photos"/>
+    <link type="guide" xref="index"/>
     <revision version="3.0" date="2011-08-24" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Burst Mode takes several photos in a short space of time. Change your pose in between each shot!</desc>
+    <desc><gui>Burst mode</gui> takes several photos rapidly. Change your pose
+    in between each shot!</desc>
   </info>
 
-  <title>Take multiple photos in rapid succession</title>
+  <title>Take multiple photos in quick succession</title>
 
-  <p>You can use Burst Mode to automatically take several photos in one go, with a short pause between each shot. It's particularly fun if you change your pose in between pictures! To use Burst Mode:</p>
+  <p>You can use <gui>Burst mode</gui> to automatically take several photos in
+  one go, with a short pause between each shot. It's particularly fun if you
+  change your pose in between photos! To use <gui>Burst mode</gui>:</p>
 
   <steps>
     <item>
-     <p>Click the small button that looks like a stack of photos in the lower left of the Cheese window. If you clicked the right one, the button in the center of the window should now say <gui>Take Multiple Photos</gui>.</p>
+     <p>Click <gui>Burst</gui>, the <gui>Take a Photo</gui> button will now say <gui>Take Multiple Photos</gui>.</p>
      <p>Alternatively, click <guiseq><gui>Cheese</gui><gui>Burst</gui></guiseq>.</p>
     </item>
     <item>
      <p>Click <gui>Take Multiple Photos</gui> or press the <key>spacebar</key>.</p>
-     <p>By default, four photos will be taken, with a three second delay between each photo. You'll see a countdown before each photo is taken.</p>
+     <p>By default, four photos will be taken, with a three second delay between
+     each countdown, which you will see before each photo is taken.</p>
     </item>
   </steps>
 
-<p>Press <key>Esc</key> if you want to stop Cheese from taking photos at any point.</p>
+  <p>Press <key>Esc</key> if you want to stop <app>Cheese</app> from taking
+  photos at any point.</p>
 
 <section id="burst-preferences">
- <title>Change how many photos are taken, and the delay between shots</title>
- <p>You can change how many photos should be taken in each burst, and the length of the pause between photos:</p>
- <steps>
-  <item>
-   <p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.</p>
-  </item>
-  <item>
-   <p>Change the options under <gui>Burst mode</gui> and click <gui>Close</gui>.</p>
-  </item>
- </steps>
+  <title>Change how many photos are taken and the delay between them</title>
+  <p>You can change how many photos will be taken in each burst and the length
+  of the delay between the photos:</p>
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Change the options under <gui>Burst mode</gui> and click <gui>Close</gui>.</p>
+    </item>
+  </steps>
+  <note>
+    <p>The delay is between the last photo taken and the start of the count down
+    for the next photo, not between two photos.</p>
+  </note>
 </section>
 
 </page>
diff --git a/help/C/card-graphic.page b/help/C/card-graphic.page.stub
similarity index 100%
rename from help/C/card-graphic.page
rename to help/C/card-graphic.page.stub
diff --git a/help/C/closed.page b/help/C/closed.page.stub
similarity index 100%
rename from help/C/closed.page
rename to help/C/closed.page.stub
diff --git a/help/C/delete-photo.page b/help/C/delete-photo.page
index 1566af0..6f5ae6c 100644
--- a/help/C/delete-photo.page
+++ b/help/C/delete-photo.page
@@ -4,33 +4,46 @@
   <info>
     <link type="guide" xref="index" group="#last"/>
     <revision version="3.0" date="2011-08-24" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Remove photos and videos that you don't want any more.</desc>
+    <desc>Remove photos and videos that you no longer want to keep.</desc>
   </info>
 
   <title>Delete a photo or video</title>
 
-  <p>If you don't want a photo or video anymore, you can permanently delete it:</p>
+  <p>If you no longer want a photo or video, you can permanently delete it:</p>
 
   <steps>
     <item>
-     <p>Find the photo or video that you want to delete in the photo stream at the bottom of the Cheese window.</p>
+      <p>Find the photo or video that you want to delete in the photo stream at
+      the bottom of the <app>Cheese</app> window.</p>
     </item>
     <item>
-     <p>Right-click it and select <gui>Delete</gui>. Alternatively,
-    click it once to select it and press <key>Delete</key>.</p>
+      <p>Right-click it and select <gui>Delete</gui>. Alternatively, click it
+      once to select it and press the <key>Delete</key> key.</p>
     </item>
     <item>
-     <p>You will be asked if you want to permanently delete it. Click <gui>Delete</gui> if you do; you will not be able to recover the photo.</p>
+      <p>You will be asked if you want to permanently delete it. Confirm by
+      clicking <gui>Delete</gui>; you will not be able to recover the photo.</p>
     </item>
   </steps>
 
-<p>If you're not sure if you want to permanently delete the photo or video, you can right click it and select <gui>Move to Trash</gui> instead. This will put it in your computer's main <file>Trash</file> folder. (Cheese doesn't have its own Trash folder, and you can't access the computer's main Trash from within Cheese.)</p>
+  <p>If you are not sure whether you want to permanently delete the photo or
+  video, you can right click it and select <gui>Move to Trash</gui> instead.
+  This will move it to the computer's <gui>Trash</gui> folder.</p>
+  <note>
+    <p>Cheese does not have its own <gui>Trash</gui> folder and you can not
+    access your computer's <gui>Trash</gui> folder from within <app>Cheese</app>.</p>
+  </note>
 
 </page>
diff --git a/help/C/disable-countdown.page b/help/C/disable-countdown.page
index bcf0f78..d5af315 100644
--- a/help/C/disable-countdown.page
+++ b/help/C/disable-countdown.page
@@ -3,19 +3,27 @@
       id="disable-countdown">
   <info>
     <link type="guide" xref="index#advanced" group="#last"/>
-	<revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Click <guiseq><gui>Cheese</gui><gui>Countdown</gui></guiseq> to disable the countdown.</desc>
+    <desc>Click <guiseq><gui>Cheese</gui><gui>Countdown</gui></guiseq> to
+    disable the countdown.</desc>
   </info>
 
-  <title>Disable the "Countdown" before photos are taken</title>
+  <title>Disable the <gui>Countdown</gui> before photos are taken</title>
 
-<p>By default, Cheese counts down from three before taking a photo. You can stop this from happening by clicking <guiseq><gui>Cheese</gui><gui>Countdown</gui></guiseq>, so that <gui>Countdown</gui> is unchecked.</p>
+  <p>By default, <app>Cheese</app> counts down from three before taking a photo.
+  You can stop this from happening by clicking <guiseq><gui>Cheese</gui>
+  <gui>Countdown</gui></guiseq>, so that <gui>Countdown</gui> is unchecked.</p>
 
 </page>
diff --git a/help/C/disable-flash.page b/help/C/disable-flash.page
index 76b1263..f3ecd90 100644
--- a/help/C/disable-flash.page
+++ b/help/C/disable-flash.page
@@ -2,21 +2,27 @@
       type="topic" style="task"
       id="disable-flash">
   <info>
-	<revision version="3.0" date="2011-08-25" status="candidate"/>
-	<link type="guide" xref="index#advanced"/>
+    <link type="guide" xref="index#advanced"/>
+    <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Click <guiseq><gui>Cheese</gui><gui>Flash</gui></guiseq> so that <gui>Flash</gui> is unchecked.</desc>
+    <desc>Stop the screen from flashing white when taking a photo.</desc>
   </info>
 
-<title>Stop the flash from firing</title>
+  <title>Disable the flash</title>
 
-<p>When you take a photo with Cheese, the computer screen briefly turns white. This is designed to provide something like a camera flash, to illuminate the scene better.</p>
+  <p>When you take a photo with Cheese, the computer screen briefly turns white.
+  This provides additional light.</p>
 
-<p>You can disable this if you like. Click <guiseq><gui>Cheese</gui><gui>Flash</gui></guiseq> so that <gui>Flash</gui> is unchecked.</p>
+  <p>To disable this feature, click <guiseq><gui>Cheese</gui><gui>Flash</gui></guiseq> so that <gui>Flash</gui> is unchecked.</p>
 
 </page>
diff --git a/help/C/full-screen.page b/help/C/full-screen.page.stub
similarity index 100%
rename from help/C/full-screen.page
rename to help/C/full-screen.page.stub
diff --git a/help/C/image-properties.page b/help/C/image-properties.page
index eced506..d99f83f 100644
--- a/help/C/image-properties.page
+++ b/help/C/image-properties.page
@@ -2,52 +2,64 @@
       type="topic" style="task"
       id="image-properties">
   <info>
-    <revision version="3.0" date="2011-08-24" status="candidate"/>
     <link type="guide" xref="index#problems"/>
+    <revision version="3.0" date="2011-08-24" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Adjust the saturation, contrast, brightness, and hue to make photos and videos look better.</desc>
+    <desc>Adjust the saturation, contrast, brightness and hue to make photos and
+    videos look better.</desc>
   </info>
 
-  <title>My photos/videos are too dark, or the colors don't look right</title>
+  <title>My photos and videos look wrong</title>
 
-  <p>If your photos or videos are too dark or the colors seem to be wrong, try adjusting the saturation, contrast, brightness, and hue of them:</p>
+  <p>If your photos or videos are too dark or the colors seem to be wrong, try
+  adjusting their saturation, contrast, brightness and hue:</p>
   
   <steps>
     <item>
      <p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.</p>
     </item> 
     <item>
-     <p>Under <gui>Image properties</gui>, change the sliders to find the best settings for your webcam.</p>
+     <p>Under <gui>Image properties</gui>, change the sliders to find the best
+     settings for your webcam.</p>
     </item>
     <item>
-     <p>Click <gui>Close</gui> and check to see if the picture looks OK now.</p>
+     <p>Click <gui>Close</gui> and check to see if the photos and videos look
+     better.</p>
     </item>
   </steps>
 
-<p>Here are some tips on using the different options under <gui>Image properties</gui> (from left to right): Applying brightness, contrast, hue and saturation.   <media type="image" src="figures/image-properties.png" width="800" height="150"/></p>
-
+  <figure>
+    <title>Different options under <gui>Image properties</gui> (left to right):
+    applying brightness, contrast, hue and saturation</title>
+    <media type="image" src="figures/image-properties.png" width="800" height="150"/>
+  </figure>
 
   <terms>
     <item>
      <title>Brightness</title>
-     <p>Increasing the brightness will make the picture lighter. If you are in a dark room, however, increasing the brightness might just make the picture look more "noisy" (covered in speckles).</p>
+     <p>Increasing the brightness will make the photos and videos lighter. However, if you are in a dark room, increasing the brightness might make the image look more noisy.</p>
     </item>
     <item>
      <title>Contrast</title>
-     <p>Choosing a higher contrast will make dark colors and lighter or neutral colors more distinct from one another. If the picture looks washed out, try increasing the contrast.</p>
+     <p>Setting a higher contrast will increase the difference between darker and lighter colors. If the image looks washed out, try increasing the contrast.</p>
     </item>
     <item>
      <title>Hue</title>
-     <p>Changing the hue of the picture will add a tint to it. If pictures seem to be the wrong color (for example, too yellow), try changing the hue.</p>
+     <p>Changing the hue of the image will add a tint to it. If image seems to be the wrong color (for example, too yellow), try changing the hue.</p>
     </item>
     <item>
      <title>Saturation</title>
-     <p>Reducing the saturation makes the picture less colorful. If colors seem too harsh, reduce the saturation.</p>
+     <p>Reducing the saturation makes the image less colorful. If colors seem too harsh, reduce the saturation.</p>
     </item>
   </terms>
 
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 50f70a1..66e898e 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -3,24 +3,41 @@
       id="introduction">
 
   <info>
-    <link type="guide" xref="index"  group="#first"/>
+    <link type="guide" xref="index" group="#first"/>
     <revision version="3.0" date="2011-08-24" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Introduction to the <app>Cheese Webcam Booth.</app></desc>
+    <desc>Introduction to the <app>Cheese Webcam Booth</app>.</desc>
   </info>
 
-<title>Introduction</title>
-
-  <p>Cheese is a fun webcam booth application which lets you take photos and record videos using your webcam. By using Cheese, you can make funny, original photos and videos that you can easily share with others. It can take multiple photos in quick succession (using <link xref="burst-mode">burst mode</link>), and lets you <link xref="apply-effects">apply effects</link> that add a special, fancy, or funny touch to your photos and videos.</p>
-
-<p>By default, Cheese starts in <gui>Photo Mode</gui>, ready to <link xref="take-photo">take a photo</link>. You need to switch to Video Mode to <link xref="record-video">record a video</link>, or switch to Burst Mode to <link xref="burst-mode">take multiple photos at once</link>.</p>
-
-<p>Cheese works with most webcams, but if your particular make and model doesn't seem to work properly, see <link xref="webcams">Webcams</link> for advice on getting it to function.</p>
+  <title>Introduction</title>
+
+  <p><app>Cheese</app> is a fun webcam booth application which lets you take
+  photos and record videos using your webcam. By using <app>Cheese</app>, you
+  can make funny, original photos and videos that you can easily share with
+  others. It can take multiple photos in quick succession (using the
+  <link xref="burst-mode"><gui>Burst mode</gui></link>) and lets you
+  <link xref="apply-effects">apply effects</link> that add a special, fancy or
+  funny touch to your photos and videos.</p>
+
+  <p>By default, <app>Cheese</app> starts in <gui>Photo mode</gui>, ready to
+  <link xref="take-photo">take a photo</link>. You need to switch to
+  <gui>Video mode</gui> to <link xref="record-video">record a video</link> or
+  switch to <gui>Burst mode</gui> to <link xref="burst-mode">take multiple
+  photos at once</link>.</p>
+
+  <p><app>Cheese</app> works with most webcams, but if your particular make and
+  model does not seem to work properly, see <link xref="webcams">Webcams</link>
+  for advice on getting it to work.</p>
 
 </page>
diff --git a/help/C/no-device.page b/help/C/no-device.page.stub
similarity index 91%
rename from help/C/no-device.page
rename to help/C/no-device.page.stub
index 056c275..8aed625 100644
--- a/help/C/no-device.page
+++ b/help/C/no-device.page.stub
@@ -2,8 +2,9 @@
       type="topic" style="task"
       id="no-device">
   <info>
-    <revision version="3.0" date="2011-08-24" status="incomplete"/>
     <link type="guide" xref="index#problems" group="#first"/>
+    <revision version="3.0" date="2011-08-24" status="incomplete"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
     
     <credit type="author copyright">
       <name>Julita Inca</name>
@@ -11,10 +12,10 @@
       <years>2011</years>
     </credit>
 
-    <desc>It started saying that it didn't recognize your webcam device.</desc>
+    <desc><app>Cheese</app> does not recognize your webcam.</desc>
   </info>
 
-  <title>Why does it say "No device found"?</title>
+  <title>I get a "No device found" error message</title>
 
 <comment>
  <cite>Phil Bull</cite>
diff --git a/help/C/record-video.page b/help/C/record-video.page
index 4c57b00..52c7ffd 100644
--- a/help/C/record-video.page
+++ b/help/C/record-video.page
@@ -2,15 +2,21 @@
       type="topic" style="task"
       id="record-video">
   <info>
-    <revision version="3.0" date="2011-08-25" status="candidate"/>
     <link type="guide" xref="index" group="#middle"/>
+    <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
     
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
-    <desc>Use your webcam to record short movies that you can share with friends.</desc>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
+
+    <desc>Use your webcam to record short movies for sharing with friends.</desc>
   </info>
 
   <title>Record a video</title>
@@ -18,21 +24,31 @@
   <p>To record a video using your webcam:</p>
 
   <steps>
-  	<item>
-  	 <p>Make sure that you are in <gui>Video Mode</gui>; if you are, the button in the middle of the window will say <gui>Start Recording</gui>.</p>
-  	 <p>You can switch to Video Mode by clicking the small film strip icon in the bottom left of the screen, or by clicking <guiseq><gui>Cheese</gui><gui>Video</gui></guiseq>.</p>
-  	</item>
     <item>
-     <p>Click <gui>Start Recording</gui>, or press the <key>spacebar</key>. Cheese will start recording from your webcam.</p>
+      <p>Make sure that you are in <gui>Video mode</gui>. If you are, the button
+      in the middle of the window will say <gui>Start Recording</gui>.</p>
+      <p>You can switch to <gui>Video mode</gui> by clicking the button in the
+      main window or by clicking <guiseq><gui>Cheese</gui><gui>Video</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Start Recording</gui>, or press the <key>spacebar</key>.
+      <app>Cheese</app> will start recording from your webcam.</p>
     </item>
     <item>
-     <p>To stop recording, click <gui>Stop Recording</gui> or press <key>Esc</key>.</p>
+     <p>To stop recording, click <gui>Stop Recording</gui> or press
+     <key>Esc</key>.</p>
     </item>
   </steps>
 
-<p>Videos are saved in the Ogg Theora (<file>.ogv</file>) format.</p>
+  <p>Videos are saved in the Ogg Theora (<file>.ogv</file>) format.</p>
 
-<p>After you've stopped recording, the video will automatically appear in the photo stream at the bottom of the Cheese window. From here, you can <link xref="view-photo">play back the video</link>, upload it to a social network, post it in your blog or YouTube channel, or share it with friends by <link href="ghelp:gnome-help/#web-default-email">email</link>.</p>  
-<p>If you have problems sharing a video with people using other operating systems (like Windows or Mac OS), you may need to <link href="ghelp:gnome-help/#video-sending">convert it to a different format</link>.</p>
+  <p>After you have stopped recording, the video will automatically appear in
+  the photo stream at the bottom of the <app>Cheese</app> window. From there,
+  you can <link xref="view-photo">play back the video</link>, upload it to a
+  social network, post it on your blog or YouTube channel, or share it with
+  friends by <link href="ghelp:gnome-help/#web-default-email">email</link>.</p>  
+  <p>If you have problems sharing a video with people using other operating
+  systems (like Windows or Mac OS), you may need to
+  <link href="ghelp:gnome-help/#video-sending">convert it to a different format</link>.</p>
 
 </page>
diff --git a/help/C/resolution-photo.page b/help/C/resolution-photo.page
index 70169c2..a3fb9f8 100644
--- a/help/C/resolution-photo.page
+++ b/help/C/resolution-photo.page
@@ -3,30 +3,45 @@
       id="resolution-photo">
   <info>
     <link type="guide" xref="index#advanced"/>
-	<revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>The resolution of a video or photo determines how much detail you can see in it.</desc>
+    <desc>The resolution of a video or photo determines how much detail you can
+    see in it, changing it will affect the file size.</desc>
 
   </info>
 
-  <title>Change the webcam resolution</title>
-
-<p>The resolution of a photo or video tells you how many <em>pixels</em> the picture is made up of. The higher the resolution, the more pixels, and the more detail you should be able to see. Higher resolution generally means better quality pictures.</p>
+  <title>Change the capture resolution of your webcam</title>
 
-<p>Photos and videos with higher resolution take up more space on your hard disk, however. High resolution videos, in particular, take up a lot of space.</p>
+  <p>Higher resolution generally means better quality images, but photos and
+  videos with higher resolution take up more space on your hard disk. High
+  resolution videos, in particular, take up a lot of space.</p>
 
-<p>If you want to save on disk space, reduce the resolution of your webcam. If you want better quality pictures, increase the resolution. To change the webcam resolution:</p>
+  <p>If you want your images to take up less disk space, reduce the resolution
+  of your webcam. If you want better quality images, increase the resolution. To
+  change the webcam resolution:</p>
 
   <steps>
-    <item><p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.</p></item>
-    <item><p>Choose a different <gui>resolution</gui> from the drop-down list. Some webcams only support one resolution, so you may not have a choice.</p></item>
-    <item><p>Click <gui>Close</gui>.</p></item>
+    <item>
+      <p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Choose a different resolution from the drop-down list. Some webcams
+      only support one resolution, so you may not have a choice.</p>
+    </item>
+    <item>
+      <p>Click <gui>Close</gui>.</p>
+    </item>
   </steps>
 
 </page>
diff --git a/help/C/save-photo.page b/help/C/save-photo.page
index 0b7dad7..1c629bc 100644
--- a/help/C/save-photo.page
+++ b/help/C/save-photo.page
@@ -3,26 +3,38 @@
       id="save-photo">
   <info>
     <link type="guide" xref="index"/>
-	<revision version="3.0" date="2011-08-25" status="review"/>
+    <revision version="3.0" date="2011-08-25" status="review"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Right-click the picture and click <gui>Save As</gui>.</desc>
+    <desc>Save a photo or video in a different folder.</desc>
   </info>
 
-<title>Save a photo or video in a different folder</title>
+  <title>Save a photo or video</title>
 
-<p>By default, Cheese saves the photos and videos that are in the photo stream in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> and <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folders in your Home folder.</p>
+  <p>By default, Cheese saves the photos and videos in the
+  <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> and
+  <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folders in your user
+  folder.</p>
 
-<p>To save a picture to a different location, right-click the picture in the photo stream and click <gui>Save As</gui>. Then, choose where you want to save the picture.</p>
+  <p>To save an image to a different location, right-click the image in the
+  photo stream and click <gui>Save As</gui>. Then, choose where you want to save
+  the image to.</p>
 
-<p>Alternatively, open the folder where you want to put the picture using the file manager, and then drag it from the photo stream into that folder.</p>
+  <p>Alternatively, open the folder where you want to keep the image using the
+  file manager, then drag it from the photo stream into that folder.</p>
 
-<!-- Please review this statement -->
-<p>A new copy of the picture will be saved in that location. The old version will remain in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folder.</p>
+  <p>A new copy of the image will be saved in the new location. The old version
+  will remain in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or
+  <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folder.</p>
 
 </page>
diff --git a/help/C/take-photo.page b/help/C/take-photo.page
index 59e9200..0b617fc 100644
--- a/help/C/take-photo.page
+++ b/help/C/take-photo.page
@@ -9,39 +9,53 @@
     <link type="seealso" xref="delete-photo"/>
     
     <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Take a photo to freeze any moment in life or record a video if you are really going to go back and watch it over and over.</desc>
+    <desc>Use your webcam to take photos instead of videos.</desc>
   </info>
 
-<title>Take photos with the webcam</title>
+  <title>Take photos with the webcam</title>
   
-<p>Webcams can be used to take still photos, as well as videos. To take a photo:</p>
-
-<steps>
- <item>
-  <p>Make sure that you're in Photo Mode. If you are, the button in the middle of the screen will say <gui>Take a Photo</gui>.</p>
-  <p>To switch to Photo Mode, click the small photo button in the bottom left of the window, or click <guiseq><gui>Cheese</gui><gui>Photo</gui></guiseq>.</p>
- </item>
- <item>
-  <p>Click <gui>Take a Photo</gui> or press the <key>Spacebar</key>.</p>
- </item>
- <item>
-  <p>There will be a short countdown, followed by a flash, and then the photo will appear in the <em>photo stream</em> at the bottom of the window.</p>
- </item>
-</steps>
-
-<p>The photos in the photo stream are automatically saved in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> folder in your Home folder. They are saved in the JPEG (<filename>.jpg</filename>) format.</p>
-
-<p>To cancel taking a photo after you have clicked <gui>Take a Photo</gui>, press <key>Esc</key> before the countdown finishes.</p>
-
-<note>
- <p>To take multiple photos in rapid succession, use <link xref="burst-mode">Burst Mode</link>.</p>
-</note>
+  <p>Webcams can be used to take still photos, as well as videos. To take a
+  photo:</p>
+
+  <steps>
+    <item>
+      <p>Make sure that you're in <gui>Photo mode</gui>. If you are, the button
+      in the main window will say <gui>Take a Photo</gui>.</p>
+      <p>To switch to <gui>Photo mode</gui>, click the small photo button in the
+      bottom left of the window or click <guiseq><gui>Cheese</gui>
+      <gui>Photo</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Take a Photo</gui> or press the <key>spacebar</key>.</p>
+    </item>
+    <item>
+      <p>There will be a short countdown, followed by a flash, and then the
+      photo will appear in the photo stream at the bottom of the window.</p>
+    </item>
+  </steps>
+
+  <p>The photos in the photo stream are automatically saved in the
+  <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> folder in your user
+  folder. They are saved in the JPEG (<filename>.jpg</filename>) format.</p>
+
+  <p>To cancel taking a photo after you have clicked <gui>Take a Photo</gui>,
+  press <key>Esc</key> before the countdown finishes.</p>
+
+  <note>
+   <p>To take multiple photos in rapid succession, use
+   <link xref="burst-mode">Burst mode</link>.</p>
+  </note>
 
 </page>
diff --git a/help/C/view-photo.page b/help/C/view-photo.page
index a85387d..78ef370 100644
--- a/help/C/view-photo.page
+++ b/help/C/view-photo.page
@@ -2,25 +2,34 @@
       type="topic" style="task"
       id="view-photo">
   <info>
-    <link type="guide" xref="index#photo-video"/>
+    <link type="guide" xref="index"/>
     <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
 
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
     <desc>Photos and videos will automatically appear in the photo stream.</desc>
   </info>
 
 
-<title>View a photo or video that you took</title>
+  <title>View a photo or video that you took</title>
 
-<p>After you take a photo or record a video, it will appear in the <em>photo stream</em> at the bottom of the window.</p>
+  <p>After you take a photo or record a video, it will appear in the photo
+  stream at the bottom of the window.</p>
 
-<p>If you want to see a bigger version of a photo, or play a video, double-click it. This will open it in the default photo viewer or video player.</p>
+  <p>If you want to see a bigger version of a photo, or to play a video,
+  double-click it. This will open it in the default photo viewer or video player.</p>
 
-<p>All of the photos and videos in the photo stream are saved in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folders in your Home folder.</p>
+  <p>All of the photos and videos in the photo stream are saved in the
+  <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or
+  <guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folders in your user folder.</p>
 
 </page>
diff --git a/help/C/webcams.page b/help/C/webcams.page.stub
similarity index 100%
rename from help/C/webcams.page
rename to help/C/webcams.page.stub
diff --git a/help/C/wide-mode.page b/help/C/wide-mode.page
index be298b0..16cbb5b 100644
--- a/help/C/wide-mode.page
+++ b/help/C/wide-mode.page
@@ -2,26 +2,44 @@
       type="topic" style="task"
       id="wide-mode">
   <info>
-	<revision version="3.0" date="2011-08-25" status="candidate"/>
-	<link type="guide" xref="index#advanced" group="#first"/>
+    <link type="guide" xref="index"/>
+    <revision version="3.0" date="2011-08-25" status="candidate"/>
+    <revision version="3.1" date="2011-09-05" status="review"/>
  
     <credit type="author copyright">
       <name>Julita Inca</name>
       <email>yrazes gmail com</email>
       <years>2011</years>
     </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756 gmail com</email>
+    </credit>
 
-    <desc>Change the position of the photo stream so that the webcam video feed is larger.</desc>
+    <desc>Change the position of the photo stream so that the webcam video feed
+    is larger.</desc>
   </info>
 
   <title>Make the webcam video preview bigger</title>
 
-<p>The <em>photo stream</em> is where photos and videos appear after you have taken/recorded them. By default, it is a horizontal strip at the bottom of the Cheese window.</p>
+  <p>The photo stream is where photos and videos appear after you have taken or
+  recorded them. By default, it is a horizontal strip at the bottom of the
+  <app>Cheese</app> window.</p>
   
-<p>You can make the photo stream appear as a vertical bar instead. This is useful if you have a wide computer screen that is not very high; switching to a vertical layout means that there is more room to display the video feed from the webcam.</p>
+  <p>You can make the photo stream appear as a vertical bar. This is useful if
+  you have a wide computer screen which is not very high; switching to a
+  vertical layout means that there is more room to display the video feed from
+  the webcam.</p>
 
-<p>To switch to a vertical layout, click <guiseq><gui>Cheese</gui><gui>Wide Mode</gui></guiseq>. To switch back to a horizontal layout, do the same thing.</p>
+  <p>To switch to a vertical layout, click <guiseq><gui>Cheese</gui>
+  <gui>Wide Mode</gui></guiseq>. To switch back to a horizontal layout, uncheck
+  the option.</p>
 
-<p>Another way of increasing the size of the webcam preview is to make Cheese fullscreen. To do this, click <guiseq><gui>Cheese</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</key>. You can get out of fullscreen mode, press <key>F11</key>.</p>
+  <note>
+    <p>Another way to increase the size of the webcam preview is to make
+    <app>Cheese</app> fullscreen. To do this, click
+    <guiseq><gui>Cheese</gui><gui>Fullscreen</gui></guiseq> or press
+    <key>F11</key>. To quit the fullscreen mode, press <key>F11</key>.</p>
+  </note>
 
 </page>
diff --git a/help/Makefile.am b/help/Makefile.am
index c48bab5..e239b58 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,17 +1,36 @@
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
-DOC_MODULE = cheese
-DOC_ENTITIES = legal.xml
+DOC_ID = cheese
+
 DOC_INCLUDES = 
 
 DOC_FIGURES = \
-	figures/cheese-effects.jpg \
-	figures/cheese-fullscreen.jpg \
-	figures/cheese-main.jpg \
-	figures/cheese-preferences.jpg \
-	figures/cheese-share.jpg \
-	figures/cheese-wide.jpg
+	figures/cheese.png \
+	figures/cheese-delete.png \
+	figures/cheese-effects.png \
+	figures/cheese-introduction.png \
+	figures/cheese-record.png \
+	figures/cheese-save.png \
+	figures/cheese-take.png \
+	figures/effects.png \
+	figures/image-properties.png \
+	figures/settings.png
 
-DOC_LINGUAS = ca cs de el en_GB es fi fr it ko nl oc pa pt_BR ru sl sv th zh_CN
+DOC_PAGES = \
+	apply-effects.page \
+	burst-mode.page \
+	delete-photo.page \
+	disable-countdown.page \
+	disable-flash.page \
+	image-properties.page \
+	index.page \
+	introduction.page \
+	record-video.page \
+	resolution-photo.page \
+	save-photo.page \
+	take-photo.page \
+	view-photo.page \
+	wide-mode.page
 
+DOC_LINGUAS = ca cs de el en_GB es fi fr it ko nl oc pa pt_BR ru sl sv th zh_CN
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]