Skip to content

Commit

Permalink
Merge pull request #372 from votinginfoproject/bug/cherry-pick-recent…
Browse files Browse the repository at this point in the history 
…-updates-from-vip52

Bug/cherry pick recent updates from vip52 to master
  • Loading branch information
Franklin Smith committed Feb 12, 2018
2 parents 679c08c + 83bcd08 commit 1ae12d9
Show file tree
Hide file tree
Showing 37 changed files with 1,638 additions and 1,569 deletions.
9 changes: 2 additions & 7 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,9 @@ Discussion."
2. if working on a documentation bug/feature, the documentation must build with Sphinx with no
errors (_**NB:** see [Installing Sphinx](#installing-sphinx) below_).
3. Once it's done and tested, create a pull request to move it into the current working branch.
4. At that point, some discussion might happen. In order to get approval for the pull request, you
will need approval from two people, including one representative from Pew and one representative
from Google (Pew and Google employees still need two approvers and cannot self-approve, but it
is not required that the second approver be from the organization of the PR author). However it
is important to note that other members have substantial technical and election background as
well, so please take all feedback to heart, regardless of the source.
4. Some feedback might be necessary in order to approve a PR. Many members of this repository have substantial technical and election backgrounds, so please take all feedback to heart, regardless of the source. In order to get approval for the pull request, you will need approval from two people, including one representative from Pew and one representative from Google. Pew and Google employees still require two approvers and cannot self-approve, but it is not required that either approver on the PR be from the same organization as the PR author.
1. Google approvers: @jdmgoogle
2. Pew approvers: @lbirdpew
2. Pew approvers: @lbirdpew; @afsmythe; @MariaBianchi
5. When it's reviewed and accepted by the team within a reasonable timeframe (TBD), it's merged
into the current working branch by the developer who created the pull-request.
6. Delete the feature/bug branch.
Expand Down
6 changes: 3 additions & 3 deletions docs/built_rst/tables/elements/contest_base.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
| | | | | the ballot. | present, then the implementation should |
| | | | | | ignore it. |
+-------------------------+-----------------------------------------+--------------+--------------+------------------------------------------+------------------------------------------+
| ElectoralDistrictId | ``xs:IDREF`` | Optional | Single | References an | If the field is invalid or not present, |
| | | | | :ref:`multi-xml-electoral-district` | then the implementation should ignore |
| | | | | element that represents the geographical | it. |
| ElectoralDistrictId | ``xs:IDREF`` | **Required** | Single | References an | If the field is invalid, then the |
| | | | | :ref:`multi-xml-electoral-district` | implementation should ignore it. |
| | | | | element that represents the geographical | |
| | | | | scope of the contest. | |
+-------------------------+-----------------------------------------+--------------+--------------+------------------------------------------+------------------------------------------+
| ElectorateSpecification | :ref:`multi-xml-internationalized-text` | Optional | Single | Specifies any changes to the eligible | If the element is invalid or not |
Expand Down
6 changes: 3 additions & 3 deletions docs/built_rst/xml/elements/contest_base.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ and :ref:`multi-xml-retention-contest` (NB: the latter because it extends
| | | | | the ballot. | present, then the implementation should |
| | | | | | ignore it. |
+-------------------------+-----------------------------------------+--------------+--------------+------------------------------------------+------------------------------------------+
| ElectoralDistrictId | ``xs:IDREF`` | Optional | Single | References an | If the field is invalid or not present, |
| | | | | :ref:`multi-xml-electoral-district` | then the implementation should ignore |
| | | | | element that represents the geographical | it. |
| ElectoralDistrictId | ``xs:IDREF`` | **Required** | Single | References an | If the field is invalid, then the |
| | | | | :ref:`multi-xml-electoral-district` | implementation should ignore it. |
| | | | | element that represents the geographical | |
| | | | | scope of the contest. | |
+-------------------------+-----------------------------------------+--------------+--------------+------------------------------------------+------------------------------------------+
| ElectorateSpecification | :ref:`multi-xml-internationalized-text` | Optional | Single | Specifies any changes to the eligible | If the element is invalid or not |
Expand Down

0 comments on commit 1ae12d9

Please sign in to comment.