From e731aea6b1412a3fd9a46db0b02602b5ffbfb86b Mon Sep 17 00:00:00 2001
From: 0verkil <112268976+0verkil@users.noreply.github.com>
Date: Wed, 22 Jul 2026 21:09:32 -0700
Subject: [PATCH 1/6] stage 0 cleanup

---
 examples/stage0/snippets/Operators.java       |  9 +++++---
 .../stage0/java-fundamentals.mdx              | 14 ++++++------
 .../docs/learning-course/stage0/operators.mdx | 22 +++++++++----------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/examples/stage0/snippets/Operators.java b/examples/stage0/snippets/Operators.java
index e7b8b934..8564d1b1 100644
--- a/examples/stage0/snippets/Operators.java
+++ b/examples/stage0/snippets/Operators.java
@@ -19,8 +19,11 @@ void main() {
     int x = 6;
     int y = 7;
 
-    System.out.println(x++);
-    System.out.println(y--);
+    x++; // x is now 7!
+    y--; // y is now 6!
+
+    System.out.println(x); // prints 7
+    System.out.println(y); // prints 6
     // [/increments]
 
     // [arithmetic]
@@ -36,7 +39,7 @@ void main() {
     // [comparison]
     int c = 2;
     int d = 4;
-    System.out.print(c > d);
+    System.out.print(c > d); // prints False
     // [/comparison]
 
     // [logical]
diff --git a/src/content/docs/learning-course/stage0/java-fundamentals.mdx b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
index 601e7fcc..3cba1b53 100644
--- a/src/content/docs/learning-course/stage0/java-fundamentals.mdx
+++ b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
@@ -47,21 +47,21 @@ Data types can include numbers, characters, or a string of words.
 Some example data types that are commonly used in FRC programming are:
 
 - int: integer numbers that are positive or negative.
-  Int only allows numbers without decimals.
+  int only allows numbers without decimals.
   Example: 12
 - double: numbers that are positive or negative.
   Unlike int, double allows numbers with or without decimals.
   Example: 34.1
 - boolean: either True or False.
-- string: holds a sequence of characters.
+- String: holds a sequence of characters. Denoted by double quotes (").
   Example: “Hello World”
-- char: holds a Single character.
+- char: holds a Single character. Denoted by single quotes (').
   Example: 'A'
 
-The name of your variable can be whatever you want, but it should be easy to read and make sense to others who may be reading your code.
-Some rules for variables include not using spaces, instead you writing variables with camel case (frontLeftDrive).
-Upper snake case (FRONT_LEFT_DRIVE) can be used for constants, which we will learn about later in the course.
-It should also be noted that variable names can have numbers at any point except for the first character.
+The name of your variable can be almost anything you want, but it should be easy to read and make sense to others who may be reading your code.
+One major exception is spaces, which are forbidden in variable names. Instead, you should write variables in what's known as camel case (frontLeftDrive).
+Upper snake case (FRONT_LEFT_DRIVE) should be used instead for constants, which we will learn about later in the course.
+Variable names can have numbers at any point except for the first character. (motor2 is legal, 2motor is not).
 
 <Aside type="note">
 Java is a case-sensitive programming language!
diff --git a/src/content/docs/learning-course/stage0/operators.mdx b/src/content/docs/learning-course/stage0/operators.mdx
index 11bd2ed5..4aafd3b6 100644
--- a/src/content/docs/learning-course/stage0/operators.mdx
+++ b/src/content/docs/learning-course/stage0/operators.mdx
@@ -202,13 +202,13 @@ For now, we can use the operators to change variables without using conditionals
     <tbody>
         <tr>
             <td>`++`</td>
-            <td>Increment: add 1 to a variable</td>
+            <td>Increment: adds 1 to a variable</td>
             <td>int, double</td>
             <td>`a++`</td>
         </tr>
         <tr>
             <td>`--`</td>
-            <td>Decrement: subtracts 1 to a variable</td>
+            <td>Decrement: subtracts 1 from a variable</td>
             <td>int, double</td>
             <td>`a--`</td>
         </tr>
@@ -344,18 +344,18 @@ Using that information and without running the code, what should the print state
         <p>
             <ul>
                 <li>
-                    false. && returns true if both statements are true
-                    `nineIsLessThanTwo` is false, therefore the operator will
-                    return false.
+                    False. && returns True if both statements are True
+                    `nineIsLessThanTwo` is False, therefore the operator will
+                    return False.
                 </li>
                 <li>
-                    true. || returns true if one of the statements are true
-                    `fiveIsGreaterThanThree` is true, therefore the the operator
-                    will return true.
-                </li>
+                    True. || returns True if one of the statements are True
+                    `fiveIsGreaterThanThree` is True, therefore the the operator
+                    will return True.
+                </li>x
                 <li>
-                    false. ! reverses the outcome `fiveIsGreaterThanThree` is
-                    true, adding ! will reverse it and return false.
+                    False. ! reverses the outcome `fiveIsGreaterThanThree` is
+                    True, adding ! will reverse it and return False.
                 </li>
             </ul>
         </p>

From 33c9e3d666c29b8b9e919c34792e0ebc31582042 Mon Sep 17 00:00:00 2001
From: 0verkil <112268976+0verkil@users.noreply.github.com>
Date: Fri, 24 Jul 2026 12:10:31 -0700
Subject: [PATCH 2/6] further stage 0 cleanup

---
 .../stage0/snippets/JavaFundamentals.java     | 10 ++++----
 examples/stage0/snippets/Operators.java       | 12 ++++-----
 .../stage0/java-fundamentals.mdx              | 25 +++++++++++--------
 .../docs/learning-course/stage0/operators.mdx | 21 ++++++++--------
 .../stage1/stage1a/stage-overview.mdx         | 11 +++++---
 5 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/examples/stage0/snippets/JavaFundamentals.java b/examples/stage0/snippets/JavaFundamentals.java
index cc8953ee..150edae5 100644
--- a/examples/stage0/snippets/JavaFundamentals.java
+++ b/examples/stage0/snippets/JavaFundamentals.java
@@ -11,26 +11,26 @@
 
 void main() {
     // [printLiteral]
-    System.out.print("hello!");
+    System.out.println("hello!");
     // [/printLiteral]
 
     // [printVariable]
     int number = 4;
-    System.out.print(number); // prints out the value 4
+    System.out.println(number); // prints out the value 4
     // [/printVariable]
 
     // [singleLineComment]
     // This prints Hello World
-    System.out.print("Hello World");
+    System.out.println("Hello World");
     // [/singleLineComment]
 
     // [inlineComment]
-    System.out.print("Hello World"); // This prints Hello World
+    System.out.println("Hello World"); // This prints Hello World
     // [/inlineComment]
 
     // [multiLineComment]
     /* This prints Hello World
     This is another line */
-    System.out.print("Hello World");
+    System.out.println("Hello World");
     // [/multiLineComment]
 }
diff --git a/examples/stage0/snippets/Operators.java b/examples/stage0/snippets/Operators.java
index 8564d1b1..aecf4f1a 100644
--- a/examples/stage0/snippets/Operators.java
+++ b/examples/stage0/snippets/Operators.java
@@ -12,7 +12,7 @@
 void main() {
     // [multiplication]
     int magicNumber = 6;
-    System.out.print(magicNumber * 2);
+    System.out.println(magicNumber * 2);
     // [/multiplication]
 
     // [increments]
@@ -29,22 +29,22 @@ void main() {
     // [arithmetic]
     int a = 10;
     int b = 5;
-    a += 1;
+    a += 2;
     b -= 1;
 
-    System.out.println(a); // prints 11
+    System.out.println(a); // prints 12
     System.out.println(b); // prints 4
     // [/arithmetic]
 
     // [comparison]
     int c = 2;
     int d = 4;
-    System.out.print(c > d); // prints False
+    System.out.println(c > d); // prints false
     // [/comparison]
 
     // [logical]
-    boolean fiveIsGreaterThanThree = 5 > 3; // True
-    boolean nineIsLessThanTwo = 9 < 2; // False
+    boolean fiveIsGreaterThanThree = 5 > 3; // true
+    boolean nineIsLessThanTwo = 9 < 2; // false
 
     System.out.println(fiveIsGreaterThanThree && nineIsLessThanTwo);
     System.out.println(fiveIsGreaterThanThree || nineIsLessThanTwo);
diff --git a/src/content/docs/learning-course/stage0/java-fundamentals.mdx b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
index 3cba1b53..ce021419 100644
--- a/src/content/docs/learning-course/stage0/java-fundamentals.mdx
+++ b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
@@ -46,22 +46,25 @@ It helps tell our program more information about our variables such as what type
 Data types can include numbers, characters, or a string of words.
 Some example data types that are commonly used in FRC programming are:
 
-- int: integer numbers that are positive or negative.
+- int: Integer numbers that are positive or negative.
   int only allows numbers without decimals.
   Example: 12
-- double: numbers that are positive or negative.
+- double: Numbers that are positive or negative.
   Unlike int, double allows numbers with or without decimals.
   Example: 34.1
-- boolean: either True or False.
-- String: holds a sequence of characters. Denoted by double quotes (").
+- boolean: Either `true` or `false`.
+- String: Holds a sequence of characters.
+  Denoted by double quotes (").
   Example: “Hello World”
-- char: holds a Single character. Denoted by single quotes (').
+- char: Holds a single character.
+  Denoted by single quotes (').
   Example: 'A'
 
 The name of your variable can be almost anything you want, but it should be easy to read and make sense to others who may be reading your code.
-One major exception is spaces, which are forbidden in variable names. Instead, you should write variables in what's known as camel case (frontLeftDrive).
-Upper snake case (FRONT_LEFT_DRIVE) should be used instead for constants, which we will learn about later in the course.
-Variable names can have numbers at any point except for the first character. (motor2 is legal, 2motor is not).
+One major exception is spaces, which are forbidden in variable names.
+Instead, you should write variables in what's known as camel case (`frontLeftDrive`).
+Upper snake case (`FRONT_LEFT_DRIVE`) should be used instead for constants, which we will learn about later in the course.
+Variable names can have numbers at any point except for the first character. (`motor2` is a valid name, `2motor` is not).
 
 <Aside type="note">
 Java is a case-sensitive programming language!
@@ -77,8 +80,8 @@ Semi-colons are used commonly in programming and aren’t only for creating vari
 We will see more examples of this later in the course.
 
 In FRC, variables can be used to hold information about the robot and its different mechanisms.
-The example below shows 3 variables that were used for a climber mechanism, CLIMBER_ID is an integer that holds the motor controller ID number which is 51.
-UP_POSITION is a double that holds the value -33.5 and DOWN_POSITION is a double that holds the value 0.
+The example below shows 3 variables that were used for a climber mechanism, `CLIMBER_ID` is an integer that holds the motor controller ID number which is 51.
+`UP_POSITION` is a double that holds the value -33.5 and `DOWN_POSITION` is a double that holds the value 0.
 
 ```java #variables
 
@@ -138,7 +141,7 @@ Whether you put your comments preceding or alongside code is up to you and what
 
 Multi-line Comments start with `/*` and end with `*/` The text or code that is in between the two will turn into comments.
 Multi-line Comments are commonly used when you have many lines of text or need to turn a large amount of code into a comment.
-For example, this is a comment with two lines of text
+For example, this is a comment with two lines of text.
 
 ```java #multiLineComment
 
diff --git a/src/content/docs/learning-course/stage0/operators.mdx b/src/content/docs/learning-course/stage0/operators.mdx
index 4aafd3b6..04771ac2 100644
--- a/src/content/docs/learning-course/stage0/operators.mdx
+++ b/src/content/docs/learning-course/stage0/operators.mdx
@@ -36,7 +36,7 @@ These include:
         <tr>
             <td>`+`</td>
             <td>Addition: Adds two values together</td>
-            <td> int, double</td>
+            <td> int, double, String</td>
             <td>`a + b`</td>
         </tr>
         <tr>
@@ -196,6 +196,7 @@ For now, we can use the operators to change variables without using conditionals
         <tr>
             <th>Operator</th>
             <th>Description</th>
+            <th>Compatible Data Types</th>
             <th>Example</th>
         </tr>
     </thead>
@@ -344,18 +345,18 @@ Using that information and without running the code, what should the print state
         <p>
             <ul>
                 <li>
-                    False. && returns True if both statements are True
-                    `nineIsLessThanTwo` is False, therefore the operator will
-                    return False.
+                    false. && returns true if both statements are true
+                    `nineIsLessThanTwo` is false, therefore the operator will
+                    return false.
                 </li>
                 <li>
-                    True. || returns True if one of the statements are True
-                    `fiveIsGreaterThanThree` is True, therefore the the operator
-                    will return True.
-                </li>x
+                    true. || returns true if one of the statements are true
+                    `fiveIsGreaterThanThree` is true, therefore the the operator
+                    will return true.
+                </li>
                 <li>
-                    False. ! reverses the outcome `fiveIsGreaterThanThree` is
-                    True, adding ! will reverse it and return False.
+                    false. ! reverses the outcome `fiveIsGreaterThanThree` is
+                    true, adding ! will reverse it and return false.
                 </li>
             </ul>
         </p>
diff --git a/src/content/docs/learning-course/stage1/stage1a/stage-overview.mdx b/src/content/docs/learning-course/stage1/stage1a/stage-overview.mdx
index 516030ca..80c5a487 100644
--- a/src/content/docs/learning-course/stage1/stage1a/stage-overview.mdx
+++ b/src/content/docs/learning-course/stage1/stage1a/stage-overview.mdx
@@ -57,8 +57,9 @@ You can see that all the `Main.java` file is doing is, quite literally, starting
 so there's really no reason to edit this file for now.
 
 <Aside type="note">
-    Notice that the names of all Java files in the project are capitalized. This
-    is a convention you should follow throughout your code.
+    Notice that the names of all Java files in the project follow PascalCase,
+    where the first letter of every word is capitalized. This is a convention
+    you should follow throughout your code.
 </Aside>
 
 ### `Robot.java`
@@ -103,7 +104,8 @@ We've set this up for you already; you'll just have to set up the simulation sof
 
 ### The 2026 Kitbot
 
-But what is all this code actually going to control? Well, the answer is the 2026 FIRST Robotics Competition kitbot, the best starting point
+But what is all this code actually going to control?
+Well, the answer is the 2026 FIRST Robotics Competition kitbot, the best starting point
 for new FRC teams, as well as the simplest robot to get fully working.
 You can watch the below video to learn more about what functionalities the kitbot has.
 If you're a bit confused after watching that video, don't worry.
@@ -111,7 +113,8 @@ We'll explain the kitbot more in depth in the next section.
 
 <YouTube url="https://www.youtube.com/watch?v=nTmZXOgHntM" />
 
-And that's all you need to know to get started! The rest of Stage 1A will cover how to get from the template code to a working kitbot.
+And that's all you need to know to get started!
+The rest of Stage 1A will cover how to get from the template code to a working kitbot.
 
 This stage will cover the following topics:
 

From b32d760851034814961e48be0ae3014f59e52ba1 Mon Sep 17 00:00:00 2001
From: 0verkil <112268976+0verkil@users.noreply.github.com>
Date: Fri, 24 Jul 2026 21:59:15 -0700
Subject: [PATCH 3/6] linting or whatever

---
 src/content/docs/learning-course/index.mdx                 | 6 ++++--
 src/content/docs/learning-course/stage1/stage-overview.mdx | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/content/docs/learning-course/index.mdx b/src/content/docs/learning-course/index.mdx
index deb95772..d8b24c5d 100644
--- a/src/content/docs/learning-course/index.mdx
+++ b/src/content/docs/learning-course/index.mdx
@@ -7,11 +7,13 @@ next: false
 
 import CourseSection from '@components/CourseSection.astro';
 
-Welcome to FRCSoftware's learning course! The purpose of this course is to help students learn how to program an FRC robot no matter their skill level.
+Welcome to FRCSoftware's learning course!
+The purpose of this course is to help students learn how to program an FRC robot no matter their skill level.
 The progression of the course moves from learning how to write Java to programming robots of increasing complexity.
 We start individual mechanisms of robots, using the FRC Kitbot, then move to more complex robots.
 
-Software in FRC is always changing! If you want to give feedback or have comments, feel free to do so through our [Github](https://github.com/frcsoftware/frcsoftware.org)
+Software in FRC is always changing!
+If you want to give feedback or have comments, feel free to do so through our [Github](https://github.com/frcsoftware/frcsoftware.org)
 or [Discord.](https://discord.com/invite/uUugPrPZFs)
 
 <CourseSection
diff --git a/src/content/docs/learning-course/stage1/stage-overview.mdx b/src/content/docs/learning-course/stage1/stage-overview.mdx
index 30edaf44..97e6200b 100644
--- a/src/content/docs/learning-course/stage1/stage-overview.mdx
+++ b/src/content/docs/learning-course/stage1/stage-overview.mdx
@@ -5,7 +5,8 @@ prev: false
 next: stage-1a/stage-overview
 ---
 
-Congratulations! Whether you already know Java, have programmed an FRC robot before,
+Congratulations!
+Whether you already know Java, have programmed an FRC robot before,
 or are a complete beginner, you should have a good grasp of the basic syntax of the Java language by now.
 In Stage 1, we'll be moving on to the exciting part: actually writing code for a robot!
 It might seem daunting at first, but the best way to think through it is to focus on understanding

From 9d935878c905348ef36445a24fd2a24978bcf57c Mon Sep 17 00:00:00 2001
From: 0verkil <112268976+0verkil@users.noreply.github.com>
Date: Sat, 25 Jul 2026 00:04:57 -0700
Subject: [PATCH 4/6] Update src/content/docs/learning-course/index.mdx

Properly capitalize GitHub

Co-authored-by: Sam Freund <samf.236@proton.me>
---
 src/content/docs/learning-course/index.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/learning-course/index.mdx b/src/content/docs/learning-course/index.mdx
index d8b24c5d..0e98db18 100644
--- a/src/content/docs/learning-course/index.mdx
+++ b/src/content/docs/learning-course/index.mdx
@@ -13,7 +13,7 @@ The progression of the course moves from learning how to write Java to programmi
 We start individual mechanisms of robots, using the FRC Kitbot, then move to more complex robots.
 
 Software in FRC is always changing!
-If you want to give feedback or have comments, feel free to do so through our [Github](https://github.com/frcsoftware/frcsoftware.org)
+If you want to give feedback or have comments, feel free to do so through our [GitHub](https://github.com/frcsoftware/frcsoftware.org)
 or [Discord.](https://discord.com/invite/uUugPrPZFs)
 
 <CourseSection

From 7cfe3ec1c9a3ff09720ebd3a9210c788576f06f4 Mon Sep 17 00:00:00 2001
From: 0verkil <112268976+0verkil@users.noreply.github.com>
Date: Sat, 25 Jul 2026 00:13:57 -0700
Subject: [PATCH 5/6] revert change to + operator

---
 src/content/docs/learning-course/stage0/operators.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/learning-course/stage0/operators.mdx b/src/content/docs/learning-course/stage0/operators.mdx
index 04771ac2..37ee5d28 100644
--- a/src/content/docs/learning-course/stage0/operators.mdx
+++ b/src/content/docs/learning-course/stage0/operators.mdx
@@ -36,7 +36,7 @@ These include:
         <tr>
             <td>`+`</td>
             <td>Addition: Adds two values together</td>
-            <td> int, double, String</td>
+            <td> int, double</td>
             <td>`a + b`</td>
         </tr>
         <tr>

From f2c12468d6b5c8840494a0fcfb499f9f1e6c9400 Mon Sep 17 00:00:00 2001
From: samfreund <samf.236@proton.me>
Date: Sat, 25 Jul 2026 00:16:27 -0700
Subject: [PATCH 6/6] format

Signed-off-by: samfreund <samf.236@proton.me>
---
 src/content/docs/learning-course/stage0/java-fundamentals.mdx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/content/docs/learning-course/stage0/java-fundamentals.mdx b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
index ce021419..cb4ea8b4 100644
--- a/src/content/docs/learning-course/stage0/java-fundamentals.mdx
+++ b/src/content/docs/learning-course/stage0/java-fundamentals.mdx
@@ -64,7 +64,8 @@ The name of your variable can be almost anything you want, but it should be easy
 One major exception is spaces, which are forbidden in variable names.
 Instead, you should write variables in what's known as camel case (`frontLeftDrive`).
 Upper snake case (`FRONT_LEFT_DRIVE`) should be used instead for constants, which we will learn about later in the course.
-Variable names can have numbers at any point except for the first character. (`motor2` is a valid name, `2motor` is not).
+Variable names can have numbers at any point except for the first character.
+(`motor2` is a valid name, `2motor` is not).
 
 <Aside type="note">
 Java is a case-sensitive programming language!