On 30/01/2015 20:30, Miika Turkia wrote:
On Fri, Jan 30, 2015 at 8:26 PM, Willem Ferguson
<[email protected]
<mailto:[email protected]>> wrote:
On 30/01/2015 19:02, Miika Turkia wrote:
There are a couple of broken links / references on our user
manual. I looked at the first one but couldn't figure out where
it should be pointing to..so I am now trying to delegate the
fixing of them to Willem :D
Following x-refs are used but the destination is missing:
S_ExtraTab
S_InfoBox
S_ImportingManualCSV
miika
_______________________________________________
subsurface mailing list
[email protected]
<mailto:[email protected]>
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Easy because I understand the layout. Will respond, just waiting
for the latest release that applies current patches (ios
companion, dive planner) to the manual.
One more broken link appeared after I pulled the latest sources (of
course this was still without the very latest patches)
_appendix_b_dive_computer_specific_information_for_importing_dive_information
BTW, if you run make on Documentation directory, and then the xmllint
command given in the error message, you get to see the broken links
yourself.
miika
Miika, thank you so much for some more Miika magic! Hope this merges ok
since I used the SHA of a patch that has not been pushed yet.
xmllint does not work on my machine: it is a known bug with asciidoc
(actually a2x). When I run a2x I need a flag that switches xmllint off!!
Anyway, here is a patch that resolves these cases. I checked all of the
changes that they link correctly in the HTML version. I have also
checked all the xref: occurrences in the manual and they all appear to
be ok. Thank you again.
Kind regards,
willem
>From 019ae7a5c2fed8bff7133c530b333bb37540241c Mon Sep 17 00:00:00 2001
From: willem ferguson <[email protected]>
Date: Fri, 30 Jan 2015 21:44:13 +0200
Subject: [PATCH] User-manual: Unresolved references
Fix four unresolved references in the user-manual
Signed-off-by: willem ferguson <[email protected]>
---
Documentation/user-manual.txt | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index cfed3cb..16fd5b3 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1745,7 +1745,7 @@ case there is good agreement from the readings of the two oxygen sensors.
image::images/CCR_dive_profile_f20.jpg["FIGURE: CCR dive profile",align="center"]
_Equipment-specific information_: Equipment-specific information gathered by
-_Subsurface_ is shown in the xref:S_ExtraTab[Extra data tab]. This may include setup information
+_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may include setup information
or metadata about the dive.
More equipment-specific information for downloading CCR dive logs for
@@ -1768,6 +1768,7 @@ _Subsurface_ calculates SAC and Gas consumption taking in account gas
incompressibility, particularly at tank pressures above 200 bar, making them more accurate.
Users should refer to xref:SAC_CALCULATION[Appendix D] for more information.
+[[S_ExtraDataTab]]
=== The *Extra Data* tab (usually for individual dives)
When using a dive computer, it often reports several data items that cannot easily be
@@ -2002,6 +2003,7 @@ an existing marker a menu appears, adding options to allow deletion of the
marker or to allow all markers of that type to be hidden. Hidden events can be
restored to view by selecting Unhide all events from the context menu.
+[[S_InfoBox]]
=== The *Information Box*
The Information box displays a large range of information pertaining to the dive
@@ -3239,6 +3241,7 @@ manually by running:
For downloading dives in _Subsurface_ specify the device name connected to the MAC
address in the last step above, e.g. _/dev/rfcomm0_.
+[[_appendix_b_dive_computer_specific_information_for_importing_dive_information]]
== APPENDIX B: Dive Computer specific information for importing dive data.
@@ -3529,8 +3532,7 @@ button). Then do the following:
== APPENDIX D: Exporting a spreadsheet to CSV format
Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
-with various fields of information. These logs can be easily imported into _Subsurface_
-(xref:S_ImportingManualCSV[Importing dives from_manually kept CSV file]), after the
+with various fields of information. These logs can be easily imported into _Subsurface_ after the
spreadsheet is converted in a .CSV file.
This section explains the procedure to convert a diving logbook stored in a spreadsheet
to a .CSV file that will later be imported from _Subsurface_.
@@ -3564,7 +3566,7 @@ After selecting _Save_, select the appropriate field delimiter (choose _Tab_ to
image::images/LOffice_field_options.jpg["FIGURE: Field options",align="center"]
-One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section xref:S_ImportingManualCSV[Importing dives from manually kept CSV files].
+One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section xref:S_ImportingCSVDives[Importing CSV dives].
=== Microsoft _Excel_
@@ -3595,7 +3597,7 @@ Click on the left-hand part of the _Save as_ option, NOT on the arrow on the rig
image::images/Win_SaveCSV3.jpg["FIGURE: Excel save CSV dialogue",align="center"]
-Select the _Save_ button. The CSV-formatted file is saved into the folder that was selected. One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section xref:S_ImportingManualCSV[Importing dives from manually kept CSV files].
+Select the _Save_ button. The CSV-formatted file is saved into the folder that was selected. One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section xref:S_ImportingCSVDives[Importing CSV dives].
== APPENDIX E: FAQs.
--
1.9.1
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
