Merge branch 'import'

diff --git a/nbd-client.8.sgml b/nbd-client.8.sgml
index 27e11fa..ef120d9 100644 (file)
--- a/nbd-client.8.sgml
+++ b/nbd-client.8.sgml
@@ -176,10 +176,9 @@ manpage.1: manpage.sgml
        <term><option>-swap</option></term>
        <listitem>
          <para>Specifies that this NBD device will be used as
-           swapspace. If you intend to do that, please use this
-           option to prevent deadlocks. You'll need a special kernel
-           patch, available at NBD's homepage:
-           http://atrey.karlin.mff.cuni.cz/~pavel</para>
+         swapspace. This option attempts to prevent deadlocks by
+         performing mlockall() at an appropriate time. It does not
+         however guarantee that such deadlocks can be avoided.</para>
        </listitem>
       </varlistentry>
       <varlistentry>