diff --git a/doc/configuration.txt b/doc/configuration.txt
index d8d242a9a..6a0da4e16 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -127,7 +127,7 @@ stats socket <path> [{uid | user} <uid>] [{gid | group} <gid>] [mode <mode>]
 stats timeout <timeout, in milliseconds>
   The default timeout on the stats socket is set to 10 seconds. It is possible
   to change this value with "stats timeout". The value must be passed in
-  milliseconds.
+  milliseconds, or be suffixed by a time unit among { us, ms, s, m, h, d }.
 
 stats maxconn <connections>
   By default, the stats socket is limited to 10 concurrent connections. It is
@@ -741,8 +741,10 @@ option contstats
 slowstart <start_time_in_ms>
   The 'slowstart' parameter for a server accepts a value in milliseconds which
   indicates after how long a server which has just come back up will run at
-  full speed. The speed grows linearly from 0 to 100% during this time. The
-  limitation applies to two parameters :
+  full speed. Just as with every other time-based parameter, it can be entered
+  in any other explicit unit among { us, ms, s, m, h, d }. The speed grows
+  linearly from 0 to 100% during this time. The limitation applies to two
+  parameters :
 
   - maxconn: the number of connections accepted by the server will grow from 1
     to 100% of the usual dynamic limit defined by (minconn,maxconn,fullconn).
diff --git a/doc/haproxy-en.txt b/doc/haproxy-en.txt
index 64a63ac0c..73da3d9bc 100644
--- a/doc/haproxy-en.txt
+++ b/doc/haproxy-en.txt
@@ -651,7 +651,9 @@ Notes :
     after 3 seconds, a time-out equal to, or lower than 3 seconds cannot
     compensate for a packet loss. A 4 seconds time-out seems a reasonable
     minimum which will considerably reduce connection failures.
-
+  - starting with version 1.3.14, it is possible to specify timeouts in
+    arbitrary time units among { us, ms, s, m, h, d }. For this, the integer
+    value just has to be suffixed with the unit.
 
 2.6) Attempts to reconnect
 --------------------------
@@ -839,6 +841,9 @@ The syntax is:
                 sessions 
 - <holdtime> after this inactivaty time, in ms, the cookie will be deleted 
              from the sessionstore
+- starting with version 1.3.14, it is possible to specify timeouts in
+  arbitrary time units among { us, ms, s, m, h, d }. For this, the integer
+  value just has to be prefixed with the unit.
 
 The appsession is only per 'listen' section possible.
 
@@ -852,7 +857,7 @@ Example :
        cookie ServerID insert nocache indirect
        # Will memorize 52 bytes of the cookie 'JSESSIONID' and keep them
        # for 3 hours. It will match it in the cookie and the URL field.
-       appsession JSESSIONID len 52 timeout 10800000
+       appsession JSESSIONID len 52 timeout 3h
        server first1 10.3.9.2:10805 check inter 3000 cookie first
        server secon1 10.3.9.3:10805 check inter 3000 cookie secon
        server first1 10.3.9.4:10805 check inter 3000 cookie first
diff --git a/doc/haproxy-fr.txt b/doc/haproxy-fr.txt
index 8e9bde90d..a70e3c59e 100644
--- a/doc/haproxy-fr.txt
+++ b/doc/haproxy-fr.txt
@@ -689,6 +689,10 @@ Remarques :
     de paquets car la session aura été abandonnée avant la première
     retransmission. Une valeur de 4 secondes réduira considérablement
     le nombre d'échecs de connexion.
+  - A compter de la version 1.3.14, il est possible de spécifier les durées
+    d'expiration dans des unités de temps arbitraires à choisir parmi
+    { us, ms, s, m, h, d }. Pour cela, la valeur entière doit être suffixée
+    de l'unité.
 
 2.6) Tentatives de reconnexion
 ------------------------------