diff --git a/pep-0007.txt b/pep-0007.txt index ba71c3f1a..cd5c10355 100644 --- a/pep-0007.txt +++ b/pep-0007.txt @@ -75,9 +75,9 @@ Code lay-out } * Code structure: one space between keywords like ``if``, ``for`` and - the following left paren; no spaces inside the paren; braces may be - omitted where C permits but when present, they should be formatted - as shown:: + the following left paren; no spaces inside the paren; braces are + strongly preferred but may be omitted where C permits, and they + should be formatted as shown:: if (mro != NULL) { ... diff --git a/pep-0512.txt b/pep-0512.txt index 43003c647..42f7c629d 100644 --- a/pep-0512.txt +++ b/pep-0512.txt @@ -233,7 +233,9 @@ be chosen which gives us a linear history by using Git's CLI. The expectation is that all pull requests will be fast-forwarded and rebased before being pushed to the master repository. This should give proper attribution to the pull request author in the Git -history. +history. This does have the consequence of losing some GitHub +features such as automatic closing of pull requests, link generation, +etc. A second set of recommended commands will also be written for committing a contribution from a patch file uploaded to