set tentative IOCCC28 dates, update rules and guidelines

We set dates and times for when IOCCC28 will go into pending state,
open state, and judging state.  These dates are subject to change until
the content enters the open state.

Modified both `next/guidelines.md` and `next/rules.md` as per the
IOCCC28 dates and times.

Improve the `next/guidelines.md` and `next/rules.md` text around IOCCC28 dates and times.

We processed the XXX's in markdown files that needed processing.

Fixed a minor typo in `bin/cvt-submission.sh`.

Made some minor formatting improvements to `faq.md`, `next/register.md`,
`next/rules.md`, `next/guidelines.md`, `README.md` and `index.md.

Updated "Rule 3" in `next/rules.md` in regards to the above.

Updated "Rule 8" in `next/rules.md` in regards to the above.

Changed `faq.md`  version from **28.1.8 2024-12-07**
to **28.2.0 2024-12-28**.

Changed `next/guidelines.md` version from **28.29 2024-12-27**
to **28.30 2024-12-28**.

Changed `next/rules.md` version from **28.14 2024-12-07**
to **28.15 2024-12-28**.

TODO: Review these changes.

Author: lcn2

README.html

@@ -424,19 +424,6 @@ <h2>About the IOCCC GitHub repo</h2>
 <!-- START: this line starts content for HTML phase 21 by: bin/pandoc-wrapper.sh via bin/md2html.sh -->
 
 <!-- BEFORE: 1st line of markdown file: README.md -->
-<!-- XXX - This entire section goes away during the final stages of the Great Fork Merge -->
-<h3 id="this-is-not-the-official-ioccc-website">This is NOT the official IOCCC website!</h3>
-<p>Please visit <a href="https://www.ioccc.org">www.ioccc.org</a> for the official <strong>IOCCC</strong> website.</p>
-<p>Please do NOT bookmark nor link to this <a href="https://ioccc-src.github.io/temp-test-ioccc/">experimental website</a>.</p>
-<p>When this experiment is finished, this site will go away and its associated <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc GitHub repo</a> will go into read-only archival mode.</p>
-<p>The <a href="https://ioccc-src.github.io/temp-test-ioccc/">experimental website</a> is associated with the <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc GitHub repo</a>.</p>
-<p>This website will be undergoing major changes, so expect many
-broken links, typos and other problems. If you wish to recommend
-changes (understanding that things may be rapidly changing out from
-under your copy), then consider making pull requests against the
-temp-test-ioccc GitHub repo.</p>
-<h3 id="what-follows-is-the-actual-readme.md-file">What follows is the actual README.md file</h3>
-<!-- XXX - remove down to here in the final stages of the Great Fork Merge -->
 <h1 id="the-international-obfuscated-c-code-contest">The International Obfuscated C Code Contest</h1>
 <h2 id="obfuscate-verb-with-object"><strong>Obfuscate</strong> | <em>verb</em> [with object]</h2>
 <ul>

README.md

@@ -1,25 +1,3 @@
-<!-- XXX - This entire section goes away during the final stages of the Great Fork Merge -->
-### This is NOT the official IOCCC website!
-
-Please visit [www.ioccc.org](https://www.ioccc.org) for the official **IOCCC** website.
-
-Please do NOT bookmark nor link to this [experimental website](https://ioccc-src.github.io/temp-test-ioccc/).
-
-When this experiment is finished, this site will go away and its associated [temp-test-ioccc GitHub repo](https://github.com/ioccc-src/temp-test-ioccc) will go into read-only archival mode.
-
-The [experimental website](https://ioccc-src.github.io/temp-test-ioccc/) is associated with the [temp-test-ioccc GitHub repo](https://github.com/ioccc-src/temp-test-ioccc).
-
-This website will be undergoing major changes, so expect many
-broken links, typos and other problems. If you wish to recommend
-changes (understanding that things may be rapidly changing out from
-under your copy), then consider making pull requests against the
-temp-test-ioccc GitHub repo.
-
-
-### What follows is the actual README.md file
-
-
-<!-- XXX - remove down to here in the final stages of the Great Fork Merge -->
 # The International Obfuscated C Code Contest
 
 

bin/README.md

@@ -359,7 +359,7 @@ This tool will form `YYYY/dir/README.md` if needed, from `YYYY/dir/remarks.md`,
 **NOTE**: This interactive tool (unless `-i input_data` is used) does
 **NOT** perform all of the steps needed to make a directory for a new winning
 IOCCC entry.  For example, files such as `YYYY/dir/README.md` and/or `YYYY/dir/index.html`
-might contain "_triple X_" comments (`<!--XXXX-->`), indicating where the [Judges](../judges.html)
+might contain "_triple X_" comments, indicating where the [Judges](../judges.html)
 need to add content.  Moreover, the `Makefile` and `.gitignore` files
 need to be examined for suitability, etc.
 
@@ -913,7 +913,7 @@ It will form `YYYY/README.md` if needed, from `template/README.md.year`.
 
 **NOTE**: This tool does **NOT** perform all of the steps needed to make a new IOCCC year directory.
 For example, files such as `YYYY/README.md` and/or `YYYY/index.html`
-might contain "_triple X_" comments (`<!-- XXX -->`) indicating where the
+might contain "_triple X_" comments indicating where the
 [Judges](../judges.html) need to add content.
 
 Usage:

bin/cvt-submission.sh

@@ -2193,7 +2193,7 @@ if [[ -z $NOOP ]]; then
 	if [[ -f $YYYY_DIR/remarks.md ]]; then
 	    cat "$YYYY_DIR/remarks.md" >> "$README_MD"
 	else
-	    echo "$X_3 - mo remarks.md file was found" >> "$README_MD"
+	    echo "$X_3 - no remarks.md file was found" >> "$README_MD"
 	fi
 	sed -e "s/$X_3-YEAR-$X_3/$YEAR_DIR/" "$TEMPLATE_README_MD_TAIL" >> "$README_MD"
     fi

bin/index.html

@@ -646,7 +646,7 @@ <h3 id="cvt-submission.sh"><a href="https://github.com/ioccc-src/temp-test-ioccc
 <p><strong>NOTE</strong>: This interactive tool (unless <code>-i input_data</code> is used) does
 <strong>NOT</strong> perform all of the steps needed to make a directory for a new winning
 IOCCC entry. For example, files such as <code>YYYY/dir/README.md</code> and/or <code>YYYY/dir/index.html</code>
-might contain “<em>triple X</em>” comments (<code>&lt;!--XXXX--&gt;</code>), indicating where the <a href="../judges.html">Judges</a>
+might contain “<em>triple X</em>” comments, indicating where the <a href="../judges.html">Judges</a>
 need to add content. Moreover, the <code>Makefile</code> and <code>.gitignore</code> files
 need to be examined for suitability, etc.</p>
 <p><strong>HINT</strong>: Executing this tool on your submission will <strong>NOT</strong> make you an IOCCC winner. :-)</p>
@@ -965,7 +965,7 @@ <h3 id="new-year.sh"><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/
 It will form <code>YYYY/README.md</code> if needed, from <code>template/README.md.year</code>.</p>
 <p><strong>NOTE</strong>: This tool does <strong>NOT</strong> perform all of the steps needed to make a new IOCCC year directory.
 For example, files such as <code>YYYY/README.md</code> and/or <code>YYYY/index.html</code>
-might contain “<em>triple X</em>” comments (<code>&lt;!-- XXX --&gt;</code>) indicating where the
+might contain “<em>triple X</em>” comments indicating where the
 <a href="../judges.html">Judges</a> need to add content.</p>
 <p>Usage:</p>
 <pre><code>    bin/new-year.sh -v 1 YYYY</code></pre>

faq.html

@@ -425,7 +425,7 @@ <h2>Frequently Asked Questions</h2>
 
 <!-- BEFORE: 1st line of markdown file: faq.md -->
 <h1 id="ioccc-faq-table-of-contents">IOCCC FAQ Table of Contents</h1>
-<p>This is FAQ version <strong>28.1.8 2024-12-07</strong>.</p>
+<p>This is FAQ version <strong>28.2.0 2024-12-28</strong>.</p>
 <h2 id="entering-the-ioccc-the-bare-minimum-you-need-to-know">0. <a href="#enter_questions">Entering the IOCCC: the bare minimum you need to know</a></h2>
 <ul>
 <li><strong>Q 0.0</strong>: <a class="normal" href="#enter">How can I enter the IOCCC?</a></li>
@@ -582,7 +582,7 @@ <h3 id="q-0.0-how-can-i-enter-the-ioccc">Q 0.0: How can I enter the IOCCC?</h3>
 <div id="step_0">
 <h4 id="verify-that-the-ioccc-is-pending-or-open-for-submissions">0. Verify that the IOCCC is pending or open for submissions</h4>
 </div>
-<p>First, check the <a href="status.html">current status of the IOCCC</a> see of the contest.
+<p>First, check the “<strong><a href="status.html">current status of the IOCCC</a></strong>” page to see current contest status.
 You may <strong>only register for the IOCCC when the IOCCC is either <a href="status.html#pending">pending</a>
 or <a href="status.html#open">open</a></strong>.</p>
 <p>You may <strong>only submit your entries to the IOCCC when the IOCCC is <a href="status.html#open">open</a></strong>.</p>
@@ -600,9 +600,9 @@ <h4 id="register-for-the-ioccc">2. Register for the IOCCC</h4>
 </div>
 </div>
 <p><strong>IMPORTANT</strong>: You may <strong>only register for the IOCCC when the IOCCC is either <a href="status.html#pending">pending</a>
-or <a href="status.html#open">open</a></strong>. See <a href="status.html">current status of the IOCCC</a> for details.</p>
+or <a href="status.html#open">open</a></strong>. See “<strong><a href="status.html">current status of the IOCCC</a></strong>” page for details.</p>
 <p>If the contest is <a href="status.html#pending">pending</a> or <a href="status.html#open">open</a>,
-then follow the directions on <strong><a href="next/register.html">How to register for the IOCCC</a></strong>.</p>
+then follow the directions on “<strong><a href="next/register.html">how to register for the IOCCC</a></strong>”.</p>
 <div id="step_3">
 <h4 id="wait-for-your-submit-server-username-and-initial-password">3. Wait for your submit server username and initial password</h4>
 </div>
@@ -619,23 +619,22 @@ <h4 id="wait-for-your-submit-server-username-and-initial-password">3. Wait for y
 then you will <strong>NOT</strong> receive your <strong>Username</strong> and <strong>Initial password</strong>
 by email. For example, if the contest is <a href="status.html#pending">pending</a>,
 you will have to <strong>WAIT UNTIL THE CONTEST IS <a href="status.html#open">OPEN</a></strong>.</p>
-<p>Please check the <a href="status.html">current status of the IOCCC</a> and
-visit the <a href="next/register.html">How to register for the IOCCC</a> for detailed instructions.</p>
+<p>Please check the “<strong><a href="status.html">current status of the IOCCC</a></strong>” page and
+visit the “<strong><a href="next/register.html">how to register for the IOCCC</a></strong>” page for detailed instructions.</p>
 <p><strong>NOTE</strong>: If are having trouble receiving your <strong>Username</strong> and <strong>Initial
 password</strong>, and the <strong>CONTEST IS <a href="status.html#open">OPEN</a></strong>, and
 have you checked your spam folder, <a href="contact.html">Contact the IOCCC</a>
 for assistance.</p>
 <div id="step_4">
 <h4 id="login-to-the-submit-server-and-change-your-password">4. Login to the submit server and change your password</h4>
 </div>
-<p>Using the <strong>Username</strong> and <strong>Initial password</strong> you receive via
-email in <a href="#step_3">step 3</a>, you need to login to the <a href="https://submit.ioccc.org">IOCCC submit
-server</a>.</p>
+<p>Using the <strong>Username</strong> and <strong>Initial password</strong> you receive via email in
+<a href="#step_3">step 3</a>, you need to login to the <a href="https://submit.ioccc.org">IOCCC submit server</a>.</p>
 <p><strong>IMPORTANT NOTE</strong>: You must change your password <strong>WITHIN 72 HOURS</strong>
 from when one of the <a href="judges.html">IOCCC judges</a> sent that email.</p>
 <p><strong>NOTE</strong>: The <a href="https://submit.ioccc.org">IOCCC submit server</a>
 is only ready for submissions <strong>ONLY WHEN THE CONTEST IS <a href="status.html#open">open</a></strong>.</p>
-<p>Please visit the <a href="next/pw-change.html">Change your submit server initial password</a> page for detailed instructions.</p>
+<p>Please visit the “<strong><a href="next/pw-change.html">change your submit server initial password</a></strong>” page for detailed instructions.</p>
 <div id="step_5">
 <h4 id="obtain-and-compile-the-latest-mkiocccentry-toolkit">5. Obtain and compile the latest mkiocccentry toolkit</h4>
 </div>
@@ -645,9 +644,11 @@ <h4 id="obtain-and-compile-the-latest-mkiocccentry-toolkit">5. Obtain and compil
 the <a href="https://github.com/ioccc-src/mkiocccentry">mkiocccentry toolkit</a>
 could change. Once the content is <a href="status.html#open">open</a>, be sure
 you <strong>have the latest</strong> version installed.</p>
-<p>To help you, please see the FAQ on “<a href="#obtaining_mkiocccentry">how to obtain the most recent
-mkiocccentry</a>” and the FAQ on “<a href="#compiling_mkiocccentry">compiling
-mkiocccentry toolkit</a>”, for more details.</p>
+<p>To help you, please see the
+FAQ on “<a href="#obtaining_mkiocccentry">how to obtain the most recent mkiocccentry</a>”
+and the
+FAQ on “<a href="#compiling_mkiocccentry">compiling mkiocccentry toolkit</a>”,
+for more details.</p>
 <div id="step_6">
 <h4 id="run-the-mkiocccentry-tool-to-form-your-submission-tarball">6. Run the mkiocccentry tool to form your submission tarball</h4>
 </div>
@@ -682,8 +683,7 @@ <h4 id="run-the-mkiocccentry-tool-to-form-your-submission-tarball">6. Run the mk
 you’ll have to use the form of <code>./mkiocccentry</code> instead of just <code>mkiocccentry</code>.
 However, installing it will make it easier for you as you can run it from your
 submission’s directory. See the
-FAQ on “<a href="https://github.com/ioccc-src/mkiocccentry/blob/master/FAQ.md#install">installing
-mkiocccentry</a>”
+FAQ on “<strong><a href="https://github.com/ioccc-src/mkiocccentry/blob/master/FAQ.md#install">installing mkiocccentry</a></strong>”
 at the mkiocccentry repo.</p>
 <p>If the <code>mkiocccentry</code> tool indicates that there is a problem with your entry,
 especially if it identifies a <a href="next/rules.html#rule2">Rule 2</a>, or any other
@@ -697,7 +697,7 @@ <h4 id="run-the-mkiocccentry-tool-to-form-your-submission-tarball">6. Run the mk
 <h4 id="upload-your-submission-to-the-ioccc-submit-server">7. Upload your submission to the IOCCC submit server</h4>
 </div>
 </div>
-<p>The screenshots about <a href="next/submit.html">how to upload your submission to the IOCCC</a>
+<p>The screenshots on the “<strong><a href="next/submit.html">how to upload your submission to the IOCCC</a></strong>” page
 might be a helpful guide when using the <a href="https://submit.ioccc.org">IOCCC submit server</a>.</p>
 <p><strong>NOTE</strong>: You may modify a previous uploaded submission, if the contest is
 <a href="status.html#open">open</a>, by replacing the file in a slot. Please use the
@@ -708,7 +708,7 @@ <h4 id="upload-your-submission-to-the-ioccc-submit-server">7. Upload your submis
 <p><strong>IMPORTANT NOTE</strong>: The <a href="https://submit.ioccc.org">IOCCC submit server</a>
 is only ready for submissions
 <strong>ONLY WHEN THE CONTEST IS <a href="status.html#open">open</a></strong>.</p>
-<p>See <a href="status.html">current status of the IOCCC</a> for details on the contest status.</p>
+<p>See the “<strong><a href="status.html">current status of the IOCCC</a></strong>” page for details on the contest status.</p>
 <p><strong>IMPORTANT NOTE</strong>: When the contest is <a href="status.html#closed">closed</a>, the
 <a href="https://submit.ioccc.org">IOCCC submit server</a>
 might be offline and unreachable as a website.</p>
@@ -5549,15 +5549,13 @@ <h4 id="dec-30-thru-202y-mmm-dd---work-on-the-temp-test-ioccc-github-repo">2020
 <li>Etc.</li>
 </ul>
 <div id="great_fork_merge_date">
-<h4 id="y-mm-dd-the-great-fork-merge">202y mm dd The Great Fork Merge <!-- XXX - Fill in the date when Great Fork Merge happens --></h4>
+<h4 id="dec-28-the-great-fork-merge">2024 Dec 28 The Great Fork Merge</h4>
 </div>
-<!-- XXX - Update the commit count just before Great Fork Merge happens -->
-<p>As of 2024 Dec 27 <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc
+<p>As of 2024 Dec 28 <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc
 repo</a>
-there was <a href="https://github.com/ioccc-src/winner/compare/master...ioccc-src:temp-test-ioccc:master">6141+ commits ahead</a>
+there was <a href="https://github.com/ioccc-src/winner/compare/master...ioccc-src:temp-test-ioccc:master">6165+ commits ahead</a>
 of the <a href="https://github.com/ioccc-src/winner">IOCCC winner repo</a>.</p>
-<!-- XXX - Fill in the date when Great Fork Merge happens -->
-<p>On 202y mm dd, the temporary repo was merged back into the <a href="https://github.com/ioccc-src/winner">IOCCC winner
+<p>On 2024 Dec 28, the temporary repo was merged back into the <a href="https://github.com/ioccc-src/winner">IOCCC winner
 repo</a> resulting in many, many substantial improvements
 to the <a href="https://www.ioccc.org">official IOCCC website</a>.</p>
 <p>Jump to: <a href="#">top</a></p>