Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Motion amendments - May 2022 #300

Merged
merged 25 commits into from
May 1, 2022
Merged

Motion amendments - May 2022 #300

merged 25 commits into from
May 1, 2022

Conversation

c-goodyear
Copy link
Contributor

Amendments to the Motions as proposed by the WCA Board of Directors.

* Create 10.2022.1 - Archive Team.md

Recognize the work being done by the WCA Archive Team more officially.

* Fix Motion number.
* Create 10.2022.13 - Sports Organization Team.md

* Fix numbering.

* Fix numbering (attempt 2)
To be more clear and consistent with how major championships are awarded by the Selection Committees.
…ns.md (#282)

Add Code of Conduct to definitions, grammar fixes.
Grammar fixes.
Reference Senior Delegate motion for appointments/nominations.
Avoid duplicating processes in the motions.
No motion number update required since this is just a broken link fix.
Motion number update not required as this was just a broken link.
No motion number update required.
* Reformat motion number

Remove the leading zero in line with other motions.

* Fix formatting of numbering/indentation
* Update Trainee promotions

Remove Board approval from the process.

* Clarify term extensions for Seniors
More clearly outline the tasks which the WRT is undertaking, as well as responsible for.
To avoid Motions updates containing typo/grammar/link fixes in future.
Make 12 and 13 sub-points of 11.
Spelling fix.
No Motion number updates - purely broken link fixes.
@c-goodyear c-goodyear requested a review from a team as a code owner March 31, 2022 08:03
2. A Council Leader automatically loses their appointment after being a Council Leader for 24 months. The WCA Board may choose to extend the appointment, one or more times, given the following:
1. The maximum extension is 24 months.
2. The maximum appointment length is 48 months.
4. The WCA Board shall have the right to withdraw the appointment of a Council Leader, if the Council Leader does not comply with the rights and duties of Council Leader, after advisory consultation by the WCA Ethics Committee.
Copy link

@sam596 sam596 Apr 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 32 should be 3.

@c-goodyear c-goodyear merged commit 715c466 into master May 1, 2022
lgarron added a commit that referenced this pull request May 10, 2022
lgarron added a commit that referenced this pull request May 10, 2022
lgarron added a commit that referenced this pull request May 10, 2022
This is a manual re-land of #300, which was a squash commit.
The squash commit was reverted in 818b393 so that this merge could preserve the history from the PR.

Co-authored-by: c-goodyear <45567122+c-goodyear@users.noreply.github.com>
@lgarron
Copy link
Member

lgarron commented May 10, 2022

@c-goodyear wanted to preserve the commit history, so I've:

  • Reverted the squashed PR merge: 818b393
  • Manually done a normal merge of MotionAmendments-May2022 into the resulting master and pushed using git: 5763ce9

This should show individual commits from the PR when looking at the git history for the affected files.

@lgarron lgarron deleted the MotionAmendments-May2022 branch May 10, 2022 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants