Merge sync of head

5 files changed, 32 insertions, 34 deletions

diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile
index 4d8917f..e228fea 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -10,7 +10,6 @@ CFLAGS+= -DMAX_SEND_SIZE=32768
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR}/../shared
 
-DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} ${LIBPTHREAD}
-LDADD=	-lgeom -lsbuf -lbsdxml -lutil -lpthread
+LIBADD=	geom util pthread
 
 .include <bsd.prog.mk>
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 72ae4c5..8545baf 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 26, 2004
+.Dd April 2, 2015
 .Dt GGATEC 8
 .Os
 .Sh NAME
@@ -67,29 +67,29 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is a network client for GEOM Gate class.
-It is responsible for creation of
+utility is a network client for the GEOM Gate class.
+It is responsible for the creation of
 .Nm ggate
-devices and forwarding I/O requests between
+devices and forwarding I/O requests between the
 .Nm geom_gate.ko
-kernel module and
+kernel module and the
 .Xr ggated 8
 network daemon.
 Available commands:
 .Bl -tag -width ".Cm destroy"
 .It Cm create
-Connect to given
+Connect to a
 .Xr ggated 8
-daemon and create a
+daemon on the specified host and create a
 .Nm ggate
-provider related to the given remote file or device.
+provider for the specified remote file or device.
 .It Cm rescue
-If
+Create a new connection after the
 .Nm
-process died/has been killed, you can save situation with this
-command, which creates new connection to the
+process has died or been killed.
+The new connection to the
 .Xr ggated 8
-daemon and will handle pending and future requests.
+daemon handles pending and future requests.
 .It Cm destroy
 Destroy the given
 .Nm ggate
@@ -139,12 +139,11 @@ provider.
 If not specified, it is taken from device, or set to 512 bytes for files.
 .It Fl t Ar timeout
 Number of seconds to wait before an I/O request will be canceled.
-0 means no timeout.
-Default is 0.
+Default is 0, which means no timeout.
 .It Fl u Ar unit
 Unit number to use.
 .It Fl v
-Do not fork, run in foreground and print debug informations on standard
+Do not fork, run in foreground and print debug information on standard
 output.
 .It Ar host
 Remote host to connect to.
@@ -159,7 +158,7 @@ should be called with the
 .Fl v
 option.
 .Sh EXAMPLES
-Make use of CD-ROM device from remote host.
+Use a CD-ROM device on a remote host.
 .Bd -literal -offset indent
 server# cat /etc/gg.exports
 client RO /dev/acd0
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index 4e7708e..af5c9bd 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -6,8 +6,7 @@ PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 CFLAGS+= -I${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index 604a754..be88bd4 100644
--- a/sbin/ggate/ggatel/Makefile
+++ b/sbin/ggate/ggatel/Makefile
@@ -9,7 +9,6 @@ SRCS=	ggatel.c ggate.c
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR}/../shared
 
-DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
-LDADD=	-lgeom -lsbuf -lbsdxml -lutil
+LIBADD=	geom util
 
 .include <bsd.prog.mk>
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 1463426..37e11cd 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2011
+.Dd April 9, 2015
 .Dt GGATEL 8
 .Os
 .Sh NAME
@@ -40,12 +40,6 @@
 .Op Fl u Ar unit
 .Ar path
 .Nm
-.Cm attach
-.Op Fl v
-.Op Fl o Cm ro | wo | rw
-.Fl u Ar unit
-.Ar path
-.Nm
 .Cm destroy
 .Op Fl f
 .Fl u Ar unit
@@ -53,6 +47,12 @@
 .Cm list
 .Op Fl v
 .Op Fl u Ar unit
+.Nm
+.Cm rescue
+.Op Fl v
+.Op Fl o Cm ro | wo | rw
+.Fl u Ar unit
+.Ar path
 .Sh DESCRIPTION
 The
 .Nm
@@ -70,10 +70,6 @@ Available commands:
 Create a
 .Nm ggate
 provider related to the given regular file or device.
-.It Cm attach
-Attach a worker process to an existing
-.Nm ggate
-provider.
 .It Cm destroy
 Destroy the given
 .Nm ggate
@@ -82,6 +78,12 @@ provider.
 List
 .Nm ggate
 providers.
+.It Cm rescue
+Take over a previously created provider and handle pending and future
+requests. This is useful if the initial
+.Nm
+process died. To prevent data loss, the given path must lead to the
+regular file or device that was used to create the provider.
 .El
 .Pp
 Available options:
@@ -111,7 +113,7 @@ Default is 30.
 .It Fl u Ar unit
 Unit number to use.
 .It Fl v
-Do not fork, run in foreground and print debug informations on standard
+Do not fork, run in foreground and print debug information on standard
 output.
 .It Ar path
 Path to a regular file or device.