Skip to content

Commit ad1620c

Browse files
Final cleanup: alphabetical order and whitespace
1 parent de8512a commit ad1620c

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

documentation/style-guide.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,26 @@ C API
7777
to write extension modules. All caps and unhyphenated.
7878

7979
CPU
80-
Central processing unit. No need to spell out.
80+
Central processing unit. No need to spell out.
81+
82+
free-threaded
83+
The preferred term for the build mode that makes the global interpreter
84+
lock (GIL) optional (per :pep:`703`). Avoid using "no-gil" to prevent
85+
double negatives (for example, "non-no-GIL").
8186

8287
POSIX
88+
<<<<<<< HEAD
8389
The name assigned to a particular group of standards. This is always
8490
uppercase.
8591
free-threaded
8692
The preferred term for the build mode that makes the global interpreter
8793
lock (GIL) optional (per :pep:`703`). Avoid using "no-GIL" to prevent
8894
double negatives (for example, "non-no-GIL").
95+
=======
96+
The name assigned to a particular group of standards. This is always
97+
uppercase.
98+
99+
>>>>>>> a22760b (Final cleanup: alphabetical order and whitespace)
89100
Python
90101
The name of our favorite programming language is always capitalized.
91102

0 commit comments

Comments
 (0)