Skip to content

Minor typo corrections #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2016
Merged

Minor typo corrections #177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
568c7a2
Removed extra 'and'
gemmakbarlow May 3, 2016
9c21a50
Change to plural 'parentheses'
gemmakbarlow May 3, 2016
be97858
Changed 'parenthesis' to 'parentheses'
gemmakbarlow May 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Writing Objective-C? Check out our [Objective-C Style Guide](https://github.com/
* [Golden Path](#golden-path)
* [Failing Guards](#failing-guards)
* [Semicolons](#semicolons)
* [Parenthesis](#parenthesis)
* [Parentheses](#parentheses)
* [Copyright Statement](#copyright-statement)
* [Smiley Face](#smiley-face)
* [Credits](#credits)
Expand Down Expand Up @@ -82,7 +82,7 @@ class app_widgetContainer {
}
```

Abbreviations and and acronyms should generally be avoided. Following the Apple Design Guidelines, abbreviations and initialisms that appear in all uppercase should be uniformly uppercase or lowercase. Examples:
Abbreviations and acronyms should generally be avoided. Following the Apple Design Guidelines, abbreviations and initialisms that appear in all uppercase should be uniformly uppercase or lowercase. Examples:

**Preferred**
```swift
Expand Down Expand Up @@ -920,9 +920,9 @@ let swift = "not a scripting language";

**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)

## Parenthesis
## Parentheses

Parenthesis around conditionals are not required and should be omitted.
Parentheses around conditionals are not required and should be omitted.

**Preferred:**
```swift
Expand Down