updated rules and FAQ based on what we know now

Author: kenohori

faq/index.md

@@ -20,12 +20,14 @@ permalink: /faq/
 
 #### Which Graduation Manual applies to me?
 
-The [Graduation Manual]({{ "/rules/" | prepend: site.baseurl }}), and thus the rules, change almost every year.
-The differences are usually small, but some are significant (eg submitting a reflection, role of co-reader, etc).
-
 You have to follow the rules of the year when you started your graducation work.
 Even if it takes you 2+ years to complete, the rules that applied when you started are the rules that apply during your whole graduation process.
 
+The [graduation guide]({{ "/rules/" | prepend: site.baseurl }}), and thus the rules, change almost every year.
+The differences are usually small, but some are significant (eg submitting a reflection, role of co-reader, etc).
+
+Note iIf you started before the 2025-2026 academic year, the differences are big and you should be looking at the <a href="https://3d.bk.tudelft.nl/courses/geo2020/">GEO2020 website</a> instead.
+
 - - -
 
 #### How do I pick a topic?
@@ -39,7 +41,7 @@ Two options:
 
 #### Can I pick as First Mentor someone from another faculty?
 
-No. Your first mentor, who also acts as your daily supervisor, must be a staff involved in the Geomatics programme.
+No. Your first mentor, who also acts as your daily supervisor, must be a staff from one of the groups involved in Geomatics education.
 
 Your second mentor can however be any staff of the TU Delft.
 
@@ -147,25 +149,6 @@ The evaluation criteria that will be used by the committee to mark the final the
 
 [Download the rubric](../rubric/)
 
-
-- - -
-
-#### What is a complete draft at A3?
-
-
-The deliverable at A3 is "complete draft thesis", and many of you asked their supervisor: "what does that mean?".
-The answer to this is very subjective, and thus varies from supervisors to supervisors, so discuss this with them.
-The main point is that the committee needs to assess whether what has been done so far (and submitted) is at least a 6.0, if this is so then a GO is given. 
-You then have about 1 month to improve your thesis for the P5, where a mark is given.
-
-Some guidelines:
-
-   - the draft thesis should contain all the main results, ie there shouldn't be essential work left
-   - there should be conclusions drawn based on the work done
-   - if not all the sentences are perfect it's fine, but if your text is filled with typos and reading it is difficult then it'll be more complex for the committee too assess whether the work done deserves a 6
-   - a tip: figures/tables/workflows can be drawn by hand on paper, and simply scanned. Between P4 and P5 you'll have time to make nice figures.
-   - acknowledgements, abstract, title page, future work, tables of figures, etc. can be left for after P4
-
 - - -
 
 #### What is the structure of a good thesis?
@@ -214,7 +197,13 @@ _7. Appendices_
 
 - - -
 
+#### Withdrawing from A1
+
+- Ask your responsible supervisor to withdraw your A1 registration in MyCase.
+
+- - -
+
 #### Withdrawing from A3
 
 - inform your supervisors, the co-reader and the delegate
-- send an email to afstuderen-bk@tudelft.nl stating your name and student number, and declare that you withdraw from A3.
+- send an email to graduation-bk@tudelft.nl stating your name and student number, and declare that you withdraw from A3.

rules/index.md

@@ -22,28 +22,28 @@ permalink: /rules/
 
 Note that you have to follow the rules of the academic year when you started your graduation work.
 
