summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2010-09-02 03:25:33 -0400
committerAustin Clements <[email protected]>2010-09-02 03:25:33 -0400
commit4d245c79f989aff781a50c855d254b813639ee90 (patch)
tree2dcdd9beac994e7b4ed2d374280b2cae3c9db6bb
parentd3ecf3eb44379f12b47da9d08e4d1b52cf7c2601 (diff)
downloadxv6-labs-4d245c79f989aff781a50c855d254b813639ee90.tar.gz
xv6-labs-4d245c79f989aff781a50c855d254b813639ee90.tar.bz2
xv6-labs-4d245c79f989aff781a50c855d254b813639ee90.zip
Add Nickolai and myself and scrunch two lines out of the text elsewhere
-rw-r--r--README10
1 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index 3ea05a7..22f5c4e 100644
--- a/README
+++ b/README
@@ -19,6 +19,8 @@ The following people made contributions:
Russ Cox (context switching, locking)
Cliff Frey (MP)
Xiao Yu (MP)
+ Nickolai Zeldovich
+ Austin Clements
In addition, we are grateful for the patches contributed by Greg
Price, Yandong Mao, and Hitoshi Mitake.
@@ -42,9 +44,7 @@ Then run "make TOOLPREFIX=i386-jos-elf-".
To run xv6, you can use Bochs or QEMU, both PC simulators.
Bochs makes debugging easier, but QEMU is much faster.
To run in Bochs, run "make bochs" and then type "c" at the bochs prompt.
-To run in QEMU, run "make qemu". Both log the xv6 screen output to
-standard output.
+To run in QEMU, run "make qemu".
-To create a typeset version of the code, run "make xv6.pdf".
-This requires the "mpage" text formatting utility.
-See http://www.mesa.nl/pub/mpage/.
+To create a typeset version of the code, run "make xv6.pdf". This
+requires the "mpage" utility. See http://www.mesa.nl/pub/mpage/.