Commit 6fef22d7 authored Aug 14, 2017 by Peter Maydell

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging



* Lone typo fix (Thomas)

# gpg: Signature made Mon 14 Aug 2017 09:41:52 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  qemu-doc: Fix "-net van" typo

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents b9683160 69001917

qemu-doc.texi

+1 −1

Original line number	Diff line number	Diff line
		@@ -3243,7 +3243,7 @@ the ``-netdev user,guestfwd=ARGS'' argument instead.

		@subsection -net vlan (since 2.9.0)

		The ``-net van=NN'' argument is partially replaced with the
		The ``-net vlan=NN'' argument is partially replaced with the
		new ``-netdev'' argument. The remaining use cases will no
		longer be directly supported in QEMU.