Differences

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

--- people:gavin_macaidan [2018/01/30 20:47] – fixed a tag Gwendolyn of Aldburg
+++ people:gavin_macaidan [2024/10/09 13:31] (current) – Dietrich von Sachsen
@@ Line 11: / Line 11: @@
 ===== Heraldry =====
-//Do you have heraldry?  Add your information here.//
+  * **Device:** Vert, in pale two hedgehogs statant contourny Or.
-===== Current Office(s) =====
+===== Offices and Appointments =====
-  * **[[activities:service:offices:marshal|Rapier Combat Marshal]]** - Canton of [[branches:canton:Caldrithig]]
+==== Current Office and Appointments ====
+  * {{activities:service:offices:marshal-rapier-symbol.png?30|}} **[[activities:martial:rapier_combat|Fencing]] [[activities:service:offices:Marshal]]** - Canton of [[branches:canton:Caldrithig]]
   * **Head of the Household** - [[groups:households:Academia Xiphias]]
-===== Past Appointments =====
+==== Past Office ====
-  * **Kingdom [[activities:service:offices:marshal|Rapier Combat Marshal]]** - Kingdom of Ealdormere 2013 - 2015
+  * {{activities:service:offices:marshal-rapier-symbol.png?30|}} **Kingdom [[activities:martial:rapier_combat|Fencing]] [[activities:service:offices:Marshal]]** - Kingdom of Ealdormere 2013 - 2015
-  * **[[activities:martial:rapier_combat|Rapier]] Champion**- Principality of Ealdormere (Middle Kingdom, 1998; Prince's Champion)
+==== Past Appointment ====
+  * **[[activities:martial:rapier_combat|Rapier]] Champion** - Principality of Ealdormere (Middle Kingdom, 1998; Prince's Champion)
 ===== SCA History =====
@@ Line 25: / Line 29: @@
 ===== Interests =====
-  * [[activities:martial:Rapier Combat]]
+  * [[activities:martial:Rapier Combat|Fencing]]
   * [[activities:arts_sciences:Storytelling]]
   * [[activities:arts_sciences:Games]]
@@ Line 44: / Line 48: @@
 //How would you like people to contact you?//
-===== External Links =====
-//Add a link to your blog or other external website.//
 </WRAP>
 <WRAP column 25% right>
-[{{media:heraldry:branch_heraldry:wolfium.jpg|You can use the populace badge if you do not have heraldry.}}]
+[{{media:heraldry:personal_heraldry:gavin_macaden_of_caldrithig_heraldry.png?200|Arms: //Vert, in pale two hedgehogs statant contourny Or.//}}]
 </WRAP>
@@ Line 56: / Line 58: @@
 {{tag>people:apprentices
 people:people_by_location:caldrithig people:people_by_location:skraeling_althing
-people:people_by_household:academia_xiphias history:lineages:line_of_tsivia
+people:people_by_household:academia_xiphias history:lineages:line_of_tsivia history:lineages:line_of_lars people:students
 people:people_by_office:rapier_marshal
 people:people_by_interest:rapier_combat people:people_by_interest:storytelling people:people_by_interest:games}}