Imported Upstream version 7.4.0upstream/7.4.0

Change-Id: I567718db10506669896b057a505586ec6e1d18d7
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 41 insertions, 0 deletions

diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod
index 4e398da..d6f77cf 100644
--- a/man/nl/man1/dos2unix.pod
+++ b/man/nl/man1/dos2unix.pod
@@ -81,6 +81,17 @@ Of in nieuw-bestand-modus:
 
     dos2unix -n -- -foo uit.txt
 
+=item B<--allow-chown>
+
+Allow file ownership change in old file mode.
+
+When this option is used, the conversion will not be aborted when the user
+and/or group ownership of the original file can't be preserved in old file
+mode. Conversion will continue and the converted file will get the same new
+ownership as if it was converted in new file mode. See also options C<-o>
+and C<-n>. This option is only available if dos2unix has support for
+preserving the user and group ownership of files.
+
 =item B<-ascii>
 
 Alleen regeleindes converteren.  Dit is de standaardconversiemodus.
@@ -371,6 +382,15 @@ de eigenaar van het geconverteerde bestand.  De lees/schrijf-toegangsrechten
 van het nieuwe bestand worden de toegangsrechten van het originele bestand
 minus de umask(1) van de gebruiker die de conversie draait.
 
+=item B<--no-allow-chown>
+
+Don't allow file ownership change in old file mode (default).
+
+Abort conversion when the user and/or group ownership of the original file
+can't be preserved in old file mode. See also options C<-o> and C<-n>. This
+option is only available if dos2unix has support for preserving the user and
+group ownership of files.
+
 =item B<-o>, B<--oldfile BESTAND> ...
 
 Oud-bestand-modus.  Het bestand BESTAND converteren en overschrijven.  Dit
@@ -387,6 +407,27 @@ veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor
 personen voor wie het niet bestemd is.  Behoud van eigenaar, groep en
 lees/schrijf-rechten wordt alleen ondersteund op Unix.
 
+To check if dos2unix has support for preserving the user and group ownership
+of files type C<dos2unix -V>.
+
+Conversion is always done via a temporary file. When an error occurs halfway
+the conversion, the temporary file is deleted and the original file stays
+intact. When the conversion is successful, the original file is replaced
+with the temporary file. You may have write permission on the original file,
+but no permission to put the same user and/or group ownership properties on
+the temporary file as the original file has. This means you are not able to
+preserve the user and/or group ownership of the original file. In this case
+you can use option C<--allow-chown> to continue with the conversion:
+
+    dos2unix --allow-chown foo.txt
+
+Another option is to use new file mode:
+
+    dos2unix -n foo.txt foo.txt
+
+The advantage of the C<--allow-chown> option is that you can use wildcards,
+and the ownership properties will be preserved when possible.
+
 =item B<-q>, B<--quiet>
 
 Stille werking.  Alle waarschuwingen onderdrukken.  De afsluitwaarde is nul,