Line edit annotations

templates/book.jinja

@@ -69,8 +69,8 @@
     <p>{{ ip_address if ip_address else '' }}</p>
     <mark>
       XPUB 1 users use chopchop as a shared community server.
-      chopchop is usually located in the Piet Zwart Wijnhaven building, although for this occassion it is resting on the
-      shelf bellow this e-reader.
+      chopchop is usually located in the Piet Zwart Wijnhaven building. It moves around from time to time, too. For the occassion of SI23, it is resting on the
+      shelf below this e-reader.
     </mark>
 
     {% if since_last_boot %}
@@ -81,7 +81,7 @@
     </mark>
     <p>{{ since_last_boot }}</p>
     <mark>
-      {% if days_since_last_boot|int > 14 %}This is unusual, we are used to our server crashing quite often, especially
+      {% if days_since_last_boot|int > 14 %}This uptime is unusual, we are used to our server crashing quite often, especially
       when we are all sharing the space and editing at the same time. Our server, chopchop, chops up time into small
       bits of surprise in which we learn that the technologies we rely on are never just up and running on their own.
       They require people to care for them, to put in the time and the mindspace to figure out how to keep them running
@@ -120,16 +120,17 @@
     </mark>
 
     {{ log_output(list_package_installs)  }}
-    
+   
+
     {% if list_package_installs|length == 0 %} 
       <mark>
-      Today no new packages were installed...
+      Today, no new packages were installed...
       </mark>
     {% endif %}
 
+    
+    <p><em>tldr@chopchop:~ $</em> grep 'upgrade' /var/log/dpkg.log</p>
     {% if list_package_upgrade|length > 0 %}
-      <p><em>tldr@chopchop:~ $</em> grep 'upgrade' /var/log/dpkg.log</p>
-      
       <mark>
         Out of the existing packages, these were upgraded:
       </mark>
@@ -143,8 +144,8 @@
         <mark> No existing packages were upgraded today.</mark>
     {% endif %}
 
+    <p><em>tldr@chopchop:~ $</em> grep 'remove' /var/log/dpkg.log</p>
     {% if list_package_remove|length > 0 %}
-      <p><em>tldr@chopchop:~ $</em> grep 'remove' /var/log/dpkg.log</p>
       <mark>
         These package were removed today:
       </mark>
@@ -152,8 +153,8 @@
       {{ log_output(list_package_remove)  }}
 
       <mark>
-        Packages could be removed because of consuming too much storage, not being used by the people who share the
-        server, or they are no longer secure. It is often good practice to 'do some spring cleaning' every now and
+        Packages could be removed because of the limited storage on chopchop, by not being used by the people who share the
+        server, or by being no longer secure. It is often good practice to 'do some spring cleaning' every now and
         then and remove the packages that no longer serve you any purpose.
       </mark>
         
@@ -175,8 +176,8 @@
     <mark>
       Users can login to the server using the SSH (secure shell) protocol. This allows a user to explore files,
       make changes, run commands and speak to the server from their own machine. This is useful when working
-      remotely, and also to allow multiple users logging into the server simultaneously. Current XPUB1 students
-      have a chopchop user, as well as the tutors. Additionally, there are some users not associated with a
+      remotely, and also to allow multiple users logging into the server simultaneously. There are chopchop users
+      for current XPUB1 studends, as well as for their tutors. Additionally, there are some users not associated with a
       person, like our shared user 'chipchip' and users for running specific processes or creating projects.
     </mark>
 
@@ -187,7 +188,7 @@
           These users have logged into our shared server chopchop, during the course of this day.
         </mark>
       {% else %}
-        <mark>it was quiet today.</mark>
+        <mark>It was quiet today, no users logged in. However, that does not mean the server just sits idle!</mark>
       {% endif %}
     {% endif %}
 
@@ -253,4 +254,4 @@
     <script type="text/javascript" src="script.js"></script>
 </body>
 
-</html>
+</html>