Imported Upstream version 7.4.0upstream/7.4.0

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

1 files changed, 42 insertions, 0 deletions

diff --git a/man/nl/man1/dos2unix.txt b/man/nl/man1/dos2unix.txt
index 0f59ae2..611bd5f 100644
--- a/man/nl/man1/dos2unix.txt
+++ b/man/nl/man1/dos2unix.txt
@@ -56,6 +56,17 @@ OPTIES
 
             dos2unix -n -- -foo uit.txt
 
+    --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 "-o" and "-n". This
+        option is only available if dos2unix has support for preserving the
+        user and group ownership of files.
+
     -ascii
         Alleen regeleindes converteren. Dit is de standaardconversiemodus.
 
@@ -298,6 +309,14 @@ OPTIES
         toegangsrechten van het originele bestand minus de umask(1) van de
         gebruiker die de conversie draait.
 
+    --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
+        "-o" and "-n". This option is only available if dos2unix has support
+        for preserving the user and group ownership of files.
+
     -o, --oldfile BESTAND ...
         Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven.
         Dit is de standaard modus. Jokertekens kunnen gebruikt worden.
@@ -314,6 +333,29 @@ OPTIES
         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 "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 "--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 "--allow-chown" option is that you can use
+        wildcards, and the ownership properties will be preserved when
+        possible.
+
     -q, --quiet
         Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde
         is nul, behalve wanneer verkeerde opties worden gegeven.