From 60a288c69b82bb755d4fc296c152b4e6d32e8328 Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Wed, 1 Jan 2025 10:51:03 -0800
Subject: [PATCH] Add FAQ about including subdirectories

.. also, I added the great fork merge stats to the FAQ about the great
fork merge date (as that's when the stats were final).
---
 faq.html | 21 +++++++++++++++++++--
 faq.md   | 27 +++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/faq.html b/faq.html
index 6e771ccb2..921b57c81 100644
--- a/faq.html
+++ b/faq.html
@@ -447,6 +447,7 @@
 <li><strong>Q 1.1</strong>: <a class="normal" href="#prog_c">May I use a different source or compiled filename than prog.c or prog?</a></li>
 <li><strong>Q 1.2</strong>: <a class="normal" href="#markdown">What is markdown and how does the IOCCC use it?</a></li>
 <li><strong>Q 1.3</strong>: <a class="normal" href="#mkiocccentry_bugs">How do I report bugs in an <code>mkiocccentry</code> tool?</a></li>
+<li><strong>Q 1.4</strong>: <a class="normal" href="#subdirectories">How may I use subdirectories in my submission if Rule 17 disallows them?</a></li>
 </ul>
 <h2 id="ioccc-judging-process">2. <a href="#judging">IOCCC Judging process</a></h2>
 <ul>
@@ -1071,6 +1072,16 @@ FAQ on “<a href="https://github.com/ioccc-src/mkiocccentry/blob/master/FAQ.md#
 in the <a href="https://github.com/ioccc-src/mkiocccentry">mkiocccentry repo</a>
 for more thorough details on bug reporting.</p>
 <p>Jump to: <a href="#">top</a></p>
+<div id="subdirectories">
+<h4 id="q-1.4-how-may-i-use-subdirectories-in-my-submission-if-rule-17-disallows-them">Q 1.4: How may I use subdirectories in my submission if Rule 17 disallows them?</h4>
+</div>
+<p>In order to submit a subdirectory, you may simply include a tarball. As long as
+the total size of your submission does not exceed the size limit, defined in
+<a href="https://github.com/ioccc-src/mkiocccentry/blob/master/soup/limit_ioccc.h">limit_ioccc.h</a>
+as <code>MAX_TARBALL_LEN</code> and your total number of files in your xz compressed
+tarball does not exceed the limit, defined as <code>MAX_FILE_COUNT</code> in
+<a href="https://github.com/ioccc-src/mkiocccentry/blob/master/soup/limit_ioccc.h">limit_ioccc.h</a>,
+you can include tarballs with subdirectories or other files.</p>
 <hr style="width:50%;text-align:left;margin-left:0">
 <hr style="width:50%;text-align:left;margin-left:0">
 <div id="judging">
@@ -5553,11 +5564,17 @@ from <code>winners.html</code>, via the <a href="https://github.com/ioccc-src/wi
 </div>
 <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">6167+ commits ahead</a>
+there were <a href="https://github.com/ioccc-src/winner/compare/master...ioccc-src:temp-test-ioccc:master">6169 commits ahead</a>
 of the <a href="https://github.com/ioccc-src/winner">IOCCC winner repo</a>.</p>
 <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>In particular, the <strong>Great Fork Merge</strong> was commit 0b6326676dc0d3c12cf3ba47958244fc34b4f32f
+and took place on 2024 Dec 29, a total span of <strong>833 days</strong> ‼️</p>
+<p>For details see <a href="https://github.com/ioccc-src/temp-test-ioccc/commit/0b6326676dc0d3c12cf3ba47958244fc34b4f32f">GH-commit/0b6326676dc0d3c12cf3ba47958244fc34b4f32f</a>
+and the <a href="https://github.com/ioccc-src/winner/pull/24">Pull Request 24 in the winner repo</a> that it produced.</p>
+<p>The <strong>Great Fork Merge</strong> <em>changed 5,157 files</em> with <em>843,045 additions</em> and <em>137,758
+deletions</em>, in <em>6,169 commits</em> ‼️</p>
 <p>Jump to: <a href="#">top</a></p>
 <div id="size_rule_history">
 <div id="size_restriction">
@@ -5632,7 +5649,7 @@ to the <a href="https://github.com/ioccc-src/winner">Official IOCCC winner repo<
 <a href="index.html">Official IOCCC website</a> to be updated into its present form.</p>
 <p>See the
 FAQ on “<a href="#great_fork_merge_date">Great Fork Merge Date</a>”
-for more information.</p>
+for more information and stats.</p>
 <p>Jump to: <a href="#">top</a></p>
 <div id="ioccc_bof">
 <div id="bof">
diff --git a/faq.md b/faq.md
index 2be61578c..e5d3572ff 100644
--- a/faq.md
+++ b/faq.md
@@ -21,6 +21,7 @@ This is FAQ version **28.2.0 2024-12-28**.
 - **Q 1.1**: <a class="normal" href="#prog_c">May I use a different source or compiled filename than prog.c or prog?</a>
 - **Q 1.2**: <a class="normal" href="#markdown">What is markdown and how does the IOCCC use it?</a>
 - **Q 1.3**: <a class="normal" href="#mkiocccentry_bugs">How do I report bugs in an `mkiocccentry` tool?</a>
+- **Q 1.4**: <a class="normal" href="#subdirectories">How may I use subdirectories in my submission if Rule 17 disallows them?</a>
 
 
 ## 2. [IOCCC Judging process](#judging)
@@ -825,6 +826,19 @@ for more thorough details on bug reporting.
 
 Jump to: [top](#)
 
+<div id="subdirectories">
+#### Q 1.4: How may I use subdirectories in my submission if Rule 17 disallows them?
+</div>
+
+In order to submit a subdirectory, you may simply include a tarball. As long as
+the total size of your submission does not exceed the size limit, defined in
+[limit_ioccc.h](https://github.com/ioccc-src/mkiocccentry/blob/master/soup/limit_ioccc.h)
+as `MAX_TARBALL_LEN` and your total number of files in your xz compressed
+tarball does not exceed the limit, defined as `MAX_FILE_COUNT` in
+[limit_ioccc.h](https://github.com/ioccc-src/mkiocccentry/blob/master/soup/limit_ioccc.h),
+you can include tarballs with subdirectories or other files.
+
+
 <hr style="width:50%;text-align:left;margin-left:0">
 <hr style="width:50%;text-align:left;margin-left:0">
 
@@ -6956,13 +6970,22 @@ from `winners.html`, via the [gen-authors.sh](%%REPO_URL%%/bin/gen-authors.sh) t
 
 As of 2024 Dec 28 [temp-test-ioccc
 repo](https://github.com/ioccc-src/temp-test-ioccc)
-there was [6167+ commits ahead](https://github.com/ioccc-src/winner/compare/master...ioccc-src:temp-test-ioccc:master)
+there were [6169 commits ahead](https://github.com/ioccc-src/winner/compare/master...ioccc-src:temp-test-ioccc:master)
 of the [IOCCC winner repo](https://github.com/ioccc-src/winner).
 
 On 2024 Dec 28, the temporary repo was merged back into the [IOCCC winner
 repo](https://github.com/ioccc-src/winner) resulting in many, many substantial improvements
 to the [official IOCCC website](https://www.ioccc.org).
 
+In particular, the **Great Fork Merge** was commit 0b6326676dc0d3c12cf3ba47958244fc34b4f32f
+and took place on 2024 Dec 29, a total span of **833 days** ‼️
+
+For details see [GH-commit/0b6326676dc0d3c12cf3ba47958244fc34b4f32f](https://github.com/ioccc-src/temp-test-ioccc/commit/0b6326676dc0d3c12cf3ba47958244fc34b4f32f)
+and the [Pull Request 24 in the winner repo](https://github.com/ioccc-src/winner/pull/24) that it produced.
+
+The **Great Fork Merge** _changed 5,157 files_ with _843,045 additions_ and _137,758
+deletions_, in _6,169 commits_ ‼️
+
 Jump to: [top](#)
 
 
@@ -7048,7 +7071,7 @@ to the [Official IOCCC winner repo](https://github.com/ioccc-src/winner) causing
 
 See the
 FAQ on "[Great Fork Merge Date](#great_fork_merge_date)"
-for more information.
+for more information and stats.
 
 Jump to: [top](#)