Merge remote-tracking branch 'upstream/develop' into develop

Author: bowbahdoe

src/annotations/elements.md

@@ -20,14 +20,20 @@ The method should take no arguments.
 }
 ```
 
-And the return value needs to be one of a few built-in types like `Class`, `String`, `int`, `boolean`, etc.[^fulllist], an `enum`, or an array of one of those.
+And the return value needs to be one of a few built-in types like `Class`, `String`, `int`, `boolean`, etc.[^fulllist], an `enum`, another annotation interface, or an array of one of those.
 
 ```java,no_run,does_not_compile
 enum Priority {
     HIGH,
     LOW
 }
 
+@interface Deadline {
+    int year();
+    int month();
+    int day();
+}
+
 class PersonInCharge {}
 
 @interface Todo {
@@ -49,7 +55,10 @@ class PersonInCharge {}
     // Enums ✅
     Priority priority();
 
-    // Other Classes ❌
+    // Other annotations ✅
+    Deadline deadline();
+
+    // Other classes ❌
     PersonInCharge personInCharge();
 }
 ```

src/class_extension/relation_to_encapsulation.md

@@ -72,7 +72,8 @@ class Airplane {
 
     void bookMany(List<String> passengers) {
         for (var passenger : passengers) {
-            bookOne(passenger);
+            // Only change
+            this.passengers.add(passenger);
         }
     }
 }