ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Lone typo fix (Thomas) 

-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAlmRYlAUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroNUjAf+PUHQx8lXSjNPXP1amfkKqBnyDsJq
 97HqcneZzsenkOSYCLLBQ587ZydGkOfZfAWpWqyWOl6Y+eaWtMF4oMud/BFL0jj3
 nA3EDWij8LxpS+grkx443OuJkExaNxK1t6yMGhiTGBLYHCpq/GVQAa9N2xKvfK8V
 txhf4x76RQTW1JtkEDMrm6rEiVBBashho7lIgUT+gol+rRhH+7PXYo610mVED8kg
 t7AACz1zhTkxcauTKjzO31m6JrOtFZbWBG8+q0ZlIDBaak2NjqCj/DXsjMA5N6Is
 V8rKizJfATZrO62kHk/yG1p4NI6hJHuXCY8UaqnLoX+nzNm2DZ5rP3OZQw==
 =fiCC
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-08-14 11:41:24 +01:00
parent b968316069 6900191775
commit 6fef22d7e6
1 changed files with 1 additions and 1 deletions

2
qemu-doc.texi
View File

@ -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.