[pitivi] help: merge makeselections.page and grouping.page as "selectiongrouping.page"

[Jean-François Fortin Tam <jfft src gnome org>]

commit 203703e27a1bc963b9cd78281c21f10eed140ce4
Author: Tomas Karger <tomkarger gmail com>
Date:   Sat Feb 22 16:07:35 2014 +0100

    help: merge makeselections.page and grouping.page as "selectiongrouping.page"
    
    Also update links pointing to makeselections.page

 help/C/grouping.page           |   47 ---------------------------
 help/C/makeselections.page     |   49 ----------------------------
 help/C/movearoundtimeline.page |    2 +-
 help/C/selectiongrouping.page  |   69 ++++++++++++++++++++++++++++++++++++++++
 help/C/usingclips.page         |    2 +-
 help/Makefile.am               |    3 +-
 6 files changed, 72 insertions(+), 100 deletions(-)
---
diff --git a/help/C/movearoundtimeline.page b/help/C/movearoundtimeline.page
index 17e14dc..54b1448 100644
--- a/help/C/movearoundtimeline.page
+++ b/help/C/movearoundtimeline.page
@@ -69,7 +69,7 @@
        <p>You can change the position of the playhead by clicking anywhere on the ruler or on the 
timeline.</p>
        <p>When clicking on the <em>timeline</em>:</p>
        <list>
-        <item><p>If a clip is under the mouse cursor, it will replace the current clip selection (see the 
<link xref="makeselections">Selecting multiple items</link> section for more detailed 
instructions).</p></item>
+        <item><p>If a clip is under the mouse cursor, it will replace the current clip selection (see the 
<link xref="selectiongrouping">Making selections</link> section for more detailed instructions).</p></item>
         <item><p>If there is no clip under the cursor, all selected clips (if any) will be 
deselected.</p></item>
        </list>
        <p>When clicking on the ruler, only the playhead's position changes; clip selections are not 
affected.</p>
diff --git a/help/C/selectiongrouping.page b/help/C/selectiongrouping.page
new file mode 100644
index 0000000..0edb307
--- /dev/null
+++ b/help/C/selectiongrouping.page
@@ -0,0 +1,69 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      xmlns:e="http://projectmallard.org/experimental/";
+      type="topic"
+      id="selectiongrouping">
+
+  <info>
+    <link type="guide" xref="index#timeline"/>
+    <revision pkgversion="0.92" version="0.1" date="2014-02-22" status="complete"/>
+    <credit type="author">
+      <name>Tomáš Karger</name>
+      <email>tomkarger gmail com</email>
+    </credit>
+    <credit type="contributor">
+      <name>Jean-François Fortin Tam</name>
+      <email>nekohayo gmail com</email>
+      <name>Mario Blättermann</name>
+      <email>mariobl gnome org</email>
+    </credit>
+    <desc>
+      Making selections and grouping clips in timeline.
+    </desc>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+    <title>Selection and grouping</title>
+    
+    <section>
+      <title>Making selections</title>
+       <p>To select a file or a clip in <app>Pitivi</app>, click it. Multiple selections allow you to apply 
actions (dragging, deleting, grouping, etc.) to many clips at once.</p>
+       <p>Selecting multiple adjacent items:</p>
+       <steps>
+        <item><p>Click the first item.</p></item>
+        <item><p>Hold the <key>Shift</key> key.</p></item>
+        <item><p>Click the last item.</p></item>
+       </steps>
+       <p>Selecting multiple nonadjacent items:</p>
+       <steps>
+        <item><p>Hold down the <key>Ctrl</key> key.</p></item>
+        <item><p>Click on all the items you want to select.</p></item>
+       </steps>
+       <p>You can deselect an individual item by clicking on it again with the <key>Ctrl</key> key held 
down. This can be used in conjunction with the <em>Selecting multiple adjacent items</em> technique above.</p>
+     </section>
+     <section>
+         <title>Grouping and ungrouping clips</title>
+        <p>The grouping and ungrouping functions are useful when you want to add or separate audio tracks 
from video clips, or when you want to create a block of clips that you can select, edit and move all at 
once.</p>
+     </section>
+
+      <section>
+      <title>Grouping clips in timeline</title>
+        <list>
+        <item><p>Select multiple clips in the timeline (see the <link xref="makeselections">Selecting 
multiple items</link> section for more detailed instructions).</p></item>
+        <item><p>Click the <gui>Group clips</gui> button on the timeline toolbar.</p></item>
+        </list>
+        <p>You can now select, edit and move the clips all at once.</p>
+      </section>
+
+      <section>
+      <title>Ungrouping clips in timeline</title>
+        <list>
+        <item><p>Select a group of clips in the timeline.</p></item>
+        <item><p>Click the <gui>Ungroup clips</gui> button on the timeline toolbar.</p></item>
+        </list>
+        <p>You can now select, edit and move the clips independently.</p>
+      </section>
+
+
+</page>
diff --git a/help/C/usingclips.page b/help/C/usingclips.page
index 851a34f..869f09e 100644
--- a/help/C/usingclips.page
+++ b/help/C/usingclips.page
@@ -53,7 +53,7 @@
        <p>You can move a clip within a layer or move it to a different layer.</p>
        <p>Click and drag a single clip to move it, and release the mouse button to place it. Dragging 
horizontally keeps the clip on the same layer, but dragging it vertically moves the clip to a different layer 
(see <link xref="layers">Understanding layers</link> for more information).</p>
        <p>To move a clip to an existing layer, drag it on the layer and release it when a grey shadow 
representing the space the clip would occupy appears. To move a clip to a new layer, drag it to the middle 
space between two existing layers. Once the grey shadow (now a thin rectangle) appears between the layers, 
release it.</p>
-       <p>To move multiple clips at the same time, use the <key>Ctrl</key> or <key>Shift</key> keys to 
select multiple clips (see <link xref="makeselections">Making selections</link> for more details). Selected 
clips do not need to be on the same layer. Then, drag the clips just as you would do for a single clip; their 
position relative to each other will be preserved.</p>
+       <p>To move multiple clips at the same time, use the <key>Ctrl</key> or <key>Shift</key> keys to 
select multiple clips (see <link xref="selectiongrouping">Selection and grouping</link> for more details). 
Selected clips do not need to be on the same layer. Then, drag the clips just as you would do for a single 
clip; their position relative to each other will be preserved.</p>
       <section>
        <title>Using ripple editing while moving clips</title>
         <p>While dragging clips around in the timeline, you can use the <link xref="trimming">ripple 
technique</link> to move the <em>following</em> clips (the clips that start after the one you're directly 
editing) to fill the gap.</p>
diff --git a/help/Makefile.am b/help/Makefile.am
index 5382b2b..e64b923 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -28,7 +28,6 @@ HELP_FILES = \
     effects.page \
     effectsanimation.page \
     fadeinfadeout.page \
-    grouping.page \
     gstreamer.page \
     importingmpegts.page \
     importing.page \
@@ -38,13 +37,13 @@ HELP_FILES = \
     layers.page \
     license.page \
     mainwindow.page \
-    makeselections.page \
     medialibrary.page \
     movearoundtimeline.page \
     othertransitions.page \
     presets.page \
     rendering.page \
     savescreenshot.page \
+    selectiongrouping.page \
     selectunusedfiles.page \
     splitting.page \
     sysreq.page \