diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 11:41:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 11:41:24 +0100 |
| commit | 6fef22d7e650a5a7cad76c6115bea629e75eca9f (patch) | |
| tree | 7cc64e552e07503439d62462c851e60bc39fa2bc | |
| parent | b968316069abd00feb7a3bc9f4e32ed6c227ea65 (diff) | |
| parent | 69001917752fae95862db2d115cbf762afb0659c (diff) | |
| download | qemu-6fef22d7e650a5a7cad76c6115bea629e75eca9f.tar.gz | |
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>
| -rw-r--r-- | qemu-doc.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi index aeb7bc52f5..4fc6b6f077 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -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. |