Merge commit 'upstream/2.12'

[debian/cpmtools] / cpmcp.1.in

diff --git a/cpmcp.1.in b/cpmcp.1.in
index 18ba021d8b4f3ae3287da0bd6f8d75d05d61a3e8..8e62fa06477afb5147b03236e8f8d54af47bd895 100644 (file)
--- a/cpmcp.1.in
+++ b/cpmcp.1.in
@@ -7,6 +7,7 @@ cpmcp \- copy files from and to CP/M disks
 .B cpmcp
 .RB [ \-f
 .IR format ]
 .B cpmcp
 .RB [ \-f
 .IR format ]

+.RB [ \-p ]

 .RB [ \-t ]
 .I image
 \fIuser\fP\fB:\fP\fIfile\fP \fIfile\fP
 .RB [ \-t ]
 .I image
 \fIuser\fP\fB:\fP\fIfile\fP \fIfile\fP


@@ -14,6 +15,7 @@ cpmcp \- copy files from and to CP/M disks
 .B cpmcp
 .RB [ \-f
 .IR format ]
 .B cpmcp
 .RB [ \-f
 .IR format ]

+.RB [ \-p ]

 .RB [ \-t ]
 .I image
 \fIuser\fP\fB:\fP\fIfile\fP ... \fIdirectory\fP
 .RB [ \-t ]
 .I image
 \fIuser\fP\fB:\fP\fIfile\fP ... \fIdirectory\fP


@@ -21,6 +23,7 @@ cpmcp \- copy files from and to CP/M disks
 .B cpmcp
 .RB [ \-f
 .IR format ]
 .B cpmcp
 .RB [ \-f
 .IR format ]

+.RB [ \-p ]

 .RB [ \-t ]
 .I image
 \fIfile\fP \fIuser\fP\fB:\fP\fIfile\fP
 .RB [ \-t ]
 .I image
 \fIfile\fP \fIuser\fP\fB:\fP\fIfile\fP


@@ -28,6 +31,7 @@ cpmcp \- copy files from and to CP/M disks
 .B cpmcp
 .RB [ \-f
 .IR format ]
 .B cpmcp
 .RB [ \-f
 .IR format ]

+.RB [ \-p ]

 .RB [ \-t ]
 .I image
 \fIfile\fP ... \fIuser\fP\fB:\fP
 .RB [ \-t ]
 .I image
 \fIfile\fP ... \fIuser\fP\fB:\fP


@@ -48,6 +52,9 @@ file name patterns.
 .SH OPTIONS \"{{{
 .IP "\fB\-f\fP \fIformat\fP"
 Use the given CP/M disk \fIformat\fP instead of the default format.
 .SH OPTIONS \"{{{
 .IP "\fB\-f\fP \fIformat\fP"
 Use the given CP/M disk \fIformat\fP instead of the default format.

+.IP \fB\-p\fP
+Preserve time stamps when copying files from CP/M to UNIX (not
+implemented for copying the other way so far).

 .IP \fB\-t\fP
 Convert text files between CP/M and UNIX conventions.
 .\"}}}
 .IP \fB\-t\fP
 Convert text files between CP/M and UNIX conventions.
 .\"}}}


@@ -61,13 +68,13 @@ Any errors are indicated by exit code 1.
 @DATADIR@/diskdefs     CP/M disk format definitions
 .\"}}}
 .SH AUTHORS \"{{{
 @DATADIR@/diskdefs     CP/M disk format definitions
 .\"}}}
 .SH AUTHORS \"{{{

-This program is copyright 1997, 1998, 1999, 2000, 2001 Michael Haardt
+This program is copyright 1997\(en2009 Michael Haardt

 <michael@moria.de>.  The Windows port is copyright 2000, 2001 John Elliott
 <jce@seasip.demon.co.uk>.
 .PP
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 <michael@moria.de>.  The Windows port is copyright 2000, 2001 John Elliott
 <jce@seasip.demon.co.uk>.
 .PP
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 .PP
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 .PP
 This program is distributed in the hope that it will be useful,