summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-16 05:16:09 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-16 05:16:09 (GMT)
commit5c404aed0e191bb3b5450e5f836889efb06e0c25 (patch)
tree0f2f92b529ee5bf695445f1433d29966c4ff6458
parent7def3e05ce1be2a984e8e58884618d1153f5d065 (diff)
downloadcpython-5c404aed0e191bb3b5450e5f836889efb06e0c25.zip
cpython-5c404aed0e191bb3b5450e5f836889efb06e0c25.tar.gz
cpython-5c404aed0e191bb3b5450e5f836889efb06e0c25.tar.bz2
Try to make the comment a little clearer.
-rwxr-xr-xMisc/build.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/Misc/build.sh b/Misc/build.sh
index 4883c0e..aad7fe1 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