From a98d8397a475ffb9c4b7998aa6c9782d4559c5b6 Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:03:12 -0700 Subject: [PATCH] Fix consistency in menus and pages In some pages at the top it had 'and' but in the menu it had instead a '&'. The menus (JavaScript and otherwise) now has 'and' to match the pages. The file nojs-menu.html has been checked for broken links and indeed one at least was fixed. Very few top level html files need to be checked now. Some that are entirely generated should be okay but links will still be checked to be sure. Some cases of '(Mis)features' from the previous commit were also corrected to '(mis)features' as this is also part of menu and page consistency. The files markdown.{md,html} have had the menus updated too but there are some other changes that were works in progress. This file is not thus completed but will be sometime soon. --- CODE_OF_CONDUCT.html | 8 ++++---- README.html | 8 ++++---- archive/historic/index.html | 8 ++++---- bin/index.html | 8 ++++---- bugs.html | 8 ++++---- contact.html | 8 ++++---- faq.html | 8 ++++---- inc/index.html | 8 ++++---- inc/topbar.default.html | 8 ++++---- index.html | 8 ++++---- judges.html | 8 ++++---- license.html | 8 ++++---- markdown.html | 39 ++++++++++++++++++------------------- markdown.md | 31 ++++++++++++++--------------- news.html | 8 ++++---- next/guidelines.html | 8 ++++---- next/index.html | 8 ++++---- next/rules.html | 8 ++++---- nojs-menu.html | 14 ++++++------- nojs-menu.md | 6 +++--- status.html | 8 ++++---- thanks-for-help.html | 8 ++++---- 22 files changed, 116 insertions(+), 118 deletions(-) diff --git a/CODE_OF_CONDUCT.html b/CODE_OF_CONDUCT.html index 5e7e180bc..7251ae498 100644 --- a/CODE_OF_CONDUCT.html +++ b/CODE_OF_CONDUCT.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/README.html b/README.html index 55cc134d7..523a4f890 100644 --- a/README.html +++ b/README.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/archive/historic/index.html b/archive/historic/index.html index 3c8697513..83d5f9a33 100644 --- a/archive/historic/index.html +++ b/archive/historic/index.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/bin/index.html b/bin/index.html index 49f940f8b..fa22dbc06 100644 --- a/bin/index.html +++ b/bin/index.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/bugs.html b/bugs.html index bff109611..72125eda7 100644 --- a/bugs.html +++ b/bugs.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/contact.html b/contact.html index 2f935fced..f936c957c 100644 --- a/contact.html +++ b/contact.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/faq.html b/faq.html index 5089d0e50..704817aaa 100644 --- a/faq.html +++ b/faq.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/inc/index.html b/inc/index.html index e42f1b935..8c96914bf 100644 --- a/inc/index.html +++ b/inc/index.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/inc/topbar.default.html b/inc/topbar.default.html index 3f28d1e5b..dfde57cd0 100644 --- a/inc/topbar.default.html +++ b/inc/topbar.default.html @@ -36,7 +36,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -62,7 +62,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -192,7 +192,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -210,7 +210,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/index.html b/index.html index 13dfddd8d..e2204131f 100644 --- a/index.html +++ b/index.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/judges.html b/judges.html index e7979b2c3..c27a68da7 100644 --- a/judges.html +++ b/judges.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/license.html b/license.html index af3b644ff..34c3ed76e 100644 --- a/license.html +++ b/license.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/markdown.html b/markdown.html index 04d41323d..7dd0730fb 100644 --- a/markdown.html +++ b/markdown.html @@ -80,7 +80,7 @@
- Bugs & (Mis)features + Bugs and (mis)features
@@ -106,7 +106,7 @@
- Rules & Guidelines + Rules and Guidelines
@@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines @@ -384,22 +384,22 @@

IOCCC markdown best practices

The IOCCC makes extensive use of markdown. -For example, we submitting to the IOCCC, we have people -to submit remarks about entry in markdown format. Every +For example, when submitting to the IOCCC, we have people +submit remarks about their entry in markdown format. Every winning IOCCC entry uses a README.md markdown file as the basis for forming the index.html web page for that entry. All generated HTML pages on the Official IOCCC website start with some markdown content.

See the markdown syntax guide. -See also CommonMark Spec.

+See also the CommonMark Spec.

Nevertheless, the IOCCC does have certain practices that we ask authors to follow. -Some these relate to use of markdown directly, others relate to injecting HTML +Some of these relate to use of markdown directly and others relate to injecting HTML into the markdown file.

-

In particular there are things we ask people to please do NOT use in +

In particular there are things we ask people to please NOT use in markdown files for the IOCCC:

Please do NOT use the HTML construct:

-
    <a name="string">...</a>                                  <=== no thank you
+
    <a name="string">...</a>                                  <!-- no thank you -->

as those are NOT part of the HTML 5 standard.

Instead use:

    <div id="string">...</div>
@@ -409,26 +409,26 @@ encapsulates the HTML you want to name: i.e., the target of some for the given page URL.

There are certain HTML Elements that cannot have internal <div id="string">...</div>.

For example:

-
    # <div id="string">THIS WILL NOT WORK!</div>              <=== this will not work
-

For things like headings, you have to surround them as in:

+
    # <div id="string">THIS WILL NOT WORK!</div>              <!-- this will not work -->
+

For things like headings, you have to surround them, as in:

    <div id="string">
     # This will work
     </div>

While some browsers will still recognize the HTML construct <a name="string">...</a>, it is possible they might NOT in the future.

-

Please do NOT use the <strike> nor <s> HTML element

-

Please NOT use the obsolete <strike> nor <s> ( strikeout ) HTML elements:

-
    <strike>...</strike>                                      <=== no thank you
-    <s>...</s>                                                <=== no thank you
+

Please do NOT use the <strike> or <s> HTML element

+

Please NOT use the obsolete <strike> or <s> (strikeout) HTML elements:

+
    <strike>...</strike>                                      <!-- no thank you -->
+    <s>...</s>                                                <!-- no thank you -->

Use instead:

    <del>...</del>

Please do NOT use the <u> HTML element

Please NOT use the obsolete <u> (underline) HTML element:

-
    <u>...</u>                                                <=== no thank you
+
    <u>...</u>                                                <!-- no thank you -->

Use instead:

    <ins>...</ins>

Please do NOT use the <tt> HTML element

Please do NOT use the obsolete <tt> (teletype) HTML element:

-
    <tt>The obsolete tt element is obsolete</tt>              <=== no thank you
+
    <tt>The obsolete tt element is obsolete</tt>              <!-- no thank you -->

Instead use either a monospaced span:

    <span style="font-family: monospace;">Use of monospaced font is one option</span>

Or better and easier still, use an inline markdown code block:

@@ -436,8 +436,7 @@ for the given page URL.

Please do NOT use unindented code blocks

Please do NOT start code blocks at the left-hand edge.

```
-This code block                                               <=== no thank you
-is NOT indented
+This code block is NOT indented                   <!-- no thank you -->
 ```

We request that you indent the code block by 4 spaces:

```
diff --git a/markdown.md b/markdown.md
index 3be81312f..9f91caeb2 100644
--- a/markdown.md
+++ b/markdown.md
@@ -1,21 +1,21 @@
 # IOCCC markdown best practices
 
 The IOCCC makes extensive use of [markdown](https://daringfireball.net/projects/markdown/).
-For example, we [submitting to the IOCCC](faq.html#submit), we have people
-to submit remarks about entry in markdown format.  Every
+For example, when [submitting to the IOCCC](faq.html#submit), we have people
+submit remarks about their entry in markdown format.  Every
 [winning IOCCC entry](years.html) uses a `README.md` markdown file
 as the basis for forming the `index.html` web page for that entry.
 All generated HTML pages on the [Official IOCCC website](https://www.ioccc.org/index.html)
 start with some markdown content.
 
 See the [markdown syntax](https://www.markdownguide.org/basic-syntax) guide.
-See also [CommonMark Spec](https://spec.commonmark.org/current/).
+See also the [CommonMark Spec](https://spec.commonmark.org/current/).
 
 Nevertheless, the IOCCC does have certain practices that we ask authors to follow.
-Some these relate to use of markdown directly, others relate to injecting HTML
+Some of these relate to use of markdown directly and others relate to injecting HTML
 into the markdown file.
 
-In particular there are things we ask people to please do **NOT** use in
+In particular there are things we ask people to please **NOT** use in
 markdown files for the IOCCC:
 
 
@@ -24,7 +24,7 @@ markdown files for the IOCCC:
 Please do **NOT** use the HTML construct:
 
 ```
-    ...                                  <=== no thank you
+    ...                                  
 ```
 
 as those are **NOT** part of the HTML 5 standard.
@@ -46,10 +46,10 @@ id="string">...`.
 For example:
 
 ```
-    # 
THIS WILL NOT WORK!
<=== this will not work + #
THIS WILL NOT WORK!
``` -For things like headings, you have to surround them as in: +For things like headings, you have to surround them, as in: ```
@@ -61,13 +61,13 @@ While some browsers will still recognize the HTML construct `...`, it is possible they might NOT in the future. -## Please do NOT use the `` nor `` HTML element +## Please do NOT use the `` or `` HTML element -Please NOT use the obsolete `` nor `` ( _strikeout_ ) HTML elements: +Please NOT use the obsolete `` or `` (_strikeout_) HTML elements: ``` - ... <=== no thank you - ... <=== no thank you + ... + ... ``` Use instead: @@ -82,7 +82,7 @@ Use instead: Please NOT use the obsolete `` (_underline_) HTML element: ``` - ... <=== no thank you + ... ``` Use instead: @@ -97,7 +97,7 @@ Use instead: Please do **NOT** use the obsolete `` (_teletype_) HTML element: ``` - The obsolete tt element is obsolete <=== no thank you + The obsolete tt element is obsolete ``` Instead use either a monospaced span: @@ -119,8 +119,7 @@ Please do **NOT** start code blocks at the left-hand edge. ```` ``` -This code block <=== no thank you -is NOT indented +This code block is NOT indented ``` ```` diff --git a/news.html b/news.html index aa30c4f69..f5c0d13c0 100644 --- a/news.html +++ b/news.html @@ -80,7 +80,7 @@
@@ -106,7 +106,7 @@ @@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/next/guidelines.html b/next/guidelines.html index 02d312a14..802d9ae2d 100644 --- a/next/guidelines.html +++ b/next/guidelines.html @@ -80,7 +80,7 @@ @@ -106,7 +106,7 @@ @@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/next/index.html b/next/index.html index b13103b22..e98061a30 100644 --- a/next/index.html +++ b/next/index.html @@ -80,7 +80,7 @@ @@ -106,7 +106,7 @@ @@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/next/rules.html b/next/rules.html index e35b2dcdd..a50cc3d69 100644 --- a/next/rules.html +++ b/next/rules.html @@ -80,7 +80,7 @@ @@ -106,7 +106,7 @@ @@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines diff --git a/nojs-menu.html b/nojs-menu.html index 85e820a30..cbc44d3ee 100644 --- a/nojs-menu.html +++ b/nojs-menu.html @@ -80,7 +80,7 @@ @@ -106,7 +106,7 @@ @@ -236,7 +236,7 @@ - Bugs & (Mis)features + Bugs and (mis)features @@ -254,7 +254,7 @@ - Rules & Guidelines + Rules and Guidelines @@ -388,18 +388,18 @@
  • Winning Entries
  • People who have won
  • Location of authors
  • -
  • Bugs & Misfeatures
  • +
  • Bugs and (mis)features
  • Status

    FAQ