From patchwork Wed Jan 13 08:21:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 566853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2EEBE14090A for ; Wed, 13 Jan 2016 19:21:28 +1100 (AEDT) Received: from localhost ([::1]:35848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJGgH-0003E1-TI for incoming@patchwork.ozlabs.org; Wed, 13 Jan 2016 03:21:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJGg1-0002sU-Ry for qemu-devel@nongnu.org; Wed, 13 Jan 2016 03:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJGfy-0001N5-MF for qemu-devel@nongnu.org; Wed, 13 Jan 2016 03:21:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJGfy-0001My-HE; Wed, 13 Jan 2016 03:21:06 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 7D05F1C5F55; Wed, 13 Jan 2016 08:21:05 +0000 (UTC) Received: from thh440s.fritz.box (vpn1-6-147.ams2.redhat.com [10.36.6.147]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0D8L2bg023088; Wed, 13 Jan 2016 03:21:03 -0500 From: Thomas Huth To: Jan Kiszka , qemu-devel@nongnu.org, Jason Wang Date: Wed, 13 Jan 2016 09:21:02 +0100 Message-Id: <1452673262-11279-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org Subject: [Qemu-devel] [PATCH] qemu-doc: Do not promote deprecated -smb and -redir options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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(-) 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