summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaelC <m@michaelcullum.com>2016-08-05 18:53:52 +0100
committerMichaelC <m@michaelcullum.com>2016-08-05 18:53:52 +0100
commit9244842c58c7b1772205eee14d297ff7204d28bd (patch)
tree7838882923c85de997e938261f532863ecd477bc
parent8ce732ee8ab627cd9bfd617037d21bfd5c8dc9e3 (diff)
downloadfig-standards-9244842c58c7b1772205eee14d297ff7204d28bd.zip
fig-standards-9244842c58c7b1772205eee14d297ff7204d28bd.tar.gz
fig-standards-9244842c58c7b1772205eee14d297ff7204d28bd.tar.bz2
Some typographical and grammatical improvements
-rw-r--r--bylaws/001-mission-and-structure.md6
-rw-r--r--bylaws/002-psr-workflow.md2
-rw-r--r--bylaws/003-votes.md2
3 files changed, 5 insertions, 5 deletions
diff --git a/bylaws/001-mission-and-structure.md b/bylaws/001-mission-and-structure.md
index eb3ba25..46793c5 100644
--- a/bylaws/001-mission-and-structure.md
+++ b/bylaws/001-mission-and-structure.md
@@ -44,7 +44,7 @@ Whilst there are a number of defined functions below but they should also perfor
All FIG Secretaries are expected to remain impartial and professional when acting in an official capacity as Secretary and should also remain aware that even when not acting in an official capacity, their actions reflect back on the PHP FIG and the FIG must not be brought into disrepute.
-In order to ensure impartiality, Secretaries may not concurrently serve as a Project Representative, Core Committee Member, or Editor of a PSR. They may, however, be a member of a Working Group. They must declare all conflicts of interest (for example being on the core team of member projects or involvement in PSR working groups)
+In order to ensure impartiality, Secretaries may not concurrently serve as a Project Representative, Core Committee Member, or Editor of a PSR. They may, however, be a member of a Working Group. Secretaries must also publicly declare all conflicts of interest for example if they are participating in a working group or are a core team member of a Member Project.
### Defined functions
@@ -55,13 +55,13 @@ There are a number of defined functions that the FIG Secretaries are expected to
* Tallying votes and managing the voting system
* Tracking member project activity
* Ensuring bylaws are being followed
-* Clarifying any interpretation of bylaw text (If there is lack of consensus between FIG Secretaries then it must be put to a full vote); subject to a lack of objection from Core Committee members and Project Representatives**
+* Clarifying any interpretation of bylaw text; subject to a lack of objection from Core Committee members and Project Representatives**
* Ensure that relevant marketing mediums (e.g. Twitter and Facebook) are kept professional, up to date and impartial
* Moderate discussions on github, the mailing list, IRC channels and other official communication mediums to ensure that an appropriate environment is maintained. This includes the ability to restrict posting and impose bans with the exception that they cannot permanently ban or restrict a Core Committee member or Project Representative
* Should there be a FIG meeting at a conference or other ad hoc gathering any Secretary in attendance should take notes to report back to the mailing list
* Acting throughout their term essentially as Developer Advocates for the PHP FIG
- ** Should any bylaw clarification by challenged or objected to by three or more project representatives or core committee members it must go to a vote; secretaries can choose to put it to a vote nonetheless at any point
+ ** Should any bylaw clarification by challenged or objected to by three or more project representatives or core committee members it must go to a vote. If between Secretaries consensus cannot be found on a clarification, it must go to a full vote.
### Access and Abilities
diff --git a/bylaws/002-psr-workflow.md b/bylaws/002-psr-workflow.md
index 81012ae..f65a599 100644
--- a/bylaws/002-psr-workflow.md
+++ b/bylaws/002-psr-workflow.md
@@ -46,7 +46,7 @@ Once four weeks have passed and two viable trial implementations can be demonstr
## Accepted
-If the Acceptance Vote passes, then the proposal officially becomes an accepted PSR. At this time the Working Group is automatically dissolved however the Editor's input (or a nominated individual communicated to the secretaries) may be called upon in the future should typos, changes or Errata on the specification be raised.
+If the Acceptance Vote passes, then the proposal officially becomes an accepted PSR. At this time the Working Group is automatically dissolved, however the Editor's input (or a nominated individual communicated to the secretaries) may be called upon in the future should typos, changes or Errata on the specification be raised.
## Deprecated
diff --git a/bylaws/003-votes.md b/bylaws/003-votes.md
index e5c0fca..a11b575 100644
--- a/bylaws/003-votes.md
+++ b/bylaws/003-votes.md
@@ -8,7 +8,7 @@ Votes may be changed at will until the end of the voting period.
In some cases, votes may overlap such that an individual would become eligible to cast a vote only as a result of another overlapping vote, such as a membership vote. In all cases, eligibility to vote will be defined based on membership at the moment a given vote starts. For nominations for Secretary or Core Committee member, eligibility to vote will be defined based on membership at the moment the nominating period begins.
-A secretary can trigger any type of vote.
+A secretary may trigger any type of vote.
Rounding of quorums and majorities would occur such that: