[Qemu-commits] [qemu/qemu] 690019: qemu-doc: Fix "-net van" typo

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 69001917752fae95862db2d115cbf762afb0659c
      
https://github.com/qemu/qemu/commit/69001917752fae95862db2d115cbf762afb0659c
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M qemu-doc.texi

  Log Message:
  -----------
  qemu-doc: Fix "-net van" typo

While Andrew S. Tanenbaum has a point by saying "Never underestimate the
bandwidth of a station wagon full of tapes hurtling down the highway",
we don't support that way of transportation in QEMU yet, so replace the
typo with the correct word "vlan".

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6fef22d7e650a5a7cad76c6115bea629e75eca9f
      
https://github.com/qemu/qemu/commit/6fef22d7e650a5a7cad76c6115bea629e75eca9f
  Author: Peter Maydell <address@hidden>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M qemu-doc.texi

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b968316069ab...6fef22d7e650