Move Heartbeat documentation from Job to Director resource.

     This fixes bug #1033.

diff --git a/docs/manual/dirdconf.tex b/docs/manual/dirdconf.tex
index c823d6404428effb97d968c3371d08b61846cb80..a226fa655bd0cca072cabfb7640c58c8fd310a96 100644 (file)
--- a/docs/manual/dirdconf.tex
+++ b/docs/manual/dirdconf.tex
@@ -195,12 +195,22 @@ in the  graphical user interface. This directive is optional.
    done when the configuration file is read so that values such as {\bf
    \$HOME} will be properly expanded.  This directive is required.
 
+\item [Heartbeat Interval = \lt{}time-interval\gt{}]
+   \index[dir]{Heartbeat Interval}
+   \index[dir]{Directive!Heartbeat}
+   This directive is optional and if specified will cause the Director to
+   set a keepalive interval (heartbeat) in seconds on each of the sockets
+   it opens for the Client resource.  This value will override any
+   specified at the Director level.  It is implemented only on systems
+   (Linux, ...) that provide the {\bf setsockopt} TCP\_KEEPIDLE function.
+   The default value is zero, which means no change is made to the socket.
+
 \label{DirMaxConJobs}
 \item [Maximum Concurrent Jobs = \lt{}number\gt{}]
-\index[dir]{Maximum Concurrent Jobs}
-\index[dir]{Directive!Maximum Concurrent Jobs}
-\index[general]{Simultaneous Jobs}
-\index[general]{Concurrent Jobs}
+   \index[dir]{Maximum Concurrent Jobs}
+   \index[dir]{Directive!Maximum Concurrent Jobs}
+   \index[general]{Simultaneous Jobs}
+   \index[general]{Concurrent Jobs}
    where \lt{}number\gt{}  is the maximum number of total Director Jobs that
    should run  concurrently. The default is set to 1, but you may set it to a 
    larger number.  
@@ -1612,16 +1622,6 @@ correct order, and that your priority scheme will be respected.
 
    This directive is ignored with tape and FIFO devices.  
 
-\item [Heartbeat Interval = \lt{}time-interval\gt{}]
-   \index[dir]{Heartbeat Interval}
-   \index[dir]{Directive!Heartbeat}
-   This directive is optional and if specified will cause the Director to
-   set a keepalive interval (heartbeat) in seconds on each of the sockets
-   it opens for the Client resource.  This value will override any
-   specified at the Director level.  It is implemented only on systems
-   (Linux, ...) that provide the {\bf setsockopt} TCP\_KEEPIDLE function.
-   The default value is zero, which means no change is made to the socket.
-
 \end{description}
 
 The following is an example of a valid Job resource definition: