From 895527b357c1508b315fb37fc0359c7245e9b449 Mon Sep 17 00:00:00 2001 From: wbaumann Date: Sun, 9 Mar 2014 20:29:05 +0000 Subject: [PATCH] Added option "comment=" --- ChangeLog | 4 + man/de/mount.davfs.8.po | 294 +++++++++++++++++++++------------------- man/mount.davfs.8 | 7 +- man/mount.davfs.8.pot | 287 ++++++++++++++++++++------------------- src/mount_davfs.c | 3 + 5 files changed, 318 insertions(+), 277 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa6e5f8..113b691 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog for davfs2 -------------------- +2014-03-09 Werner Baumann (werner.baumann@onlinehome.de) + * mount_davfs.c, get_options: + Add option "comment=" (bug #41354) + 2013-09-08 Werner Baumann (werner.baumann@onlinehome.de) * Updating to fuse kernel version 7.19. diff --git a/man/de/mount.davfs.8.po b/man/de/mount.davfs.8.po index e3d96a6..bc0528d 100644 --- a/man/de/mount.davfs.8.po +++ b/man/de/mount.davfs.8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2013-08-09 12:15+0300\n" -"PO-Revision-Date: 2013-08-09 13:03+0100\n" +"POT-Creation-Date: 2014-03-09 21:05+0100\n" +"PO-Revision-Date: 2014-03-09 21:09+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "Language: \n" @@ -38,27 +38,27 @@ msgstr "BESCHREIBUNG" # type: SH #. type: SH -#: davfs2.conf.5:511 mount.davfs.8:533 umount.davfs.8:79 +#: davfs2.conf.5:511 mount.davfs.8:538 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: SH #. type: SH -#: davfs2.conf.5:517 mount.davfs.8:550 umount.davfs.8:84 +#: davfs2.conf.5:517 mount.davfs.8:555 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH #. type: Plain text -#: davfs2.conf.5:520 mount.davfs.8:553 umount.davfs.8:87 +#: davfs2.conf.5:520 mount.davfs.8:558 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH #. type: SH -#: davfs2.conf.5:522 mount.davfs.8:555 umount.davfs.8:89 +#: davfs2.conf.5:522 mount.davfs.8:560 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" @@ -73,8 +73,8 @@ msgstr "@PROGRAM_NAME@" #. type: TH #: mount.davfs.8:1 #, no-wrap -msgid "2012-03-18" -msgstr "2012-03-18" +msgid "2014-03-09" +msgstr "2014-03-09" # type: Plain text #. type: Plain text @@ -289,12 +289,28 @@ msgstr "Voreinstellung: B." #. type: TP #: mount.davfs.8:89 #, no-wrap +msgid "BI" +msgstr "BI" + +#. type: Plain text +#: mount.davfs.8:93 +msgid "" +"This option is ignored by B<@PROGRAM_NAME@> but other programs may require " +"it to be present in fstab." +msgstr "" +"Diese Option wird von B<@PROGRAM_NAME@> ignoriert. Andere Programme " +"verlangen möglicherweise diese Option in der fstab." + +# type: TP +#. type: TP +#: mount.davfs.8:94 +#, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:94 +#: mount.davfs.8:99 msgid "" "An alternative user configuration file. This option is intended for cases " "where the default user configuration file in the users home directory can " @@ -306,20 +322,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:96 +#: mount.davfs.8:101 msgid "Default: I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "Voreinstellung: I<~/.@PACKAGE@/@CONFIGFILE@>" # type: TP #. type: TP -#: mount.davfs.8:97 +#: mount.davfs.8:102 #, no-wrap msgid "B<[no]dev>" msgstr "B<[no]dev>" # type: Plain text #. type: Plain text -#: mount.davfs.8:102 +#: mount.davfs.8:107 msgid "" "(Do not) interpret character or block special devices on the file system. " "This option is only included for compatibility with the B(8) " @@ -331,14 +347,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:103 +#: mount.davfs.8:108 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:107 +#: mount.davfs.8:112 msgid "" "The default mode bits for directories in the mounted file system. Value " "given in octal. s-bits for user and group are allways silently ignored." @@ -348,7 +364,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:110 +#: mount.davfs.8:115 msgid "" "Default: calculated from the umask of the mounting user; an x-bit is " "associated to every r-bit in u-g-o." @@ -358,20 +374,20 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:111 +#: mount.davfs.8:116 #, no-wrap msgid "B<[no]exec>" msgstr "B<[no]exec>" # type: Plain text #. type: Plain text -#: mount.davfs.8:114 +#: mount.davfs.8:119 msgid "(Do not) allow execution of any binaries on the mounted file system." msgstr "Die Ausführung von Programm-Dateien ist (nicht) erlaubt" # type: Plain text #. type: Plain text -#: mount.davfs.8:117 +#: mount.davfs.8:122 msgid "" "Default: B. (When mounting as an ordinary user, the B(8) " "program will set the default to B.)" @@ -381,14 +397,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:118 +#: mount.davfs.8:123 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:122 +#: mount.davfs.8:127 msgid "" "The default mode bits for files in the mounted file system. Value given in " "octal. s-bits for user and group are allways silently ignored." @@ -399,7 +415,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:125 +#: mount.davfs.8:130 msgid "" "Default: calculated from the umask of the mounting user; no x-bits are set " "for files." @@ -409,14 +425,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:126 +#: mount.davfs.8:131 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:130 +#: mount.davfs.8:135 msgid "" "The group the mounted file system belongs to. It may be a numeric ID or a " "group name. The mounting user, if not root, must be member of this group." @@ -427,20 +443,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:132 +#: mount.davfs.8:137 msgid "Default: the primary group of the mounting user." msgstr "Voreinstellung: die primäre Gruppe des Benutzers." # type: TP #. type: TP -#: mount.davfs.8:133 +#: mount.davfs.8:138 #, no-wrap msgid "B<[no]_netdev>" msgstr "B<[no]_netdev>" # type: Plain text #. type: Plain text -#: mount.davfs.8:138 +#: mount.davfs.8:143 msgid "" "The file system needs a (no) network connection for operation. This " "information allows the operating system to handle the file system properly " @@ -452,52 +468,52 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:140 +#: mount.davfs.8:145 msgid "Default: B<_netdev>" msgstr "Voreinstellung: B<_netdev>" # type: TP #. type: TP -#: mount.davfs.8:141 +#: mount.davfs.8:146 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:144 +#: mount.davfs.8:149 msgid "Mount the file system read-only." msgstr "Das Dateisystem erlaubt nur Lese-Zugriffe." # type: Plain text #. type: Plain text -#: mount.davfs.8:146 mount.davfs.8:152 +#: mount.davfs.8:151 mount.davfs.8:157 msgid "Default: B." msgstr "Voreinstellung: B." # type: TP #. type: TP -#: mount.davfs.8:147 +#: mount.davfs.8:152 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:150 +#: mount.davfs.8:155 msgid "Mount the file system read-write." msgstr "Auf das Dateisystem kann lesend und schreibend zugegriffen werden." # type: TP #. type: TP -#: mount.davfs.8:153 +#: mount.davfs.8:158 #, no-wrap msgid "B<[no]suid>" msgstr "B<[no]suid>" # type: Plain text #. type: Plain text -#: mount.davfs.8:158 +#: mount.davfs.8:163 msgid "" "Do not allow set-user-identifier or set-group-identifier bits to take " "effect. This option is only included for compatibility with the mount " @@ -509,14 +525,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:159 +#: mount.davfs.8:164 #, no-wrap msgid "B<[no]user>" msgstr "B<[no]user>" # type: Plain text #. type: Plain text -#: mount.davfs.8:166 +#: mount.davfs.8:171 msgid "" "(Do not) allow an ordinary user to mount the file system. The name of the " "mounting user is written to I so that he can unmount the file system " @@ -532,20 +548,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:168 +#: mount.davfs.8:173 msgid "Default: ordinary users are not allowed to mount." msgstr "Voreinstellung: normale Benutzer dürfen nicht mounten." # type: TP #. type: TP -#: mount.davfs.8:169 +#: mount.davfs.8:174 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:176 +#: mount.davfs.8:181 msgid "" "Like B, but B user is allowed to unmount the file system, not " "only the mounting user. This is generally not recomended. On systems with " @@ -559,7 +575,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:178 +#: mount.davfs.8:183 msgid "Default: only the mounting user is allowed to unmount the file system." msgstr "" "Voreinstellung: nur der Benutzer, der das Dateisystem einghängt hat, darf es " @@ -567,14 +583,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:179 +#: mount.davfs.8:184 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:183 +#: mount.davfs.8:188 msgid "" "The owner of the mounted file system. It may be a numeric ID or a user " "name. Only when mounted by root, this may be different from the mounting " @@ -586,20 +602,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:185 +#: mount.davfs.8:190 msgid "Default: ID of the mounting user." msgstr "Voreinstellung: Kennung des Benutzers." # type: TP #. type: TP -#: mount.davfs.8:187 +#: mount.davfs.8:192 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text #. type: Plain text -#: mount.davfs.8:195 +#: mount.davfs.8:200 msgid "" "Use this name to authenticate with the WebDAV server. This option is " "intended for use with pam_mount only. When this option is set the " @@ -617,13 +633,13 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:197 +#: mount.davfs.8:202 msgid "Default: no username." msgstr "Voreingestellt: kein username" # type: Plain text #. type: Plain text -#: mount.davfs.8:200 +#: mount.davfs.8:205 msgid "" "B This option is experimental and might be removed. If you " "think it useful and successfully use it please send a short report." @@ -634,14 +650,14 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:202 +#: mount.davfs.8:207 #, no-wrap msgid "SECURITY POLICY" msgstr "SICHERHEITSREGELN" # type: Plain text #. type: Plain text -#: mount.davfs.8:207 +#: mount.davfs.8:212 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -655,7 +671,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:212 +#: mount.davfs.8:217 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." @@ -666,7 +682,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:216 +#: mount.davfs.8:221 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." @@ -676,7 +692,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:222 +#: mount.davfs.8:227 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -689,7 +705,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:227 +#: mount.davfs.8:232 msgid "" "Options B and B will always be set; even root can not change " "this." @@ -699,7 +715,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:231 +#: mount.davfs.8:236 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." @@ -710,7 +726,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:236 +#: mount.davfs.8:241 msgid "" "When the mount point given in I is a relative file name and the file " "system is mounted by an unprivileged user, the mount point must lie within " @@ -722,7 +738,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:241 +#: mount.davfs.8:246 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -734,7 +750,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:249 +#: mount.davfs.8:254 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -752,14 +768,14 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:250 +#: mount.davfs.8:255 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "URLS UND EINHÄNGEPUNKTE MIT LEERZEICHEN" # type: Plain text #. type: Plain text -#: mount.davfs.8:255 +#: mount.davfs.8:260 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -771,7 +787,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:261 +#: mount.davfs.8:266 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." @@ -796,20 +812,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:268 +#: mount.davfs.8:273 msgid "On I you must obey the escaping rules of the shell." msgstr "Auf der Kommandozeile müssen die Regeln der Shell beachtet werden." # type: SH #. type: SH -#: mount.davfs.8:270 +#: mount.davfs.8:275 #, no-wrap msgid "CACHING" msgstr "CACHE" # type: Plain text #. type: Plain text -#: mount.davfs.8:275 +#: mount.davfs.8:280 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-traffic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -821,7 +837,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:283 +#: mount.davfs.8:288 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -839,7 +855,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:289 +#: mount.davfs.8:294 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -853,14 +869,14 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:291 +#: mount.davfs.8:296 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "SPERREN, VERLORENGEGANGENE ÄNDERUNGEN UND BACKUP-DATEIEN" # type: Plain text #. type: Plain text -#: mount.davfs.8:296 +#: mount.davfs.8:301 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -872,7 +888,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:301 +#: mount.davfs.8:306 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." @@ -882,7 +898,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:304 +#: mount.davfs.8:309 msgid "The server might not support locks (they are not mandatory)." msgstr "" "Möglicherweise unterstützt der Server keine Sperren (sie sind in WevDAV " @@ -890,7 +906,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:308 +#: mount.davfs.8:313 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." @@ -900,7 +916,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:312 +#: mount.davfs.8:317 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." @@ -910,7 +926,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:320 +#: mount.davfs.8:325 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -926,7 +942,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:328 +#: mount.davfs.8:333 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -947,7 +963,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:335 +#: mount.davfs.8:340 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -966,14 +982,14 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:337 +#: mount.davfs.8:342 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "EIGENTÜMER UND DATEIRECHTE" # type: Plain text #. type: Plain text -#: mount.davfs.8:343 +#: mount.davfs.8:348 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -987,7 +1003,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:348 +#: mount.davfs.8:353 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -1000,7 +1016,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:354 +#: mount.davfs.8:359 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -1015,7 +1031,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:360 +#: mount.davfs.8:365 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -1029,34 +1045,34 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:362 umount.davfs.8:67 +#: mount.davfs.8:367 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "DATEIEN" # type: TP #. type: TP -#: mount.davfs.8:364 +#: mount.davfs.8:369 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "I<@SYS_CONF_DIR@/@CONFIGFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:367 +#: mount.davfs.8:372 msgid "System wide configuration file." msgstr "Systemweite Konfigurationsdatei." # type: TP #. type: TP -#: mount.davfs.8:368 +#: mount.davfs.8:373 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "I<~/.@PACKAGE@/@CONFIGFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:373 +#: mount.davfs.8:378 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -1068,14 +1084,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:374 +#: mount.davfs.8:379 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "I<@SYS_CONF_DIR@/@SECRETSFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:379 +#: mount.davfs.8:384 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -1087,14 +1103,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:380 +#: mount.davfs.8:385 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "I<~/.@PACKAGE@/@SECRETSFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:390 +#: mount.davfs.8:395 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -1115,14 +1131,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:391 +#: mount.davfs.8:396 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:398 +#: mount.davfs.8:403 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -1139,20 +1155,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:400 mount.davfs.8:409 +#: mount.davfs.8:405 mount.davfs.8:414 msgid "Be sure to verify the certificate." msgstr "Vergiss nicht, das Zertifikat selbst zu prüfen." # type: TP #. type: TP -#: mount.davfs.8:401 +#: mount.davfs.8:406 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:407 +#: mount.davfs.8:412 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -1168,14 +1184,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:410 +#: mount.davfs.8:415 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:416 +#: mount.davfs.8:421 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -1189,14 +1205,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:417 +#: mount.davfs.8:422 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:422 +#: mount.davfs.8:427 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -1209,14 +1225,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:423 umount.davfs.8:69 +#: mount.davfs.8:428 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "I<@SYS_RUN@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:429 +#: mount.davfs.8:434 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -1230,14 +1246,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:430 +#: mount.davfs.8:435 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "I<@SYS_CACHE_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:437 +#: mount.davfs.8:442 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -1253,14 +1269,14 @@ msgstr "" # type: TP #. type: TP -#: mount.davfs.8:438 +#: mount.davfs.8:443 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "I<~/.@PACKAGE@/cache>" # type: Plain text #. type: Plain text -#: mount.davfs.8:442 +#: mount.davfs.8:447 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." @@ -1270,7 +1286,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:446 +#: mount.davfs.8:451 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." @@ -1280,21 +1296,21 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:447 +#: mount.davfs.8:452 #, no-wrap msgid "ENVIRONMENT" msgstr "UMGEBUNGSVARIABLEN" # type: TP #. type: TP -#: mount.davfs.8:449 +#: mount.davfs.8:454 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:454 +#: mount.davfs.8:459 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -1306,26 +1322,26 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:456 +#: mount.davfs.8:461 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "http_proxy=[http://]foo.bar[:3218]" # type: Plain text #. type: Plain text -#: mount.davfs.8:458 mount.davfs.8:466 +#: mount.davfs.8:463 mount.davfs.8:471 msgid "Only used when the mounting user is root." msgstr "Wird nur benutzt, wenn der Benutzer root das Dateisystem einhängt." # type: TP #. type: TP -#: mount.davfs.8:459 +#: mount.davfs.8:464 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:464 +#: mount.davfs.8:469 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -1337,27 +1353,27 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:473 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" "Wird nicht benutzt, wenn der Proxy in I<@SYS_CONF_DIR@> festgelegt wird." # type: SH #. type: SH -#: mount.davfs.8:470 +#: mount.davfs.8:475 #, no-wrap msgid "EXAMPLES" msgstr "BEISPIELE" # type: Plain text #. type: Plain text -#: mount.davfs.8:473 +#: mount.davfs.8:478 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:476 +#: mount.davfs.8:481 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" "Damit ein normaler Benutzer ein Dateisystem einhängen kann, ist ein Eintrag " @@ -1365,13 +1381,13 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:483 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "http://webdav.org/dav /media/dav davfs noauto,user 0 0" # type: Plain text #. type: Plain text -#: mount.davfs.8:483 +#: mount.davfs.8:488 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" @@ -1381,13 +1397,13 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:485 +#: mount.davfs.8:490 msgid "proxy proxy.mycompany.com:8080" msgstr "proxy proxy.mycompany.com:8080" # type: Plain text #. type: Plain text -#: mount.davfs.8:489 +#: mount.davfs.8:494 msgid "Credentials are stored in I" msgstr "" "Die vertraulichen Zugangsdaten für den Server werden in I" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:503 +#: mount.davfs.8:508 msgid "and unmounted by user filomena invoking" msgstr "und dieselbe Benutzerin filomena kann es aushängen durch" # type: Plain text #. type: Plain text -#: mount.davfs.8:505 +#: mount.davfs.8:510 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:509 +#: mount.davfs.8:514 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:515 +#: mount.davfs.8:520 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" @@ -1462,14 +1478,14 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:521 +#: mount.davfs.8:526 msgid "Mounts the resource I at I." msgstr "" "Die WebDAV-Resource I wird auf I eingehängt." # type: Plain text #. type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:528 msgid "" "B" msgstr "" @@ -1477,20 +1493,20 @@ msgstr "" # type: SH #. type: SH -#: mount.davfs.8:526 umount.davfs.8:74 +#: mount.davfs.8:531 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "FEHLER" # type: Plain text #. type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:534 msgid "B<@PACKAGE@> does not support links." msgstr "B<@PACKAGE@> unterstützt keine Links." # type: Plain text #. type: Plain text -#: mount.davfs.8:531 +#: mount.davfs.8:536 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" "Ein B<@PACKAGE@>-Dateisystem kann nicht mit I verschoben " @@ -1498,7 +1514,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:537 +#: mount.davfs.8:542 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." @@ -1508,7 +1524,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:541 +#: mount.davfs.8:546 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." @@ -1518,13 +1534,13 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:544 +#: mount.davfs.8:549 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "@PACKAGE@ wurde von Sung Kim Ehunkim@gmail.comE entwickelt." # type: Plain text #. type: Plain text -#: mount.davfs.8:548 +#: mount.davfs.8:553 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." @@ -1534,7 +1550,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: mount.davfs.8:561 +#: mount.davfs.8:566 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/man/mount.davfs.8 b/man/mount.davfs.8 index a706717..31a99fb 100644 --- a/man/mount.davfs.8 +++ b/man/mount.davfs.8 @@ -1,4 +1,4 @@ -.TH @PROGRAM_NAME@ 8 "2012\-03\-18" @PACKAGE_STRING@ +.TH @PROGRAM_NAME@ 8 "2014\-03\-09" @PACKAGE_STRING@ .SH NAME @@ -86,6 +86,11 @@ Can (not) be mounted with \fBmount \-a\fR. .br Default: \fBauto\fR. +.TP +.B comment=\fIsome comment\fP +This option is ignored by \fB@PROGRAM_NAME@\fR but other programs may +require it to be present in fstab. + .TP .B conf=\fIabsolute path\fP An alternative user configuration file. This option is intended for cases diff --git a/man/mount.davfs.8.pot b/man/mount.davfs.8.pot index e070929..e918cc8 100644 --- a/man/mount.davfs.8.pot +++ b/man/mount.davfs.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-08-09 12:15+0300\n" +"POT-Creation-Date: 2014-03-09 21:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,24 +35,24 @@ msgid "DESCRIPTION" msgstr "" #. type: SH -#: davfs2.conf.5:511 mount.davfs.8:533 umount.davfs.8:79 +#: davfs2.conf.5:511 mount.davfs.8:538 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" #. type: SH -#: davfs2.conf.5:517 mount.davfs.8:550 umount.davfs.8:84 +#: davfs2.conf.5:517 mount.davfs.8:555 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" #. type: Plain text -#: davfs2.conf.5:520 mount.davfs.8:553 umount.davfs.8:87 +#: davfs2.conf.5:520 mount.davfs.8:558 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" #. type: SH -#: davfs2.conf.5:522 mount.davfs.8:555 umount.davfs.8:89 +#: davfs2.conf.5:522 mount.davfs.8:560 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -66,7 +66,7 @@ msgstr "" #. type: TH #: mount.davfs.8:1 #, no-wrap -msgid "2012-03-18" +msgid "2014-03-09" msgstr "" #. type: Plain text @@ -227,11 +227,24 @@ msgstr "" #. type: TP #: mount.davfs.8:89 #, no-wrap +msgid "BI" +msgstr "" + +#. type: Plain text +#: mount.davfs.8:93 +msgid "" +"This option is ignored by B<@PROGRAM_NAME@> but other programs may require " +"it to be present in fstab." +msgstr "" + +#. type: TP +#: mount.davfs.8:94 +#, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:94 +#: mount.davfs.8:99 msgid "" "An alternative user configuration file. This option is intended for cases " "where the default user configuration file in the users home directory can " @@ -239,18 +252,18 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:96 +#: mount.davfs.8:101 msgid "Default: I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "" #. type: TP -#: mount.davfs.8:97 +#: mount.davfs.8:102 #, no-wrap msgid "B<[no]dev>" msgstr "" #. type: Plain text -#: mount.davfs.8:102 +#: mount.davfs.8:107 msgid "" "(Do not) interpret character or block special devices on the file system. " "This option is only included for compatibility with the B(8) " @@ -258,89 +271,89 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:103 +#: mount.davfs.8:108 #, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:107 +#: mount.davfs.8:112 msgid "" "The default mode bits for directories in the mounted file system. Value " "given in octal. s-bits for user and group are allways silently ignored." msgstr "" #. type: Plain text -#: mount.davfs.8:110 +#: mount.davfs.8:115 msgid "" "Default: calculated from the umask of the mounting user; an x-bit is " "associated to every r-bit in u-g-o." msgstr "" #. type: TP -#: mount.davfs.8:111 +#: mount.davfs.8:116 #, no-wrap msgid "B<[no]exec>" msgstr "" #. type: Plain text -#: mount.davfs.8:114 +#: mount.davfs.8:119 msgid "(Do not) allow execution of any binaries on the mounted file system." msgstr "" #. type: Plain text -#: mount.davfs.8:117 +#: mount.davfs.8:122 msgid "" "Default: B. (When mounting as an ordinary user, the B(8) " "program will set the default to B.)" msgstr "" #. type: TP -#: mount.davfs.8:118 +#: mount.davfs.8:123 #, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:122 +#: mount.davfs.8:127 msgid "" "The default mode bits for files in the mounted file system. Value given in " "octal. s-bits for user and group are allways silently ignored." msgstr "" #. type: Plain text -#: mount.davfs.8:125 +#: mount.davfs.8:130 msgid "" "Default: calculated from the umask of the mounting user; no x-bits are set " "for files." msgstr "" #. type: TP -#: mount.davfs.8:126 +#: mount.davfs.8:131 #, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:130 +#: mount.davfs.8:135 msgid "" "The group the mounted file system belongs to. It may be a numeric ID or a " "group name. The mounting user, if not root, must be member of this group." msgstr "" #. type: Plain text -#: mount.davfs.8:132 +#: mount.davfs.8:137 msgid "Default: the primary group of the mounting user." msgstr "" #. type: TP -#: mount.davfs.8:133 +#: mount.davfs.8:138 #, no-wrap msgid "B<[no]_netdev>" msgstr "" #. type: Plain text -#: mount.davfs.8:138 +#: mount.davfs.8:143 msgid "" "The file system needs a (no) network connection for operation. This " "information allows the operating system to handle the file system properly " @@ -348,45 +361,45 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:140 +#: mount.davfs.8:145 msgid "Default: B<_netdev>" msgstr "" #. type: TP -#: mount.davfs.8:141 +#: mount.davfs.8:146 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:144 +#: mount.davfs.8:149 msgid "Mount the file system read-only." msgstr "" #. type: Plain text -#: mount.davfs.8:146 mount.davfs.8:152 +#: mount.davfs.8:151 mount.davfs.8:157 msgid "Default: B." msgstr "" #. type: TP -#: mount.davfs.8:147 +#: mount.davfs.8:152 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:150 +#: mount.davfs.8:155 msgid "Mount the file system read-write." msgstr "" #. type: TP -#: mount.davfs.8:153 +#: mount.davfs.8:158 #, no-wrap msgid "B<[no]suid>" msgstr "" #. type: Plain text -#: mount.davfs.8:158 +#: mount.davfs.8:163 msgid "" "Do not allow set-user-identifier or set-group-identifier bits to take " "effect. This option is only included for compatibility with the mount " @@ -394,13 +407,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:159 +#: mount.davfs.8:164 #, no-wrap msgid "B<[no]user>" msgstr "" #. type: Plain text -#: mount.davfs.8:166 +#: mount.davfs.8:171 msgid "" "(Do not) allow an ordinary user to mount the file system. The name of the " "mounting user is written to I so that he can unmount the file system " @@ -410,18 +423,18 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:168 +#: mount.davfs.8:173 msgid "Default: ordinary users are not allowed to mount." msgstr "" #. type: TP -#: mount.davfs.8:169 +#: mount.davfs.8:174 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:176 +#: mount.davfs.8:181 msgid "" "Like B, but B user is allowed to unmount the file system, not " "only the mounting user. This is generally not recomended. On systems with " @@ -430,18 +443,18 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:178 +#: mount.davfs.8:183 msgid "Default: only the mounting user is allowed to unmount the file system." msgstr "" #. type: TP -#: mount.davfs.8:179 +#: mount.davfs.8:184 #, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:183 +#: mount.davfs.8:188 msgid "" "The owner of the mounted file system. It may be a numeric ID or a user " "name. Only when mounted by root, this may be different from the mounting " @@ -449,18 +462,18 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:185 +#: mount.davfs.8:190 msgid "Default: ID of the mounting user." msgstr "" #. type: TP -#: mount.davfs.8:187 +#: mount.davfs.8:192 #, no-wrap msgid "BI" msgstr "" #. type: Plain text -#: mount.davfs.8:195 +#: mount.davfs.8:200 msgid "" "Use this name to authenticate with the WebDAV server. This option is " "intended for use with pam_mount only. When this option is set the " @@ -471,25 +484,25 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:197 +#: mount.davfs.8:202 msgid "Default: no username." msgstr "" #. type: Plain text -#: mount.davfs.8:200 +#: mount.davfs.8:205 msgid "" "B This option is experimental and might be removed. If you " "think it useful and successfully use it please send a short report." msgstr "" #. type: SH -#: mount.davfs.8:202 +#: mount.davfs.8:207 #, no-wrap msgid "SECURITY POLICY" msgstr "" #. type: Plain text -#: mount.davfs.8:207 +#: mount.davfs.8:212 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -497,21 +510,21 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:212 +#: mount.davfs.8:217 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." msgstr "" #. type: Plain text -#: mount.davfs.8:216 +#: mount.davfs.8:221 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." msgstr "" #. type: Plain text -#: mount.davfs.8:222 +#: mount.davfs.8:227 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -519,21 +532,21 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:227 +#: mount.davfs.8:232 msgid "" "Options B and B will always be set; even root can not change " "this." msgstr "" #. type: Plain text -#: mount.davfs.8:231 +#: mount.davfs.8:236 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." msgstr "" #. type: Plain text -#: mount.davfs.8:236 +#: mount.davfs.8:241 msgid "" "When the mount point given in I is a relative file name and the file " "system is mounted by an unprivileged user, the mount point must lie within " @@ -541,7 +554,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:241 +#: mount.davfs.8:246 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -549,7 +562,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:249 +#: mount.davfs.8:254 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -560,13 +573,13 @@ msgid "" msgstr "" #. type: SH -#: mount.davfs.8:250 +#: mount.davfs.8:255 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "" #. type: Plain text -#: mount.davfs.8:255 +#: mount.davfs.8:260 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -574,7 +587,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:261 +#: mount.davfs.8:266 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." msgstr "" #. type: Plain text -#: mount.davfs.8:268 +#: mount.davfs.8:273 msgid "On I you must obey the escaping rules of the shell." msgstr "" #. type: SH -#: mount.davfs.8:270 +#: mount.davfs.8:275 #, no-wrap msgid "CACHING" msgstr "" #. type: Plain text -#: mount.davfs.8:275 +#: mount.davfs.8:280 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-traffic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -609,7 +622,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:283 +#: mount.davfs.8:288 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -620,7 +633,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:289 +#: mount.davfs.8:294 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -629,13 +642,13 @@ msgid "" msgstr "" #. type: SH -#: mount.davfs.8:291 +#: mount.davfs.8:296 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "" #. type: Plain text -#: mount.davfs.8:296 +#: mount.davfs.8:301 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -643,33 +656,33 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:301 +#: mount.davfs.8:306 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." msgstr "" #. type: Plain text -#: mount.davfs.8:304 +#: mount.davfs.8:309 msgid "The server might not support locks (they are not mandatory)." msgstr "" #. type: Plain text -#: mount.davfs.8:308 +#: mount.davfs.8:313 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." msgstr "" #. type: Plain text -#: mount.davfs.8:312 +#: mount.davfs.8:317 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." msgstr "" #. type: Plain text -#: mount.davfs.8:320 +#: mount.davfs.8:325 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -679,7 +692,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:328 +#: mount.davfs.8:333 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -691,7 +704,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:335 +#: mount.davfs.8:340 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -702,13 +715,13 @@ msgid "" msgstr "" #. type: SH -#: mount.davfs.8:337 +#: mount.davfs.8:342 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "" #. type: Plain text -#: mount.davfs.8:343 +#: mount.davfs.8:348 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -717,7 +730,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:348 +#: mount.davfs.8:353 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -725,7 +738,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:354 +#: mount.davfs.8:359 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -734,7 +747,7 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:360 +#: mount.davfs.8:365 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -743,30 +756,30 @@ msgid "" msgstr "" #. type: SH -#: mount.davfs.8:362 umount.davfs.8:67 +#: mount.davfs.8:367 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "" #. type: TP -#: mount.davfs.8:364 +#: mount.davfs.8:369 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:367 +#: mount.davfs.8:372 msgid "System wide configuration file." msgstr "" #. type: TP -#: mount.davfs.8:368 +#: mount.davfs.8:373 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:373 +#: mount.davfs.8:378 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -774,13 +787,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:374 +#: mount.davfs.8:379 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:379 +#: mount.davfs.8:384 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -788,13 +801,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:380 +#: mount.davfs.8:385 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:390 +#: mount.davfs.8:395 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -806,13 +819,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:391 +#: mount.davfs.8:396 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:398 +#: mount.davfs.8:403 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -822,18 +835,18 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:400 mount.davfs.8:409 +#: mount.davfs.8:405 mount.davfs.8:414 msgid "Be sure to verify the certificate." msgstr "" #. type: TP -#: mount.davfs.8:401 +#: mount.davfs.8:406 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:407 +#: mount.davfs.8:412 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -842,13 +855,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:410 +#: mount.davfs.8:415 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:416 +#: mount.davfs.8:421 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -857,13 +870,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:417 +#: mount.davfs.8:422 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:422 +#: mount.davfs.8:427 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -871,13 +884,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:423 umount.davfs.8:69 +#: mount.davfs.8:428 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "" #. type: Plain text -#: mount.davfs.8:429 +#: mount.davfs.8:434 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -886,13 +899,13 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:430 +#: mount.davfs.8:435 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:437 +#: mount.davfs.8:442 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -902,39 +915,39 @@ msgid "" msgstr "" #. type: TP -#: mount.davfs.8:438 +#: mount.davfs.8:443 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "" #. type: Plain text -#: mount.davfs.8:442 +#: mount.davfs.8:447 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." msgstr "" #. type: Plain text -#: mount.davfs.8:446 +#: mount.davfs.8:451 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." msgstr "" #. type: SH -#: mount.davfs.8:447 +#: mount.davfs.8:452 #, no-wrap msgid "ENVIRONMENT" msgstr "" #. type: TP -#: mount.davfs.8:449 +#: mount.davfs.8:454 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:454 +#: mount.davfs.8:459 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -942,23 +955,23 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:456 +#: mount.davfs.8:461 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "" #. type: Plain text -#: mount.davfs.8:458 mount.davfs.8:466 +#: mount.davfs.8:463 mount.davfs.8:471 msgid "Only used when the mounting user is root." msgstr "" #. type: TP -#: mount.davfs.8:459 +#: mount.davfs.8:464 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:464 +#: mount.davfs.8:469 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -966,85 +979,85 @@ msgid "" msgstr "" #. type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:473 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" #. type: SH -#: mount.davfs.8:470 +#: mount.davfs.8:475 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text -#: mount.davfs.8:473 +#: mount.davfs.8:478 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:476 +#: mount.davfs.8:481 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" #. type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:483 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "" #. type: Plain text -#: mount.davfs.8:483 +#: mount.davfs.8:488 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:485 +#: mount.davfs.8:490 msgid "proxy proxy.mycompany.com:8080" msgstr "" #. type: Plain text -#: mount.davfs.8:489 +#: mount.davfs.8:494 msgid "Credentials are stored in I" msgstr "" #. type: Plain text -#: mount.davfs.8:491 +#: mount.davfs.8:496 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "" #. type: Plain text -#: mount.davfs.8:493 +#: mount.davfs.8:498 msgid "/media/dav webdav-username password" msgstr "" #. type: Plain text -#: mount.davfs.8:497 +#: mount.davfs.8:502 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "" #. type: Plain text -#: mount.davfs.8:499 +#: mount.davfs.8:504 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:503 +#: mount.davfs.8:508 msgid "and unmounted by user filomena invoking" msgstr "" #. type: Plain text -#: mount.davfs.8:505 +#: mount.davfs.8:510 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:509 +#: mount.davfs.8:514 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:515 +#: mount.davfs.8:520 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" msgstr "" #. type: Plain text -#: mount.davfs.8:521 +#: mount.davfs.8:526 msgid "Mounts the resource I at I." msgstr "" #. type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:528 msgid "" "B" msgstr "" #. type: SH -#: mount.davfs.8:526 umount.davfs.8:74 +#: mount.davfs.8:531 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:534 msgid "B<@PACKAGE@> does not support links." msgstr "" #. type: Plain text -#: mount.davfs.8:531 +#: mount.davfs.8:536 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" #. type: Plain text -#: mount.davfs.8:537 +#: mount.davfs.8:542 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." msgstr "" #. type: Plain text -#: mount.davfs.8:541 +#: mount.davfs.8:546 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." msgstr "" #. type: Plain text -#: mount.davfs.8:544 +#: mount.davfs.8:549 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "" #. type: Plain text -#: mount.davfs.8:548 +#: mount.davfs.8:553 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." msgstr "" #. type: Plain text -#: mount.davfs.8:561 +#: mount.davfs.8:566 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/src/mount_davfs.c b/src/mount_davfs.c index 62638d3..eca58e2 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -1429,6 +1429,7 @@ get_options(dav_args *args, char *option) ASYNC, AUTO, NOAUTO, + COMMENT, DEFAULTS, END }; @@ -1455,6 +1456,7 @@ get_options(dav_args *args, char *option) [ASYNC] = "async", [AUTO] = "auto", [NOAUTO] = "noauto", + [COMMENT] = "comment", [DEFAULTS] = "defaults", [END] = NULL }; @@ -1561,6 +1563,7 @@ get_options(dav_args *args, char *option) case ASYNC: case AUTO: case NOAUTO: + case COMMENT: case DEFAULTS: break; default: