[pitivi] help: merge saveproject.page and projectsettings.page as "workwithprojects.page"

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

commit d2ef8c32146e3d7bc3696dd98a13ec658bbc9c61
Author: Tomas Karger <tomkarger gmail com>
Date:   Tue Feb 18 16:22:37 2014 +0100

    help: merge saveproject.page and projectsettings.page as "workwithprojects.page"
    
    Also update links that pointed to saveproject.page

 help/C/saveproject.page                            |   36 --------------------
 help/C/selectunusedfiles.page                      |    2 +-
 ...{projectsettings.page => workwithprojects.page} |   22 ++++++++++--
 help/Makefile.am                                   |    5 +--
 4 files changed, 22 insertions(+), 43 deletions(-)
---
diff --git a/help/C/selectunusedfiles.page b/help/C/selectunusedfiles.page
index eb223c8..0cfff98 100644
--- a/help/C/selectunusedfiles.page
+++ b/help/C/selectunusedfiles.page
@@ -6,7 +6,7 @@
   <info>
     <link type="seealso" xref="medialibrary"/>
     <link type="seealso" xref="usingclips"/>
-    <link type="seealso" xref="saveproject"/>
+    <link type="seealso" xref="workwithprojects"/>
     <revision pkgversion="0.14.2" version="0.2" date="2011-08-15" status="complete"/>
     <credit type="author">
       <name>Jean-François Fortin Tam</name>
diff --git a/help/C/projectsettings.page b/help/C/workwithprojects.page
similarity index 65%
rename from help/C/projectsettings.page
rename to help/C/workwithprojects.page
index 6eafc38..76ed5e7 100644
--- a/help/C/projectsettings.page
+++ b/help/C/workwithprojects.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:e="http://projectmallard.org/experimental/";
       type="topic"
-      id="editsettings">
+      id="workwithprojects">
 
   <info>
     <link type="guide" xref="index#gettingstarted"/>
@@ -13,19 +13,35 @@
     <credit type="contributor">
       <name>Mario Blättermann</name>
       <email>mariobl gnome org</email>
+      <name>Tomáš Karger</name>
+      <email>tomkarger gmail com</email>
     </credit>
     <desc>
-      How to specify the global project resolution, framerate, aspect ratio, audio settings and project 
metadata.
+      How to load and save projects, edit their settings and metadata.
     </desc>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
   </info>
 
-    <title>Editing project settings</title>
+    <title>Working with projects</title>
 
+    <section>
+    <title>Saving a project</title>
+     <p>To save your project work, use the <guiseq><gui>Project</gui><gui>Save</gui></guiseq> menu, the Save 
button on the main toolbar or press <keyseq><key>Ctrl</key><key>S</key></keyseq>.</p>
+      <p>When you save a project for the first time, a dialog window appears, asking you where to save the 
project file and how to name it.</p>
+      <p>If you want to save your project as a different file, use <guiseq><gui>Project</gui><gui>Save 
as</gui></guiseq> or press <keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>. This can be used to 
create different versions of your project.</p>
+    </section>
+    <section>
+        <title>Reverting changes</title>
+        <p>In addition to undoing individual changes, you can also decide to revert all the changes you have 
made since the last time you saved your project. To do so, use 
<guiseq><gui>Project</gui><gui>Revert</gui></guiseq>.</p>
+    </section>
+
+    <section>
+    <title>Editing project settings</title>
     <p>When starting a new project, you should make sure to go adjust the project settings, such as 
framerate, resolution and preferred codecs. The video resolution and aspect ratio will affect the appearance 
of the previewer. If you do not set the resolution and aspect ratio to match those of your footage, the video 
may look squished or letterboxed.</p>
     <p>To edit the project settings after initial creation, use the <guiseq><gui>Edit</gui><gui>Project 
Settings</gui></guiseq> menu.</p>
+    </section>
 
     <section>
         <title>Pixel aspect ratio vs display aspect ratio</title>
diff --git a/help/Makefile.am b/help/Makefile.am
index 930ba4e..5382b2b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -43,16 +43,15 @@ HELP_FILES = \
     movearoundtimeline.page \
     othertransitions.page \
     presets.page \
-    projectsettings.page \
     rendering.page \
-    saveproject.page \
     savescreenshot.page \
     selectunusedfiles.page \
     splitting.page \
     sysreq.page \
     trimming.page \
     usingclips.page \
-    welcomedialog.page
+    welcomedialog.page \
+    workwithprojects.page
 
 HELP_LINGUAS = cs de el es fr sl uk