[gnome-terminal] Update tab help for 3.12

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit d51870ac9eb0bd6ea4d9736761ce32a65d0f3132
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Wed Feb 26 19:08:35 2014 +0000

    Update tab help for 3.12
    
    Remove tab renaming, see bug 720693. Add tab preferences in new page.

 help/C/gs-tabs.page         |   42 +++++++++++++++++++++-------------------
 help/C/pref-tab-window.page |   44 +++++++++++++++++++++++++++++++++++++++++++
 help/Makefile.am            |    1 +
 3 files changed, 67 insertions(+), 20 deletions(-)
---
diff --git a/help/C/gs-tabs.page b/help/C/gs-tabs.page
index a3ddf51..35c5723 100644
--- a/help/C/gs-tabs.page
+++ b/help/C/gs-tabs.page
@@ -1,25 +1,27 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:its="http://www.w3.org/2005/11/its";
       type="guide"
       id="gs-tabs">
 
   <info>
-    <revision version="0.1" date="2013-02-17" status="candidate"/>
     <link type="guide" xref="index#getting-started"/>
     <link type="seealso" xref="pref-title"/>
+    <revision pkgversion="3.8" date="2013-02-17" status="candidate"/>
+    <revision pkgversion="3.12" date="2014-02-26" status="candidate"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
-      <email>sindhus live in</email>
+      <email its:translate="no">sindhus live in</email>
       <years>2013</years>
     </credit>
     <credit type="copyright editor">
       <name>Ekaterina Gerasimova</name>
-      <email>kittykat3756 gmail com</email>
+      <email its:translate="no">kittykat3756 gmail com</email>
       <years>2013</years>
     </credit>
     <credit type="copyright editor">
       <name>Michael Hill</name>
-      <email>mdhillca gmail com</email>
+      <email its:translate="no">mdhillca gmail com</email>
       <years>2013</years>
     </credit>
 
@@ -28,14 +30,14 @@
     <desc>Add, remove and reorder <app>Terminal</app> tabs.</desc>
   </info>
 
-  <title>Manage tabs</title>
+  <title>Use tabs</title>
 
-  <p>The tab bar appears at the top a <app>Terminal</app> window that has
-  multiple tabs open (it looks like a row of buttons). Click on a tab to switch 
-  to the corresponding tab. You can open multiple tabs to manage your work in
-  <app>Terminal</app>. This will allow you to multi-task with activities such
-  as running programs, browsing directories and editing text files in a single
-  <app>Terminal</app> window.</p>
+  <p>The tab bar is shown at the top a <app>Terminal</app> window that has
+  multiple tabs open (it looks like a row of buttons). Click on a tab to switch
+  to it. You can open multiple tabs to manage your work in <app>Terminal</app>.
+  This will allow you to multi-task with activities such as running programs,
+  browsing directories and editing text files in a single <app>Terminal</app>
+  window.</p>
 
   <section id="add-tab">
     <title>Open a new tab</title>
@@ -43,16 +45,14 @@
     <p>To open a new tab inside your current <app>Terminal</app> window:</p>
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">File</gui> <gui
-        style="menuitem">Open tab</gui></guiseq>.</p>
+        <p>Press
+        <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>.</p>
       </item>
     </steps>
 
-    <p>Alternatively, to open a new tab you can press
-    <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>.</p>
-
   </section>
 
+<!-- TODO: doesn't work, see bug 720693
   <section id="rename-tab">
     <title>Rename a tab</title>
 
@@ -79,23 +79,25 @@
         <p>Click <gui style="button">OK</gui>.</p>
       </item>
     </steps>
-  </section>
+  </section>-->
 
   <section id="close-tab">
     <title>Remove a tab</title>
 
     <p>To close an existing tab inside your current <app>Terminal</app>
     window:</p>
+
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">File</gui>
-       <gui style="menuitem">Close Tab</gui></guiseq>.</p>
+        <p>Select
+        <guiseq><gui style="menu">File</gui><gui style="menuitem">Close
+        Tab</gui></guiseq>.</p>
       </item>
     </steps>
 
     <p>Alternatively, you can click on the <gui style="button">×</gui> in the
     top right corner of the tab or right click on the tab and select
-    <gui style="menuitem">Close Tab</gui>.</p>
+    <gui style="menuitem">Close Terminal</gui>.</p>
 
   </section>
 
diff --git a/help/C/pref-tab-window.page b/help/C/pref-tab-window.page
new file mode 100644
index 0000000..ca0cb55
--- /dev/null
+++ b/help/C/pref-tab-window.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      xmlns:its="http://www.w3.org/2005/11/its";
+      type="guide"
+      id="pref-tab-window">
+
+  <info>
+    <link type="guide" xref="index#appearance"/>
+    <link type="seealso" xref="gs-tabs"/>
+    <revision pkgversion="3.12" date="2014-02-26" status="review"/>
+
+    <credit type="author copyright">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756 gmail com</email>
+      <years>2014</years>
+    </credit>
+    <!--<credit type="copyright editor">
+      <name></name>
+      <email its:translate="no"></email>
+      <years></years>
+    </credit>-->
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+    <desc>Choose whether to open a new window or a new tab by default.</desc>
+  </info>
+
+  <title>Windows and tabs</title>
+
+  <p>You can chose whether to open a new tab or a new <app>Terminal</app>
+  window when you use <gui style="menuitem">Open Terminal</gui>.</p>
+
+  <steps>
+    <item>
+      <p>Select
+      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
+      Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Set <gui>Open new terminals in:</gui> to <gui>Tab</gui> or
+      <gui>Window</gui>.</p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index f9c1174..a87045f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -32,6 +32,7 @@ HELP_FILES = \
        pref-menubar.page \
        pref-profiles.page \
        pref-scrolling.page \
+       pref-tab-window.page \
        pref-title.page \
        profile.page \
        prob-reset.page \