Merge branch 'master' into prod

docs/tse-calendar/index.html

@@ -157,9 +157,6 @@ <h1>TSE Calendar Sync</h1>
         M1 Mathematics and Economic Decision (M1 MAS I:MED)
     </option>
 
-    <!-- <option value="m2-erna" data-url="8241fc3873200214b87b1976735a36f4bd72d825015315fe66c60d53cab758dbf377b612dec2c5fba5147d40716acb136c03e67b339315cf">
-        M2 (M2 EA I:ERNA)
-    </option> -->
     <option value="m2-ds-international" data-url="8241fc387320021431203e67df9bfcc3bd72d825015315fe7b231a07b6a54172f377b612dec2c5fba5147d40716acb136c03e67b339315cf">
         M1 Master's in Data science for social sciences (International)  (M2 ES I:DSSS)
     </option>
@@ -295,9 +292,11 @@ <h2>Installation Instructions</h2>
                 Paste in the URL that was generated from above by this website.
             </li>
             <li>
-                After about 30 seconds, you should see a new calendar in your list of calendars.
-                The calendar name is ugly. But you can click on it to go to "Calendar Settings",
-                then rename it. (And maybe change colour.)
+                It should say that the calendar is loading/syncing in the background.
+                If you go back to the main calendar page, you should see a new calendar in your list of calendars,
+                with a long, ugly name. After a few minutes (once Google finishes loading it)
+                the calendar should be named "TSE", and classes should appear.
+                (You can click on it to go to "Calendar Settings" to rename it or change the colour.)
             </li>
             <li>
                 Note that Google Calendar will fetch updates for you approximately once per day.

extraWords.txt

@@ -773,3 +773,4 @@ I:EEP
 I:EMO
 I:PPD
 TPs/TDs
+loading/syncing

pages/tse-calendar/content.html

@@ -50,9 +50,6 @@ <h1>TSE Calendar Sync</h1>
         M1 Mathematics and Economic Decision (M1 MAS I:MED)
     </option>
 
-    <!-- <option value="m2-erna" data-url="8241fc3873200214b87b1976735a36f4bd72d825015315fe66c60d53cab758dbf377b612dec2c5fba5147d40716acb136c03e67b339315cf">
-        M2 (M2 EA I:ERNA)
-    </option> -->
     <option value="m2-ds-international" data-url="8241fc387320021431203e67df9bfcc3bd72d825015315fe7b231a07b6a54172f377b612dec2c5fba5147d40716acb136c03e67b339315cf">
         M1 Master's in Data science for social sciences (International)  (M2 ES I:DSSS)
     </option>
@@ -188,9 +185,11 @@ <h2>Installation Instructions</h2>
                 Paste in the URL that was generated from above by this website.
             </li>
             <li>
-                After about 30 seconds, you should see a new calendar in your list of calendars.
-                The calendar name is ugly. But you can click on it to go to "Calendar Settings",
-                then rename it. (And maybe change colour.)
+                It should say that the calendar is loading/syncing in the background.
+                If you go back to the main calendar page, you should see a new calendar in your list of calendars,
+                with a long, ugly name. After a few minutes (once Google finishes loading it)
+                the calendar should be named "TSE", and classes should appear.
+                (You can click on it to go to "Calendar Settings" to rename it or change the colour.)
             </li>
             <li>
                 Note that Google Calendar will fetch updates for you approximately once per day.