Merge commit 'upstream/2.10'

[debian/cpmtools] / cpmchattr.1.in

diff --git a/cpmchattr.1.in b/cpmchattr.1.in
index 8455d0609b68011890d5e2636741b90f599e2130..df2bb1b106d6b978dd5ae873382cf53bfa5b5a90 100644 (file)
--- a/cpmchattr.1.in
+++ b/cpmchattr.1.in
@@ -24,13 +24,18 @@ Set the file attributes as given.
 .\"}}}
 .SH "FILE ATTRIBUTES" \"{{{
 The file attribute string can contain the characters
 .\"}}}
 .SH "FILE ATTRIBUTES" \"{{{
 The file attribute string can contain the characters

-1,2,3,4,s,a,N and M.
+1,2,3,4,r,s,a,n and m.

 The meanings of these are:
 .TP
 .B 1-4
 The CP/M "user attributes" F1-F4.  CP/M does not assign any
 meaning to these attributes, though MP/M does.
 .TP
 The meanings of these are:
 .TP
 .B 1-4
 The CP/M "user attributes" F1-F4.  CP/M does not assign any
 meaning to these attributes, though MP/M does.
 .TP

+.B r
+The file is read-only.  This is the same as using
+.I cpmchmod(1)
+to revoke write permissions.
+.TP

 .B s
 The file is a system file.  This attribute can also be set by
 .I cpmchmod(1).
 .B s
 The file is a system file.  This attribute can also be set by
 .I cpmchmod(1).


@@ -38,12 +43,12 @@ The file is a system file.  This attribute can also be set by
 .B a
 The file has been backed up.
 .TP
 .B a
 The file has been backed up.
 .TP

-.B N
-Reset all attributes to zero.  So the string "N1r" resets all attributes and
+.B n
+Reset all attributes to zero.  So the string "n1r" resets all attributes and

 then sets F1 and Read-Only.
 .TP
 then sets F1 and Read-Only.
 .TP

-.B M
-Attributes after an M are unset rather than set.  The string "12M34" sets
+.B m
+Attributes after an m are unset rather than set.  The string "12m34" sets

 atttributes F1 and F2, and unsets F3 and F4.
 .\"}}}
 .SH "RETURN VALUE" \"{{{
 atttributes F1 and F2, and unsets F3 and F4.
 .\"}}}
 .SH "RETURN VALUE" \"{{{


@@ -56,13 +61,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\(en2008 Michael Haardt

 <michael@moria.de> and 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> and 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,