8 files changed, 34 insertions, 18 deletions
diff --git a/Documentation/images/DivePlanner2_f20.jpg b/Documentation/images/DivePlanner2_f20.jpg
deleted file mode 100644
index 9f2a5d149..000000000
--- a/Documentation/images/DivePlanner2_f20.jpg
+++ /dev/null
diff --git a/Documentation/images/PlannerWindow1_f20.jpg b/Documentation/images/PlannerWindow1_f20.jpg
index 5e57a3107..f2035d04e 100644..100755
--- a/Documentation/images/PlannerWindow1_f20.jpg
+++ b/Documentation/images/PlannerWindow1_f20.jpg
diff --git a/Documentation/images/Planner_OC_deco_VPM.jpg b/Documentation/images/Planner_OC_deco_VPM.jpg
new file mode 100755
index 000000000..567ba7840
--- /dev/null
+++ b/Documentation/images/Planner_OC_deco_VPM.jpg
diff --git a/Documentation/images/Planner_OC_rec.jpg b/Documentation/images/Planner_OC_rec.jpg
new file mode 100755
index 000000000..cad936ea4
--- /dev/null
+++ b/Documentation/images/Planner_OC_rec.jpg
diff --git a/Documentation/images/rec_diveplan.jpg b/Documentation/images/rec_diveplan.jpg
deleted file mode 100644
index fbafc0155..000000000
--- a/Documentation/images/rec_diveplan.jpg
+++ /dev/null
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 6f73e7a55..66d23b124 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4,7 +4,7 @@
 // Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
 // Ferguson, Salvador Cuñat, Pedro Neves
 // :revnumber: 4.6
-// :revdate: January 2017
+// :revdate: March 2017
 :icons:
 :toc2:
 :toc-placement: manual
@@ -16,9 +16,10 @@ image::images/Subsurface4Banner.jpg["Banner",align="center"]
 [big]#USER MANUAL#
 
 *Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
-Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves
+Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,
+Stefan Fuchs
 
-[blue]#_Version 4.6, January 2017_#
+[blue]#_Version 4.6, March 2017_#
 
 Welcome as a user of _Subsurface_, an advanced dive logging program with
 extensive infrastructure to describe, organize, interpret and print scuba
@@ -3318,7 +3319,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page",align="center"]
    respect to inert gas loading and the deeper the ceilings are. Gradient
    factors of 20/60 are considered conservative and values of 70/90 are considered
    harsh.
-   In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
+   In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
    deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
    GF_Low is used between the deepest dive depth and the first deco stop, after which the
    gradient factor linearly increases up to the GF_High value at the surface. For more information see:
@@ -3491,7 +3492,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window",align
  *  The most efficient way to create a dive profile is to enter the appropriate values into the table
     marked _Dive planner points_. The first line of the table represents the duration and the final
     depth of the descent from the surface. Subsequent segments describe the bottom phase of the dive.
-    The _CC set point_ column is only relevant for closed circuit divers.
+    The _CC setpoint_ column is only relevant for closed circuit divers.
     The ascent is usually not specified because this is what the planner is supposed to calculate.
     Add additional segments to the profile by selecting the "+" icon at the top right hand of the
     table. Segments entered into the _Dive planner points_ table automatically appear in the *Dive
@@ -3562,7 +3563,7 @@ Below is an image of a dive plan for a recreational dive at 30 meters. Although
 minutes, the duration of the dive is limited by the amount of air in the cylinder. That is shown in the
 text box at the bottom right of the panel, requiring sufficient air for buddy-sharing during ascent.
 
-image::images/rec_diveplan.jpg["FIGURE: A recreational dive plan: setup",align="center"]
+image::images/Planner_OC_rec.jpg["FIGURE: A recreational dive plan: setup",align="center"]
 
 ==== Non-recreational open circuit dives, including decompression
 
@@ -3606,7 +3607,7 @@ in the _Rates_ section of the dive setup.
 pressure for oxygen needs to be specified for the
 bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_).
 Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
-stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
+stages. Normally, a partial pressure of 1.6 bar is not exceeded. pO₂ settings and the depth at which switching to a gas takes place can also be edited in the
 _Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during
 ascent, the partial pressure of the new gas has decreased to 1.6 bar.
 
@@ -3626,6 +3627,21 @@ if you exceeds the total amount of gas available. Good practice demands that div
 the limit of the gas supply but that an appropriate reserve is kept
 for unforeseen circumstances.
 For technical diving, this reserve can be up to 66% of the total available gas.
+In addition to calculating the total gas consumption for every cylinder the planner provides one way
+of calculating the recommended volume of bottom gas which is needed for safe asscent to the
+first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom"
+consideration and it is used by various (but not all)
+technical diving organisations. The calculation assumes that in worst case an out of gas (OoG)
+situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces
+the buddy team the share the gas of one diver and to stay at maximum depth for an additional
+time of n minutes (preferences option "problem solving time").
+At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option
+"SAC factor") compared to the SAC factor of a single diver under normal conditions.
+The result of the minimum gas calculation for the bottom gas is printed to the planner output as an
+additional information. No automatic checks are performed based on this result.
+Please take care that the feature only gives valid results for simple, rectengular shaped single
+level dive profiles. For multi level dives one would need to check every leg of the profile independantly.
+
 
 Now you can start the detailed time-depth planning of the dive. _Subsurface_ offers an unique
 graphical interface for doing planning. The mechanics are
