From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Apr 2011 22:51:23 +0000 (+0200)
Subject: man: fix specification of default timeouts
X-Git-Tag: v25~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=05677bb78079c3fa0283101aac2c07581f4873f1;ds=sidebyside

man: fix specification of default timeouts
---

diff --git a/TODO b/TODO
index b4a5e3ab9..5c4577e37 100644
--- a/TODO
+++ b/TODO
@@ -9,11 +9,6 @@ F15:
 
 * bluetooth should be possible to disable (PENDING)
 
-* add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target
-
-* bind mounts are ignored
-  https://bugzilla.redhat.com/show_bug.cgi?id=682662
-
 * 0595f9a1c182a84581749823ef47c5f292e545f9 is borked, freezes shutdown
     (path: after installing inotify watches, recheck file again to fix race)
 
@@ -23,8 +18,6 @@ F15:
 
 * fix sd_is_socket() invocation in dbus
 
-* fix default timeout values mentioned in man page
-
 * New CK release, with sysinit.target dropping and TTY loop
 
 * New Avahi package, enable it by default
@@ -34,7 +27,7 @@ F15:
 
 * drop cap bounding set in logger, hostnamed, readahead, ...
 
-* timeout value is incorrectly parsed in /etc/fstab
+* make anaconda write timeout=0 for encrypted devices
 
 Features:
 
@@ -54,7 +47,7 @@ Features:
   - the new configuration files
   - you are a distro: why switch?
 
-* maybe add tiny dbus services similar to hostnamed for locale?
+* maybe add tiny dbus services similar to hostnamed for locale and wallclock/timezone?
 
 * allow port = 0 in .socket units
 
@@ -137,8 +130,6 @@ Features:
 * invoke vhangup() before and after invoking getty
     http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3c95c985fa91ecf6a0e29622bbdd13dcfc5ce9f1
 
-* support "auto" and "comment=systemd.automount" at the same time for an fstab entry
-
 * Maybe store in unit files whether a service should be enabled by default on package installation
   (belongs into a distro pattern though, not in an upstream package's service file)
 
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index dd66d2ad7..40d236b26 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -212,7 +212,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                60s.</para></listitem>
+                                3min.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 7458720a3..335169a39 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -448,7 +448,7 @@
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                60s.</para></listitem>
+                                3min.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 306e68837..fd4569e1e 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -526,7 +526,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                60s.</para></listitem>
+                                3min.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>