Skip to content

Commit 2e12f85

Browse files
authored
Add style guideline about conditional conjunction formatting (#169)
Based on php/web-doc#33 by @tiffany-taylor
1 parent 17463fe commit 2e12f85

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

docs/style.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,25 @@ CORRECT: The optional second parameter may be used to specify tags that should n
4141
Example: `<entry>5.2.11, 5.3.1</entry>`
4242

4343
## General Grammar
44+
4445
The PHP Manual should be written with particular attention to general
4546
American English grammar and spelling.
46-
The [serial (Oxford) comma](https://en.wikipedia.org/wiki/Serial_comma)
47+
48+
- The [serial (Oxford) comma](https://en.wikipedia.org/wiki/Serial_comma)
4749
should be used in a series of three or more terms.
48-
Contractions should be used appropriately.
49-
Special attention should be applied to sentence construction when using
50+
51+
- Contractions should be used appropriately.
52+
53+
- Special attention should be applied to sentence construction when using
5054
prepositions (i.e., sentences should not end in prepositions).
5155

56+
- If a statement includes a conditional conjunction, the condition being
57+
met should come before the independent clause.
58+
The previous statement is an example of how a conditional conjuction
59+
should be formatted.
60+
See [PR#1565](https://github.com/php/doc-en/pull/1565) for another
61+
example.
62+
5263
## PHP Manual Terms
5364

5465
There are various phrases and technical terms used throughout the manual where

0 commit comments

Comments
 (0)