@@ -3659,7 +3675,7 @@ the surface. These changes can be deleted by right-clicking the gas change and
 manually creating a gas change by right-clicking on the appropriate
 waypoint.
 
-A non-zero value in the "CC set point" column of the table of dive planner points
+A non-zero value in the "CC setpoint" column of the table of dive planner points
 indicates a valid setpoint for oxygen partial pressure and that the segment
 is dived using a closed circuit rebreather (CCR). If the last manually entered
 segment is a CCR segment, the decompression phase is computed assuming the diver
@@ -3668,10 +3684,10 @@ short) is on open circuit (OC, indicated by a zero set-point) the
 decompression is computed in OC mode and the planner only considers gas
 changes in OC mode.
 
-Below is an example of a dive plan to 45m using EAN26, followed by an ascent using EAN50
-and using the settings as described above.
+Below is an example of a dive plan to 45m using Tx21/35, followed by an ascent using EAN50
+and oxygen and using the settings as described above.
 
-image::images/DivePlanner2_f20.jpg["FIGURE: Planning a dive: setup",align="center"]
+image::images/Planner_OC_deco_VPM.jpg["FIGURE: Planning a dive: setup",align="center"]
 
 Once the above steps have been completed, save by clicking the _Save_ button
 towards the top middle of the planner. The saved dive plan will appear
@@ -4540,7 +4556,7 @@ according to which spreadsheet program is used.
 Organize the diving data in the spreadsheet, so the first row
 contains the names (or titles) of each column and the information for each dive is stored in a single row.
 _Subsurface_ supports many data items (Dive number, Date,
-Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).
+Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight and Tags).
 Organize dive data following a few simple rules:
 
 1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index 5e61fc5f6..de8551d45 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -3557,7 +3557,7 @@ gestión del oxígeno:
 
 ** CCR Options: Estas opciones determinan la gestión del oxigeno en
 inmersiones con CCRs
-*** _Set point por defecto en el Planificador_: Especifica el setpoint de O~2~
+*** _Setpoint por defecto en el Planificador_: Especifica el setpoint de O~2~
     de una planificación con CCR. Este dertermina la pO~2~ a mantener durante el
     buceo. Se pueden añadir cambios a lo largo de la inmersión desde el menú
     contextual.
@@ -3806,7 +3806,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURA: Ventana de inicio del planificador
    apropiados en la tabla llamada _Puntos del planificador de inmersiones_.
    La primera línea de la tabla representa la duración y profundidad final
    de un descenso desde superficie. Los segmentos siguientes describirán la
-   fase de fondo de la inmersión. La columna _CC set point_ solo es relevante
+   fase de fondo de la inmersión. La columna _CC setpoint_ solo es relevante
    para para buceadores en circuito cerrado.
    El ascenso, normalmente, no se especifica, ya que esto es lo que se supone
    que el planificador debe calcular.
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 12d5bba5c..14adde3f0 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -3498,7 +3498,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"]
    respect to inert gas loading and the deeper the ceilings are. Gradient
    factors of 20/60 are considered conservative and values of 70/90 are considered
    harsh.
-   In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
+   In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
    deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
    GF_Low is used between the deepest dive depth and the first deco stop, after which the
    gradient factor linearly increases up to the GF_High value at the surface. For more information see:
@@ -3684,7 +3684,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
     values into the table marked _Dive planner points_. The first line of the
     table represents the duration and the final depth of the descent from the
     surface. Subsequent segments describe the bottom phase of the dive.  The _CC
-    set point_ column is only relevant for closed circuit divers.  The ascent is
+    setpoint_ column is only relevant for closed circuit divers.  The ascent is
     usually not specified because this is what the planner is supposed to
     calculate.  Add additional segments to the profile by selecting the "+" icon
     at the top right hand of the table. Segments entered into the _Dive planner
@@ -3819,7 +3819,7 @@ maximal descent rate specified in the _Rates_ section of the dive setup.
 pressure for oxygen needs to be specified for the
 bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_).
 Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
-stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
+stages. Normally, a partial pressure of 1.6 bar is not exceeded. pO₂ settings and the depth at which switching to a gas takes place can also be edited in the
 _Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during
 ascent, the partial pressure of the new gas has decreased to 1.6 bar.
 
@@ -3875,7 +3875,7 @@ switches will be suggested during the ascent to the surface. These changes
 can be deleted by right-clicking the gas change and manually creating a gas
 change by right-clicking on the appropriate waypoint.
 
-A non-zero value in the "CC set point" column of the table of dive planner
+A non-zero value in the "CC setpoint" column of the table of dive planner
 points indicates a valid setpoint for oxygen partial pressure and that the
 segment is dived using a closed circuit rebreather (CCR). If the last
 manually entered segment is a CCR segment, the decompression phase is