Skip to content

Commit 0ff1a41

Browse files
committed
Merge pull request kodecocodes#144 from rayfix/master
move language to naming section
2 parents 0e46317 + 62ac88a commit 0ff1a41

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

README.markdown

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Writing Objective-C? Check out our [Objective-C Style Guide](https://github.com/
1212
* [Enumerations](#enumerations)
1313
* [Prose](#prose)
1414
* [Class Prefixes](#class-prefixes)
15+
* [Language](#language)
1516
* [Spacing](#spacing)
1617
* [Comments](#comments)
1718
* [Classes and Structures](#classes-and-structures)
@@ -28,7 +29,6 @@ Writing Objective-C? Check out our [Objective-C Style Guide](https://github.com/
2829
* [Syntactic Sugar](#syntactic-sugar)
2930
* [Control Flow](#control-flow)
3031
* [Semicolons](#semicolons)
31-
* [Language](#language)
3232
* [Copyright Statement](#copyright-statement)
3333
* [Smiley Face](#smiley-face)
3434
* [Credits](#credits)
@@ -120,6 +120,19 @@ import SomeModule
120120

121121
let myClass = MyModule.UsefulClass()
122122
```
123+
### Language
124+
125+
Use US English spelling to match Apple's API.
126+
127+
**Preferred:**
128+
```swift
129+
let color = "red"
130+
```
131+
132+
**Not Preferred:**
133+
```swift
134+
let colour = "red"
135+
```
123136

124137

125138
## Spacing
@@ -534,19 +547,6 @@ let swift = "not a scripting language";
534547

535548
**NOTE**: Swift is very different to JavaScript, where omitting semicolons is [generally considered unsafe](http://stackoverflow.com/questions/444080/do-you-recommend-using-semicolons-after-every-statement-in-javascript)
536549

537-
## Language
538-
539-
Use US English spelling to match Apple's API.
540-
541-
**Preferred:**
542-
```swift
543-
let color = "red"
544-
```
545-
546-
**Not Preferred:**
547-
```swift
548-
let colour = "red"
549-
```
550550

551551
## Copyright Statement
552552

0 commit comments

Comments
 (0)