Update usbip man pages further

svn path=/dists/sid/linux-tools/; revision=19189

debian/patches/series

@@ -1,4 +1,4 @@
 modpost-symbol-prefix.patch
 tools-perf-version.patch
 tools-perf-install.patch
-usbip-remove-usbip_bind_driver-man-page
+usbip-update-man-pages.patch

debian/patches/usbip-update-man-pages.patch

@@ -1,6 +1,9 @@
 From: Ben Hutchings <ben@decadent.org.uk>
-Subject: The usbip_bind_driver command was removed; remove the man page too
+Subject: Update man pages for merging of commands
 
+usbip_bind_driver (formerly usbip_attach_driver) was merged into the
+usbip command.  Remove the separate man page for it.  Update examples
+and references accordingly.
 --- a/drivers/staging/usbip/userspace/Makefile.am
 +++ b/drivers/staging/usbip/userspace/Makefile.am
 @@ -3,4 +3,4 @@
@@ -54,3 +57,34 @@ Subject: The usbip_bind_driver command was removed; remove the man page too
 -.SH "SEE ALSO"
 -\fBusbip\fP\fB(8)\fB\fP,
 -\fBusbipd\fP\fB(8)\fB\fP
+--- a/drivers/staging/usbip/userspace/doc/usbip.8
++++ b/drivers/staging/usbip/userspace/doc/usbip.8
+@@ -67,5 +67,4 @@
+         - Detach the usb device.
+ 
+ .SH "SEE ALSO"
+-\fBusbipd\fP\fB(8)\fB\fP,
+-\fBusbip_attach_driver\fP\fB(8)\fB\fP
++\fBusbipd\fP\fB(8)\fB\fP
+--- a/drivers/staging/usbip/userspace/doc/usbipd.8
++++ b/drivers/staging/usbip/userspace/doc/usbipd.8
+@@ -48,15 +48,14 @@
+     server:# usbipd -D
+         - Start usbip daemon.
+ 
+-    server:# usbip_bind_driver --list
++    server:# usbip list
+         - List driver assignments for usb devices.
+ 
+-    server:# usbip_bind_driver --usbip 1-2
++    server:# usbip bind -b 1-2
+         - Bind usbip-host.ko to the device of busid 1-2.
+         - A usb device 1-2 is now exportable to other hosts!
+-        - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting and use the device locally.
++        - Use 'usbip unbind -b 1-2' when you want to shutdown exporting and use the device locally.
+ 
+ .SH "SEE ALSO"
+-\fBusbip\fP\fB(8)\fB\fP,
+-\fBusbip_attach_driver\fP\fB(8)\fB\fP
++\fBusbip\fP\fB(8)\fB\fP
+