Skip to content

Commit 775afce

Browse files
committedJul 1, 2019
minor #11854 Fix many typos and improve grammar (Calinou)
This PR was merged into the 3.4 branch. Discussion ---------- Fix many typos and improve grammar Follow-up to #11645. Commits ------- 97f4eeb Fix many typos and improve grammar
2 parents c84deae + 97f4eeb commit 775afce

File tree

66 files changed

+95
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+95
-96
lines changed
 

‎_build/maintainer_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ interface. Then:
9393
Merging Process
9494
~~~~~~~~~~~~~~~
9595

96-
At first it's common to make mistakes and merge things badly. Don't worry. This
96+
At first, it's common to make mistakes and merge things badly. Don't worry. This
9797
has happened to all of us and we've always been able to recover from any mistake.
9898

9999
Step 1: Select the right branch to merge

‎best_practices/controllers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ means that controllers should hold just the thin layer of *glue-code*
66
needed to coordinate the different parts of the application.
77

88
As a rule of thumb, you should follow the 5-10-20 rule, where controllers should
9-
only define 5 variables or less, contain 10 actions or less and include 20 lines
10-
of code or less in each action. This isn't an exact science, but it should
9+
only define 5 variables or fewer, contain 10 actions or fewer and include 20 lines
10+
of code or fewer in each action. This isn't an exact science, but it should
1111
help you realize when code should be refactored out of the controller and
1212
into a service.
1313

0 commit comments

Comments
 (0)