From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJHbI-0005ki-NK for qemu-devel@nongnu.org; Wed, 13 Jan 2016 04:20:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJHbD-0001rp-Lk for qemu-devel@nongnu.org; Wed, 13 Jan 2016 04:20:20 -0500 References: <1452673262-11279-1-git-send-email-thuth@redhat.com> From: Jason Wang Message-ID: <569616C2.5000004@redhat.com> Date: Wed, 13 Jan 2016 17:20:02 +0800 MIME-Version: 1.0 In-Reply-To: <1452673262-11279-1-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qemu-doc: Do not promote deprecated -smb and -redir options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , Jan Kiszka , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org On 01/13/2016 04:21 PM, Thomas Huth wrote: > Since -smb and -redir are deprecated options, we should not > use them as examples in the documentation anymore. > > Signed-off-by: Thomas Huth > --- > qemu-doc.texi | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Applied to my -net. Thanks > > diff --git a/qemu-doc.texi b/qemu-doc.texi > index 7bc3882..2596503 100644 > --- a/qemu-doc.texi > +++ b/qemu-doc.texi > @@ -1237,9 +1237,9 @@ echo 100 100 > /proc/sys/net/ipv4/ping_group_range > When using the built-in TFTP server, the router is also the TFTP > server. > > -When using the @option{-redir} option, TCP or UDP connections can be > -redirected from the host to the guest. It allows for example to > -redirect X11, telnet or SSH connections. > +When using the @option{'-netdev user,hostfwd=...'} option, TCP or UDP > +connections can be redirected from the host to the guest. It allows for > +example to redirect X11, telnet or SSH connections. > > @subsection Connecting VLANs between QEMU instances > > @@ -1889,7 +1889,8 @@ correctly instructs QEMU to shutdown at the appropriate moment. > > @subsubsection Share a directory between Unix and Windows > > -See @ref{sec_invocation} about the help of the option @option{-smb}. > +See @ref{sec_invocation} about the help of the option > +@option{'-netdev user,smb=...'}. > > @subsubsection Windows XP security problem >