Skip to content

Commit

Permalink
Merge pull request swiftlang#61 from d-soni/master
Browse files Browse the repository at this point in the history
fixed various docs typos
  • Loading branch information
tkremenek committed Dec 3, 2015
2 parents ecc7448 + 8ac2b31 commit 76621aa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/Arrays.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Bridging Rules and Terminology for all Types
class func _forceBridgeFromObjectiveC(_: _ObjectiveCType) -> Self
}

.. Note:: classes and ``@objc`` existentials shall not conform to
.. Note:: Classes and ``@objc`` existentials shall not conform to
``_BridgedToObjectiveC``, a restriction that's not currently
enforceable at compile-time.

Expand Down
2 changes: 1 addition & 1 deletion docs/CallingConvention.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ legal type sequences from the direct results. If this yields an empty
sequence, the result type is `void`. If it yields a single legal
type, the result type is the corresponding Clang type. No other could
actually have come from an imported C declaration, so we don't have
any real compatiblity requirements; for the convenience of
any real compatibility requirements; for the convenience of
interoperation, this is handled by constructing a new C struct which
contains the corresponding Clang types for the legal type sequence as
its fields.
Expand Down
4 changes: 2 additions & 2 deletions docs/GitWorkflows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ repository via bash in a terminal. A lot of information since this is supposed
to be a short, actionable guide. For more information, please see the Git crash
course guide for SVN users at <https://git-scm.com/course/SVN.html>

*NOTE* When ever when we say the Swift repository we mean any repository in the
Swift project.
*NOTE* Whenever we say the Swift repository, we mean any repository in the
Swift project.

Quicksetup (TLDR)
-----------------
Expand Down

0 comments on commit 76621aa

Please sign in to comment.