2 files changed, 39 insertions, 12 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 9969b7b13..98ad599f2 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -672,8 +672,8 @@ information displayed.
 
 *Air/water temperatures*: Air and water temperatures during the dive are shown
 in these fields to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore not require further
-editing. If air temperature is not provided by the dive computer, the first temperature reading
+temperature information and this field may therefore contain information obtained from the dive computer.
+If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
@@ -697,7 +697,7 @@ at the appropriate place, the green bar disappears and the coordinates are
 stored.
 
 b. The user can obtain the coordinates from the _Subsurface_ Companion app if
-an Android device with GPS was used and the if the coordinates of the dive site
+an Android device with GPS was used and if the coordinates of the dive site
 were stored using that device.
 xref:S_Companion[Click here for more information]
 
@@ -843,6 +843,32 @@ with two types of weights: integrated as well as a weight belt:
 
 image::images/WeightsDataEntry3.jpg["FIGURE: A completed weights information table",align="center"]
 
+==== Editing several selected dives simultaneously
+
+After uploading dives from
+a dive computer, the dive profiles of the uploaded dives are shown in the *Dive profile* tab, as well
+as a few items of information
+in the *Dive Notes* tab (e.g. water temperature) and in the *Equipment* tab (e.g. gas pressures
+and gas composition). However the other fields remain empty.
+It may be useful to simultaneously edit some of the
+fields in the *Dive Notes* and *Equipment* tabs.  For instance, it is possible
+that a diver performed several dives during a single day, using identical equipment while diving at the same
+dive site or with the same dive master and/or buddy or tags. Instead of completing the information for each
+of these dives separately, one can select all the dives for that day in the *Dive List* and
+insert the same information in the *Dive Notes* and *Equipment* fields that need
+identical information. This is achieved by editing the dive notes or the equipment for any one
+of the selected dives.
+
+The simultaneous editing only works with fields that do not already contain information.
+This means that, if some fields have been edited for a particular dive among the selected dives,
+these are not changed while
+editing the dives simultaneously. Technically, the rule for editing several dives simultaneously is:
+if the data field being edited contains _exactly the same information_ for all the dives that have been
+selected, the new, edited information is substituted for all the selected dives, otherwise only the
+edited dive is
+changed, even though several dives have been selected in the *Dive List*. This greatly speeds
+up the completion of the dive log after several similar dives.
+
 ==== Adding Bookmarks to a dive
 
 Many divers wish to annotate their dives with text that indicate particular events
@@ -1977,8 +2003,8 @@ Export dialog (image *B* above).
 ** Subsurface Numbers: if this option is checked, the dive(s) are exported with the
 numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered
 starting from 1.
-** Minimum Javascript: This will minimize the Javascript produced with the file,
-some functionality will be lost.
+** Export Yearly Statistics: if this option is checked, a yearly statistics table will
+be attached with the HTML exports.
 ** Export List only: a list of dives will only be exported and the detailed dive
 information will not be available.
 
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index 515402c0f..dfb8a105c 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -1383,10 +1383,11 @@ perfil de la inmersión. Si está en un rango de 30 minutos, sí se muestra.
 
 === Visualizar las imágenes
 
-Después que las imágenes han sido cargadas aparecen en la pestaña _Fotos_ del
-panel *Notas de Inmersión*. También aparecen como pequeños iconos en el perfil
-de inmersión en las posiciones apropiadas reflejando la hora en que se tomó cada
-fotografía. Ver a continuación:
+Después que las imágenes han sido cargadas aparecen en dos lugares:
+
+ - La pestaña _Fotos_ del panel _Notas de la inmersión_.
+ - Como pequeños iconos (chinchetas) sobre el perfil de inmersión, en posiciones
+ que relejan la hora en que se tomó cada fotografía. Ver a continuación:
 
 image::images/LoadImage4.jpg["FIGURA: Fotos sobre un perfil de inmersión",align="center"]
 
@@ -1395,14 +1396,14 @@ de la foto. Ver imagen a continuación:
 
 image::images/LoadImage5.jpg["FIGURA: Foto reducida sobre perfil de inmersión",align="center"]
 
+Si hacemos clic sobre la imagen reducida aparecerá la fotografía a tamaño
+completo sobre la ventana de _Subsurface_. Esto permite una buena visión de las
+fotos que han sido importadas. Ver imagen a continuación.
 Cada imagen reducida tiene una pequeña papelera en su esquina superior
 izquierda (ver imagen anterior). Si se selecciona la papelera, la foto se
 borra de la inmersión, así pues, hay que tener un poco de cuidado al clicar
 sobre las imágenes. Las imágenes  también puede borrase desde la pestaña _Fotos_
 (ver en el siguiente punto).
-Si hacemos clic sobre la imagen reducida aparecerá la fotografía a tamaño
-completo sobre la ventana de _Subsurface_. Esto permite una buena visión de las
-fotos que han sido importadas. Ver imagen a continuación.
 
 image::images/LoadImage6.jpg["FIGURA: Foto a pantalla completa sobre el perfil de inmersión",align="center"]