From: Bdale Garbee <bdale@gag.com>
Date: Sun, 9 Mar 2014 20:24:12 +0000 (-0600)
Subject: Merge tag 'upstream/2.17'
X-Git-Tag: debian/2.17-1~3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=eecb0a54d7bbb6d7f1085cad3e663164baad4c4f;p=debian%2Fcpmtools

Merge tag 'upstream/2.17'

Upstream version 2.17

Conflicts:
	Makefile.in
	cpm.5.in
---

eecb0a54d7bbb6d7f1085cad3e663164baad4c4f
diff --cc fsck.cpm.1.in
index 7293037,929074d..04f861c
--- a/fsck.cpm.1.in
+++ b/fsck.cpm.1.in
@@@ -37,12 -37,14 +37,15 @@@ Any errors are indicated by exit code 1
  .SH FILES .\"{{{
  @DATADIR@/diskdefs	CP/M disk format definitions
  .\"}}}
+ .SH ENVIRONMENT \"{{{
+ CPMTOOLSFMT     Default format
+ .\"}}}
  .SH DIAGNOSTICS .\"{{{
 -.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% non-contiguos), \fIused\fP/\fItotal\fP blocks"
 +.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% 
 +non-contiguous), \fIused\fP/\fItotal\fP blocks"
  No inconsistencies could be found.  The number of used files actually
  is the number of used extents.  Since a file may use more than
 -one extent, this may be greather than the actual number of files, but a
 +one extent, this may be greater than the actual number of files, but a
  correct measure would not reflect how many files could still be created
  at most.  A file is considered fragmented, if sequential data blocks
  pointed to by the same extent do not have sequential block numbers.