diff --git a/contact.html b/contact.html
index 8e4f7aae2..f50bd9206 100644
--- a/contact.html
+++ b/contact.html
@@ -19,13 +19,12 @@ Contest
How to enter |
Contacting the IOCCC
+Known Bugs & (Mis)features |
+Thanks for the fixes
+
IOCCC news |
People who have won |
Winning entries
-
-Known Bugs & (Mis)features |
-Thanks for the fixes |
-A bit of web site history
diff --git a/faq.md b/faq.md
index 4e14e8c2b..e4ca2c7f7 100644
--- a/faq.md
+++ b/faq.md
@@ -10,6 +10,7 @@
## Section 1 - [History of the IOCCC](#faq1)
- [1.0 - How did the IOCCC get started?](#faq1_0)
- [1.1 - Why are some years missing IOCCC winners?](#faq1_1)
+- [1.2 - What is the history of the IOCCC web site?](#faq1_2)
## Section 2 - [IOCCC Judging process](#faq2)
- [2.0 - How many entries do the judges receive for a given IOCCC?](#faq2_0)
@@ -444,6 +445,79 @@ The pause during the 2021-2023 period was due to the IOCCC judges developing too
make is much more likely for the IOCCC to be held in a yearly basis later on.
+### FAQ 1.2: What is the history of the IOCCC web site?
+
+#### In the beginning of www.ioccc.org
+
+The long history of the [official IOCCC web site](https://www.ioccc.org) can be
+viewed at the [Internet Wayback Machine Wayback Machine](https://web.archive.org).
+
+One can view several thousand snapshots showing how the [IOCCC web site has
+evolved](https://web.archive.org/web/20230000000000*/www.ioccc.org) going back
+as far as [1998 Dec 12
+www.ioccc.org](https://web.archive.org/web/19981212030016/https://www.ioccc.org/).
+
+On 2020 Dec 31, the IOCCC source tree was moved to the [IOCCC winner
+repo](https://web.archive.org/web/20210101211346/https://www.ioccc.org/) on
+[GitHub](https://github.com). From this point on, the [official IOCCC web
+site](https://www.ioccc.org) became a [GitHub Pages](https://pages.github.com)
+web site.
+
+#### 2020 Dec 28 bzip2 compressed tarball archive
+
+Furthermore, a bzip2 compressed tarball containing the released
+IOCCC winner source code may be found under the [archive/](/archive) directory.
+The file [archive-all.tar.bz2](/archive/archive-all.tar.bz2) contains all years
+and the individual years are in the form `archive/archive-YYYY.tar.bz2`.
+
+These files were obtained from the [Internet Wayback
+Machine](https://web.archive.org) from the [snapshot of the website on 2020 Dec
+28](https://web.archive.org/web/20201228005211/https://www.ioccc.org/). See
+`archive/README.md` for details about these bzip2 compressed tarballs.
+
+**XXX**: Change the references to _temp-test-ioccc_ to _winners_
+when these fixes are merged.
+
+#### 2022 Dec 29 repo fork
+
+On 2022 Dec 29, the [IOCCC winner repo](https://github.com/ioccc-src/winner),
+from which the [official IOCCC web site of 2022 Dec
+29](https://web.archive.org/web/20221231001721/https://www.ioccc.org/) was
+generated, was forked into a temporary repo where it is currently undergoing
+changes with several thousand changes and important improvements already such
+as:
+
+--
+
+***XXX**: change the above text to read:
+
+... where it underwent several thousand changes and important improvements such
+as:
+
+--
+
+* Moving IOCCC winners into their own separate directories
+* Fixing lots and lots of typos
+* Fixing Makefiles and code to allow for nearly all winners to be compiled and
+work on modern systems
+* Reworking the Makefiles to use a consistent set of rules
+* Reworking the Makefiles specific to the gcc and clang C compilers
+* Replacing the various hint files with a README.md markdown that is more consistent across IOCCC years
+* Setting up a system whereby authors of IOCCC entries may update their own contact information via a GitHub pull request
+* Setting up to generate the top level years.html file via a tool
+* Setting up to generate the top level winners.html file via a tool
+* etc.
+
+#### 20yy mm dd pull request
+
+On 20yy mm dd, the temporary repo was merged back into the [IOCCC winner
+repo](https://github.com/ioccc-src/winner) resulting in substantial improvements
+to the [official IOCCC web site](https://www.ioccc.org).
+
+**XXX**: Fill in the date when the pull request happens including the
+size of the pull request and/or number of changes that went into the pull request.
+
+
## Section 2: IOCCC Judging process
diff --git a/judges.html b/judges.html
index 53e1f982a..7b108ee07 100644
--- a/judges.html
+++ b/judges.html
@@ -19,13 +19,12 @@ Contest
How to enter |
Contacting the IOCCC
+Known Bugs & (Mis)features |
+Thanks for the fixes
+
IOCCC news |
People who have won |
Winning entries
-
-Known Bugs & (Mis)features |
-Thanks for the fixes |
-A bit of web site history
diff --git a/winners.html b/winners.html
index aaca8ab90..4bcdd6d7d 100644
--- a/winners.html
+++ b/winners.html
@@ -19,13 +19,12 @@ Contest
How to enter |
Contacting the IOCCC
+Known Bugs & (Mis)features |
+Thanks for the fixes
+
IOCCC news |
People who have won |
Winning entries
-
-Known Bugs & (Mis)features |
-Thanks for the fixes |
-A bit of web site history
[
diff --git a/www-history.md b/www-history.md
deleted file mode 100644
index 5ccd66662..000000000
--- a/www-history.md
+++ /dev/null
@@ -1,71 +0,0 @@
-## History of the www.ioccc.org web site
-
-## In the beginning of www.ioccc.org
-
-The long history of the [official IOCCC web site](https://www.ioccc.org) can be
-viewed at the [Internet Wayback Machine Wayback Machine](https://web.archive.org).
-
-One can view several thousand snapshots showing how the [IOCCC web site has
-evolved](https://web.archive.org/web/20230000000000*/www.ioccc.org) going back
-as far as [1998 Dec 12
-www.ioccc.org](https://web.archive.org/web/19981212030016/https://www.ioccc.org/).
-
-On 2020 Dec 31, the IOCCC source tree was moved to the [IOCCC winner
-repo](https://web.archive.org/web/20210101211346/https://www.ioccc.org/) on
-[GitHub](https://github.com). From this point on, the [official IOCCC web
-site](https://www.ioccc.org) became a [GitHub Pages](https://pages.github.com)
-web site.
-
-## 2020 Dec 28 bzip2 compressed tarball archive
-
-Furthermore, a bzip2 compressed tarball containing the released
-IOCCC winner source code may be found under the [archive/](/archive) directory.
-The file [archive-all.tar.bz2](/archive/archive-all.tar.bz2) contains all years
-and the individual years are in the form `archive/archive-YYYY.tar.bz2`.
-
-These files were obtained from the [Internet Wayback
-Machine](https://web.archive.org) from the [snapshot of the website on 2020 Dec
-28](https://web.archive.org/web/20201228005211/https://www.ioccc.org/). See
-`archive/README.md` for details about these bzip2 compressed tarballs.
-
-**XXX**: Change the references to _temp-test-ioccc_ to _winners_
-when these fixes are merged.
-
-## 2022 Dec 29 repo fork
-
-On 2022 Dec 29, the [IOCCC winner repo](https://github.com/ioccc-src/winner),
-from which the [official IOCCC web site of 2022 Dec
-29](https://web.archive.org/web/20221231001721/https://www.ioccc.org/) was
-generated, was forked into a temporary repo where it is currently undergoing
-changes with several thousand changes and important improvements already such
-as:
-
---
-
-***XXX**: change the above text to read:
-
-... where it underwent several thousand changes and important improvements such
-as:
-
---
-
-* Moving IOCCC winners into their own separate directories
-* Fixing lots and lots of typos
-* Fixing Makefiles and code to allow for nearly all winners to be compiled and
-work on modern systems
-* Reworking the Makefiles to use a consistent set of rules
-* Reworking the Makefiles specific to the gcc and clang C compilers
-* Replacing the various hint files with a README.md markdown that is more consistent across IOCCC years
-* Setting up a system whereby authors of IOCCC entries may update their own contact information via a GitHub pull request
-* Setting up to generate the top level years.html file via a tool
-* Setting up to generate the top level winners.html file via a tool
-* etc.
-
-## 20yy mm dd pull request
-
-On 20yy mm dd, the temporary repo was merged back into the [IOCCC winner
-repo](https://github.com/ioccc-src/winner) resulting in substantial improvements
-to the [official IOCCC web site](https://www.ioccc.org).
-
-**XXX**: Fill in the date when the pull request happens including the
-size of the pull request and/or number of changes that went into the pull request.
diff --git a/years.html b/years.html
index 5080363a6..07c83e454 100644
--- a/years.html
+++ b/years.html
@@ -22,13 +22,12 @@ Contest
How to enter |
Contacting the IOCCC
+Known Bugs & (Mis)features |
+Thanks for the fixes
+
IOCCC news |
People who have won |
Winning entries
-
-Known Bugs & (Mis)features |
-Thanks for the fixes |
-A bit of web site history