Merge remote-tracking branch 'origin' into swift-3-api-guidelines

This commit is contained in:
Max Moiseev
2015-12-11 15:19:02 -08:00
3221 changed files with 9231 additions and 5907 deletions

View File

@@ -1369,7 +1369,7 @@ extension String {
@available(*, unavailable, message="Use URLByAppendingPathExtension on NSURL instead.")
public func stringByAppendingPathExtension(ext: String) -> String? {
// FIXME: This method can return nil in practice, for example when self is
// an empty string. OTOH, this is not documented, documentatios says that
// an empty string. OTOH, this is not documented, documentation says that
// it always returns a string.
//
// <rdar://problem/17902469> -[NSString stringByAppendingPathExtension] can