Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / doc / standards.texi

diff --git a/doc/standards.texi b/doc/standards.texi
index 5b5d50293cb4397168d4027b37ce45e19f209f94..a1c70a47961a69baac2f0bfe906c15870c88677d 100644 (file)
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -42,6 +42,8 @@ different style won't cause actual problems, but it's ugly to see
 gratuitous differences in style from one function to another.  If your
 code is too ugly, it will cost you points.
 
+Please limit C source file lines to at most 79 characters long.
+
 Pintos comments sometimes refer to external standards or
 specifications by writing a name inside square brackets, like this:
 @code{[IA32-v3]}.  These names refer to the reference names used in
@@ -78,14 +80,9 @@ There are a few exceptions:
 
 @itemize @bullet
 @item
-Problem 1-2, @func{thread_join}.  Some other code expects
-@code{THREAD_JOIN_IMPLEMENTED} to be defined once you've implemented
-this function.
-
-@item
-Problem 1-4, the advanced scheduler.  We must be able to turn this on
+Problem 1-3, the advanced scheduler.  We must be able to turn this on
 and off with a compile-time directive.  You must use the macro name we
-specify for that part.  @xref{Problem 1-4 Advanced Scheduler}, for
+specify for that part.  @xref{Problem 1-3 Advanced Scheduler}, for
 details.
 
 @item