Differences

This shows you the differences between two versions of the page.

--- people:yngvildr_adisardottir [2024/04/17 17:39] – Dietrich von Sachsen
+++ people:yngvildr_adisardottir [2026/05/21 01:08] (current) – Dietrich von Sachsen
@@ Line 16: / Line 16: @@
 ==== Current Offices ====
-  * {{activities:service:offices:marshal-overall-symbol.png?30|}} **[[activities:martial:armoured_combat|Armoured Combat]] [[activities:service:offices:marshal|Marshal of the Field]]** - Kingdom of Ealdormere
+  * {{activities:service:offices:marshal-overall-symbol.png?30|}} **[[activities:martial:armoured_combat|Armoured Combat]] [[activities:service:offices:marshal|Marshal]]** - Kingdom of [[branches:kingdom:ealdormere|Ealdormere]]
-  * {{activities:service:offices:marshal-rapier-symbol.png?30|}} **[[activities:martial:rapier_combat|Fencing Combat]] [[activities:service:offices:marshal|Marshal of the Field]]** - Kingdom of Ealdormere
+  * {{activities:service:offices:marshal-rapier-symbol.png?30|}} **[[activities:martial:rapier_combat|Fencing Combat]] [[activities:service:offices:marshal|Marshal]]** - Kingdom of [[branches:kingdom:ealdormere|Ealdormere]]
-  * {{activities:service:offices:marshal-youth-symbol.png?30|}} **[[activities:martial:youth_combat|Youth Combat]] [[activities:service:offices:marshal|Marshal of the Field]]** - Kingdom of Ealdormere
+  * {{activities:service:offices:marshal-youth-symbol.png?30|}} **[[activities:martial:youth_combat|Youth Combat]] [[activities:service:offices:marshal|Marshal]]** - Kingdom of [[branches:kingdom:ealdormere|Ealdormere]]
   * {{activities:service:offices:Exchequer-symbol.png?30|}} **[[activities:service:offices:exchequer|Exchequer]]** - Canton of [[branches:canton:Northgaetham|Northgeatham]]
 ==== Past Offices ====
-  * {{activities:service:offices:marshal-overall-symbol.png?30|}} [[activities:martial:Armoured Combat]] [[activities:service:offices:Marshal]] - Stronghold of  [[branches:stronghold:Tor Brant]] (November 2014 - February 2017)
+  * {{activities:service:offices:marshal-overall-symbol.png?30|}} [[activities:martial:Armoured Combat]] [[activities:service:offices:Marshal]] - Stronghold of [[history:former_groups:tor_brant|Tor Brant]] (November 2014 - February 2017)
-  * {{activities:service:offices:marshal-youth-symbol.png?30|}} [[activities:martial:Youth Combat]] [[activities:service:offices:Marshal]] - Stronghold of  [[branches:stronghold:Tor Brant]] (November 2014 - February 2017)
+  * {{activities:service:offices:marshal-youth-symbol.png?30|}} [[activities:martial:Youth Combat]] [[activities:service:offices:Marshal]] - Stronghold of [[history:former_groups:tor_brant|Tor Brant]] (November 2014 - February 2017)
   * {{activities:service:offices:maos-symbol.png?30|}} [[activities:service:offices:minister_of_arts_sciences|Minister of Arts & Sciences]] - Barony of [[branches:barony:ramshaven|Ramshaven]] (September 2017 - September 2019)
@@ Line 31: / Line 31: @@
 ===== SCA History =====
-Yngvildr joined the Society in fall 2009, in [[branches:canton:Caldrithig]]. She has lived in [[branches:canton:ArdChreag|Ard Chreag]] and [[branches:stronghold:Tor Brant]].
+Yngvildr joined the Society in fall 2009, in [[branches:canton:Caldrithig]]. She has lived in [[branches:canton:ArdChreag|Ard Chreag]] and [[history:former_groups:tor_brant|Tor Brant]].
 She is a squire to Sir Edward the Red.
@@ Line 61: / Line 61: @@
 people:squires
 people:people_by_location:northgaetham people:people_by_location:ramshaven history:lineages:line_of_belgar
-people:people_by_office:armoured_marshal
+people:people_by_office:armoured_marshal people:people_by_office:rapier_marshal people:people_by_office:youth_combat_marshal
 people:people_by_interest:armoured_combat people:people_by_interest:fibre_arts people:people_by_interest:weaving people:people_by_interest:spinning people:people_by_interest:rapier_combat}}