-- [Official Graduation Manual 2024-2025](GraduationManualGeomatics2024-2025.pdf)
-- [Official Graduation Manual 2023-2024](GraduationManualGeomatics2023-2024.pdf)
-- [Official Graduation Manual 2022-2023](GraduationManualGeomatics2022-2023.pdf)
-- [Official Graduation Manual 2021-2022](GraduationManualGeomatics2021-2022.pdf)
-- [Official Graduation Manual 2020-2021](GraduationManualGeomatics2020-2021.pdf)
-- [Official Graduation Manual 2019-2020](GraduationManualGeomatics2019-2020.pdf)
+- [Graduation guide 2025-2026](https://github.com/tudelftgeomatics/graduationguide/releases/download/2025.2026/gm_gg_2526.pdf)
+
+<i class="fa-solid fa-triangle-exclamation"></i> For students who started before the 2025-2026 academic year (P system), see the <a href="https://3d.bk.tudelft.nl/courses/geo2020/">GEO2020 website</a>
 
 
 ## A0 (Preparation)
 
 1. Find a thesis topic and supervisors, either by picking from a topic from [the list](../potentialtopics/) or by agreeing on a custom topic. Talk to the responsible Geomatics staff to know more about it and to confirm that you will do it.
 2. Fill in the form below.
-3. Together with your supervisors, schedule your A1 before the [registration deadline](../dates/). They will enter the date in the system (SuperSaaS).
+3. Before the [A1 registration deadline](../dates/), you should register your graduation project by submitting a case in [MyCase](https://mycase.tudelft.nl). This includes submitting some details about you, a working title for the graduation project, the names of both of your supervisors, possibly the name of your co-reader (if you already have one), and the weeks in which you'll reach the different As (use the [graduation calendar](../dates/)).
+4. Together with your supervisors, schedule your A1 before the [registration deadline](../dates/). They will enter the date in the system (SuperSaaS) if it's available, or through email if it's not.
 
 <div data-tf-live="01JVYR7EZE44W3YHFMM1DED3Y3"></div><script src="//embed.typeform.com/next/embed.js"></script>
 
 ## A1 (Kick-off)
 
+<i class="fa-solid fa-triangle-exclamation"></i> If you don't plan to do your A1 at the specified date, you must cancel your A1. Ask your responsible supervisor to withdraw your A1 registration in MyCase.
+
 1. Write a project proposal. If you want, you can use [this template](../templates/#proposal).
-2. At least one week before your A1, register your graduation project in [MyCase](https://mycase.tudelft.nl), including uploading your proposal.
-3. Your supervisors will read your proposal. At the kick-off meeting, your supervisors will ask you questions about it and decide if it's approved.
-  - If you pass, together with your supervisors you should schedule the A3 and A4 before the [registration deadline](../dates/). If you are very keen on a specific co-reader (see A2), you should probably make sure they are available on those dates.
+2. At least one week before your A1, upload your graduation plan (thesis proposal) in [MyCase](https://mycase.tudelft.nl). There will be additional pages to fill in [if you're doing your thesis at a company](../company/) (external party), need a confidentiality agreement, or have human participants in your thesis. <i class="fa-solid fa-triangle-exclamation"></i>  Make sure you do the "Ready for kick-off" task in MyCase so that your supervisors can read your proposal and enter your result in the system.
+3. Your supervisors will read your proposal. At the kick-off meeting, you will give a 15-minute presentation about your proposal, your supervisors will ask you questions about it and decide if it's approved.
+  - If you pass, together with your supervisors you should schedule the A3 and A4 before the [registration deadline](../dates/). If you want a specific co-reader (see A2), you should make sure they are available on the date of the A3.
   - If you don't pass (retake), together with your supervisors you should schedule a new A1 date before the [registration deadline](../dates/).
 
 ## A2 (Midterm)
@@ -54,17 +54,18 @@ Note that you have to follow the rules of the academic year when you started you
 
 ## A3 (Green light)
 
-<i class="fa-solid fa-triangle-exclamation"></i> If you don't plan to do your A3 at the specified date, you must cancel your A3. Do it by sending an email to your 2 supervisors, the co-reader, the delegate, and to `afstuderen-bk@tudelft.nl`.
+<i class="fa-solid fa-triangle-exclamation"></i> If you don't plan to do your A3 at the specified date, you must cancel your A3. Do it by sending an email to your 2 supervisors, the co-reader, the delegate, and to `graduation-bk@tudelft.nl`.
 
-1. Discuss with your supervisors to know what you need to submit. Usually, a **draft** of your thesis is expected. A draft means what your supervisors say it should be, there are no strict rules (but [this](../faq/#what-is-a-complete-draft-at-a3) can help). If you want, you can use [this template](../templates/#thesis).
-2. At least one week before your A3, you must register that you have completed the required parts of your study and upload your submission as a deliverable in [MyCase](https://mycase.tudelft.nl) and to the [Brightspace Plagiarism Scan](https://brightspace.tudelft.nl/d2l/home/47493) page (P4 Final). You should also send your thesis to the co-reader (who doesn't have access it through MyCase).
-3. Your supervisors and co-reader will read your submission. The first supervisor will check the Plagiarism Scan results. At the green light meeting, your supervisors will ask questions about it and decide if it's approved. The co-reader will send comments/questions to your first supervisor and might attend the meeting. 
-  - If you pass (continue to Finalisation), a preliminary mark will also be given to you. Your final mark at the A4 might only be within 0.5 points of the preliminary one.
+1. At least one week before your A3, you must register that you have completed the required parts of your study, check the personal information for your diploma, fill in the final title of your thesis and upload your final graduation report (thesis) in [MyCase](https://mycase.tudelft.nl) and to the [Brightspace Plagiarism Scan](https://brightspace.tudelft.nl/d2l/home/47493) page. You should also send your thesis to the co-reader if they don't have access to it through MyCase. <i class="fa-solid fa-triangle-exclamation"></i>  Make sure you do the "Ready for green light" task in MyCase so that your supervisors can read your thesis and enter your result in the system.
+2. Your supervisors and co-reader will read your submission. The first supervisor will check the Plagiarism Scan results. At the green light meeting, you will give a 20-minute technical presentation about your thesis and your supervisors and co-reader will ask questions about it and decide if it's approved.
+  - If you pass (continue to Finalisation), you must do your A4 in the following period (~2 weeks).
+  <!-- a preliminary mark will also be assigned to your thesis but not communicated . Your final mark at the A4 might only be within 0.5 points of the preliminary one. -->
   - If you don't (retake), together with your supervisors you should schedule new A3 and A4 dates before the [registration deadline](../dates/).
 
 
 ## A4 (Finalisation)
 
-1. At least one week before your A4, you must upload your submission as a deliverable in [MyCase](https://mycase.tudelft.nl) and to the [Brightspace Plagiarism Scan](https://brightspace.tudelft.nl/d2l/home/47493) page (P5 Final). You should also send your thesis to the co-reader (who doesn't have access it through MyCase). It's also a good practice to [send a rebuttal/corrections document](../tips/#with-the-p5-thesis-submit-a-rebuttalcorrections-document) to your supervisors and co-reader.
-2. Your supervisors and co-reader will read your submission. The first supervisor will check the Plagiarism Scan results. At the finalisation meeting, your supervisors and co-reader will ask questions about it and decide your final mark according to the [rubric](../rubric/).
-3. Maximum 1 day after the A4, you have to upload your final thesis to the TU Delft repository, and please [follow these rules](../faq/#how-to-upload-your-final-thesis-to-the-tud-repository)
+1. At least one day before your A4, you must upload your graduation report and A4 presentation in [MyCase](https://mycase.tudelft.nl). <i class="fa-solid fa-triangle-exclamation"></i>  Make sure you do the "Ready for assessment" task in MyCase so that your supervisors can look at your presentation and enter your result in the system.
+2. At the finalisation meeting, you will give a 15-minute presentation for a lay audience to your supervisors and everyone else that you've invited. Your supervisors will ask questions about it and decide your final mark according to the [rubric](../rubric/).
+3. Maximum 1 day after the A4, you have to upload your final thesis to the TU Delft repository, and please [follow these rules](../faq/#how-to-upload-your-final-thesis-to-the-tud-repository).
+4. Terminate your enrolment using Studielink and fill out the exit survey.