From: Neal Norwitz Date: Thu, 16 Aug 2007 05:16:09 +0000 (+0000) Subject: Try to make the comment a little clearer. X-Git-Tag: v2.6a1~1496 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c404aed0e191bb3b5450e5f836889efb06e0c25;p=python Try to make the comment a little clearer. --- diff --git a/Misc/build.sh b/Misc/build.sh index 4883c0efe4..aad7fe173b 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -214,9 +214,10 @@ fi cd $DIR/Doc F="make-doc.out" start=`current_time` -# XXX(nnorwitz): will there be a similar problem with the new ReST-based system? -# Keep this code around until after the first release of 2.6a1 or 3.0a1. -# At that point, it should be clear if this code is needed or not. +# XXX(nnorwitz): For now, keep the code that checks for a conflicted file until +# after the first release of 2.6a1 or 3.0a1. At that point, it will be clear +# if there will be a similar problem with the new doc system. + # Doc/commontex/boilerplate.tex is expected to always have an outstanding # modification for the date. When a release is cut, a conflict occurs. # This allows us to detect this problem and not try to build the docs