summaryrefslogtreecommitdiff
path: root/qemu.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-03-06 21:57:01 +0100
committerThomas Schwinge <thomas@codesourcery.com>2013-03-06 21:57:01 +0100
commit059ad001a35fe8d656ab3d73d4296dabc643a098 (patch)
tree4d7f2bf68fe6f64c26e840a01ec4f0ebf16f4436 /qemu.mdwn
parent31197ac55a5f93e8c5ad44d9a86fe0d62e0ab424 (diff)
parent3dc03db6f1705ba0f9b6b20114040090b26b1cba (diff)
Merge remote-tracking branch 'savannah/master'
Diffstat (limited to 'qemu.mdwn')
-rw-r--r--qemu.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu.mdwn b/qemu.mdwn
index d7cea5ad..cc85ee10 100644
--- a/qemu.mdwn
+++ b/qemu.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2005, 2007, 2008, 2009, 2010 Free Software
+[[!meta copyright="Copyright © 2005, 2007, 2008, 2009, 2010, 2013 Free Software
Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -11,7 +11,7 @@ License|/fdl]]."]]"""]]
QEMU is free software written by Fabrice Bellard that implements a fast
processor [[emulator|emulation]], allowing a user to run one operating system
-within another one. It is similar to projects such as [[Bochs]] and VMware
+within another one. It is similar to projects such as Bochs and VMware
Workstation, but has several features these lack, including increased speed and
support for multiple architectures. By using dynamic translation it achieves a
reasonable speed while being easy to port on new host CPUs.