Explain how tinc detaches and how it is "killed" under Windows.

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 2abc86c56a54c091fa730f700d51592871e80184..843074a8c1d7e93f5a1cebb7403c9592a585ae53 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
 \input texinfo   @c -*-texinfo-*-

-@c $Id: tinc.texi,v 1.8.4.40 2003/07/30 09:22:29 guus Exp $
+@c $Id: tinc.texi,v 1.8.4.41 2003/08/02 21:55:12 guus Exp $

 @c %**start of header
 @setfilename tinc.info
 @settitle tinc Manual
 @c %**start of header
 @setfilename tinc.info
 @settitle tinc Manual


@@ -18,7 +18,7 @@ Copyright @copyright{} 1998-2003 Ivo Timmermans
 <ivo@@o2w.nl>, Guus Sliepen <guus@@sliepen.eu.org> and
 Wessel Dankers <wsl@@nl.linux.org>.
 
 <ivo@@o2w.nl>, Guus Sliepen <guus@@sliepen.eu.org> and
 Wessel Dankers <wsl@@nl.linux.org>.
 

-$Id: tinc.texi,v 1.8.4.40 2003/07/30 09:22:29 guus Exp $
+$Id: tinc.texi,v 1.8.4.41 2003/08/02 21:55:12 guus Exp $

 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are


@@ -43,7 +43,7 @@ Copyright @copyright{} 1998-2003 Ivo Timmermans
 <ivo@@o2w.nl>, Guus Sliepen <guus@@sliepen.eu.org> and
 Wessel Dankers <wsl@@nl.linux.org>.
 
 <ivo@@o2w.nl>, Guus Sliepen <guus@@sliepen.eu.org> and
 Wessel Dankers <wsl@@nl.linux.org>.
 

-$Id: tinc.texi,v 1.8.4.40 2003/07/30 09:22:29 guus Exp $
+$Id: tinc.texi,v 1.8.4.41 2003/08/02 21:55:12 guus Exp $

 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are


@@ -272,7 +272,7 @@ downloaded from @uref{http://cipe-win32.sourceforge.net/}.
 
 @cindex MinGW
 @cindex Windows
 
 @cindex MinGW
 @cindex Windows

-tinc on Windows, compiled using MinGW, relies on the CIPE driver for its data
+tinc on Windows (native), compiled using MinGW, relies on the CIPE driver for its data

 acquisition from the kernel. This driver is not part of Windows but can be
 downloaded from @uref{http://cipe-win32.sourceforge.net/}.
 
 acquisition from the kernel. This driver is not part of Windows but can be
 downloaded from @uref{http://cipe-win32.sourceforge.net/}.
 


@@ -672,8 +672,11 @@ You will need to install the MinGW environment from @uref{http://www.mingw.org}.
 
 When tinc is compiled using MinGW it runs natively under Windows,
 it is not necessary to keep MinGW installed.
 
 When tinc is compiled using MinGW it runs natively under Windows,
 it is not necessary to keep MinGW installed.

-However, when compiled using MinGW, tinc will not be able to start
-scripts or be able to receive signals.
+
+When running natively, tinc is not able to start scripts,
+nor is tinc able to receive signals.
+When detaching, tinc will install itself as a service,
+which will be restarted automatically after reboots.

 
 
 @c ==================================================================
 
 
 @c ==================================================================


@@ -1470,6 +1473,8 @@ logged.  Everything goes via syslog.
 @item -k, --kill[=SIGNAL]
 Attempt to kill a running tincd (optionally with the specified SIGNAL instead of SIGTERM) and exit.
 Use it in conjunction with the -n option to make sure you kill the right tinc daemon.
 @item -k, --kill[=SIGNAL]
 Attempt to kill a running tincd (optionally with the specified SIGNAL instead of SIGTERM) and exit.
 Use it in conjunction with the -n option to make sure you kill the right tinc daemon.

+Under native Windows the optional argument is ignored,
+the service will always be stopped and removed.

 
 @item -n, --net=NETNAME
 Connect to net NETNAME.  @xref{Multiple networks}.
 
 @item -n, --net=NETNAME
 Connect to net NETNAME.  @xref{Multiple networks}.

diff --git a/doc/tincd.8 b/doc/tincd.8
index ec8a147db1d0f0819e2e38e9bf39582100a7b005..b85ffa9e1af1697c6ccb7cca0c48e42935027ead 100644 (file)
--- a/doc/tincd.8
+++ b/doc/tincd.8
@@ -34,6 +34,8 @@ If that succeeds,
 it will detach from the controlling terminal and continue in the background,
 accepting and setting up connections to other tinc daemons
 that are part of the virtual private network.
 it will detach from the controlling terminal and continue in the background,
 accepting and setting up connections to other tinc daemons
 that are part of the virtual private network.

+Under Windows (native) tinc will install itself as a service,
+which will be restarted automatically after reboots.

 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl c, -config Ns = Ns Ar DIR
 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl c, -config Ns = Ns Ar DIR


@@ -52,6 +54,8 @@ Attempt to kill a running
 (optionally with the specified
 .Ar SIGNAL
 instead of SIGTERM) and exit.
 (optionally with the specified
 .Ar SIGNAL
 instead of SIGTERM) and exit.

+Under native Windows the optional argument is ignored,
+the service will always be stopped and removed.

 .It Fl n, -net Ns = Ns Ar NETNAME
 Connect to net
 .Ar NETNAME .
 .It Fl n, -net Ns = Ns Ar NETNAME
 Connect to net
 .Ar NETNAME .