Merge branch 'jared-fix-padding-bottom-101' of https://git.csclub.uwaterloo.ca/www/www-new into jared-fix-padding-bottom-101
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
commit
15480ca4ac
|
@ -3,4 +3,4 @@ title: License Information and Attribution
|
||||||
index: 11
|
index: 11
|
||||||
---
|
---
|
||||||
|
|
||||||
- The Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike License](http://creativecommons.org/licenses/by-sa/3.0/) , derived from the [Women in Computer Science Code of Conduct](http://wics.uwaterloo.ca/code-of-conduct/) , the [UW Amateur Radio Club Code of Conduct](http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/) , and the [FASS Code of Conduct (Article 2, Section 16)](http://fass.uwaterloo.ca/wp-content/uploads/2015/03/constitution.pdf) .
|
- The Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike License](http://creativecommons.org/licenses/by-sa/3.0/), derived from the [Women in Computer Science Code of Conduct](http://wics.uwaterloo.ca/deprecated/code-of-conduct/), the [UW Amateur Radio Club Code of Conduct](http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/), and the [FASS Code of Conduct](http://fass.uwaterloo.ca/fassconstitution).
|
||||||
|
|
|
@ -4,5 +4,5 @@ index: 12
|
||||||
---
|
---
|
||||||
|
|
||||||
1. The Club has a [Code of Conduct](/about/code-of-conduct).
|
1. The Club has a [Code of Conduct](/about/code-of-conduct).
|
||||||
2. The [scope of the Code of Conduct](/about/code-of-conduct/scopes-and-spaces) is specified by the Code of Conduct.
|
2. The [scope of the Code of Conduct](/about/code-of-conduct/scope-and-spaces) is specified by the Code of Conduct.
|
||||||
3. Changes to the Code of Conduct are governed by the same rules as changes to the Constitution.
|
3. Changes to the Code of Conduct are governed by the same rules as changes to the Constitution.
|
||||||
|
|
|
@ -80,6 +80,6 @@ Each term, the CSC holds elections to determine the executive council:
|
||||||
- Assistant Vice-President
|
- Assistant Vice-President
|
||||||
- Treasurer
|
- Treasurer
|
||||||
|
|
||||||
To find out when and where the next elections will be held, keep an eye on on the [News](/).
|
To find out when and where the next elections will be held, keep an eye on on the [News](/#news).
|
||||||
|
|
||||||
For details on the elections, see the [Constitution](/about/constitution).
|
For details on the elections, see the [Constitution](/about/constitution).
|
|
@ -3,7 +3,7 @@ title: CS Club Email
|
||||||
index: 2
|
index: 2
|
||||||
---
|
---
|
||||||
|
|
||||||
Members also receive a **username@csclub.uwaterloo.ca** email address.
|
Members also receive a **[username@csclub.uwaterloo.ca](#)** email address.
|
||||||
|
|
||||||
- Mailboxes are considered as part of your disk quota, so your mailbox may grow up to the amount of disk quota you have.
|
- Mailboxes are considered as part of your disk quota, so your mailbox may grow up to the amount of disk quota you have.
|
||||||
- Attachments of any file size or type may be sent.
|
- Attachments of any file size or type may be sent.
|
||||||
|
|
|
@ -3,8 +3,8 @@ title: Mailing Lists
|
||||||
index: 10
|
index: 10
|
||||||
---
|
---
|
||||||
|
|
||||||
Our [csc-general mailing list](http://mailman.csclub.uwaterloo.ca/listinfo/csc-general) informs members about our current events.
|
Our [csc-general mailing list](https://mailman.csclub.uwaterloo.ca/postorius/lists/csc-general.csclub.uwaterloo.ca/) informs members about our current events.
|
||||||
|
|
||||||
Our [csc-industry mailing list](http://mailman.csclub.uwaterloo.ca/listinfo/csc-industry) allows students to opt-in to receiving emails from industry representatives.
|
Our [csc-industry mailing list](https://mailman.csclub.uwaterloo.ca/postorius/lists/csc-industry.csclub.uwaterloo.ca/) allows students to opt-in to receiving emails from industry representatives.
|
||||||
|
|
||||||
- Corporate events, job postings, info sessions, and related events may be posted here.
|
- Corporate events, job postings, info sessions, and related events may be posted here.
|
||||||
|
|
Loading…
Reference in New Issue