Merge pull request #3729 from practicalswift/a-vs-an-fixes-ii

[gardening] "a" vs. "an"-fixes

Author: gottesmm

include/swift/SILOptimizer/Analysis/ARCAnalysis.h

@@ -393,8 +393,8 @@ SILInstruction *findReleaseToMatchUnsafeGuaranteedValue(
 
 namespace swift {
 
-/// EpilogueARCBlockState - Keep track of whether a epilogue ARC instruction has
-/// been found.
+/// EpilogueARCBlockState - Keep track of whether an epilogue ARC instruction
+/// has been found.
 struct EpilogueARCBlockState {
   /// Keep track of whether a eplogue release has been found before and after
   /// this basic block.

lib/Sema/CSDiag.cpp

@@ -2438,7 +2438,7 @@ diagnoseUnviableLookupResults(MemberLookupResult &result, Type baseObjTy,
 
         // See through function decl context
         if (auto parent = CS->DC->getParent())
-        // If we are in an protocol extension of 'Proto' and we see
+        // If we are in a protocol extension of 'Proto' and we see
         // 'Proto.static', suggest 'Self.static'
         if (auto extensionContext = parent->getAsProtocolExtensionContext()) {
           if (extensionContext->getDeclaredType()->getCanonicalType()

stdlib/public/SDK/Foundation/TimeZone.swift

@@ -90,7 +90,7 @@ public struct TimeZone : CustomStringConvertible, CustomDebugStringConvertible,
     /// In general, you are discouraged from using abbreviations except for unique instances such as "GMT". Time Zone abbreviations are not standardized and so a given abbreviation may have multiple meanings—for example, "EST" refers to Eastern Time in both the United States and Australia
     ///
     /// - parameter abbreviation: The abbreviation for the time zone.
-    /// - returns: A time zone identified by abbreviation determined by resolving the abbreviation to a identifier using the abbreviation dictionary and then returning the time zone for that identifier. Returns `nil` if there is no match for abbreviation.
+    /// - returns: A time zone identified by abbreviation determined by resolving the abbreviation to an identifier using the abbreviation dictionary and then returning the time zone for that identifier. Returns `nil` if there is no match for abbreviation.
     public init?(abbreviation: String) {
         if let r = NSTimeZone(abbreviation: abbreviation) {
             _wrapped = r

stdlib/public/SDK/Foundation/URL.swift

@@ -561,7 +561,7 @@ public struct URL : ReferenceConvertible, CustomStringConvertible, Equatable {
         bookmarkDataIsStale = stale.boolValue
     }
 
-    /// Creates and initializes a NSURL that refers to the location specified by resolving the alias file at url. If the url argument does not refer to an alias file as defined by the NSURLIsAliasFileKey property, the NSURL returned is the same as url argument. This method fails and returns nil if the url argument is unreachable, or if the original file or directory could not be located or is not reachable, or if the original file or directory is on a volume that could not be located or mounted. The URLBookmarkResolutionWithSecurityScope option is not supported by this method.
+    /// Creates and initializes an NSURL that refers to the location specified by resolving the alias file at url. If the url argument does not refer to an alias file as defined by the NSURLIsAliasFileKey property, the NSURL returned is the same as url argument. This method fails and returns nil if the url argument is unreachable, or if the original file or directory could not be located or is not reachable, or if the original file or directory is on a volume that could not be located or mounted. The URLBookmarkResolutionWithSecurityScope option is not supported by this method.
     @available(OSX 10.10, iOS 8.0, *)
     public init(resolvingAliasFileAt url: URL, options: BookmarkResolutionOptions = []) throws {
         self.init(reference: try NSURL(resolvingAliasFileAt: url, options: options))
@@ -1085,7 +1085,7 @@ public struct URL : ReferenceConvertible, CustomStringConvertible, Equatable {
         return result as Data
     }
 
-    /// Given a NSURL created by resolving a bookmark data created with security scope, make the resource referenced by the url accessible to the process. When access to this resource is no longer needed the client must call stopAccessingSecurityScopedResource. Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource (Note: this is not reference counted).
+    /// Given an NSURL created by resolving a bookmark data created with security scope, make the resource referenced by the url accessible to the process. When access to this resource is no longer needed the client must call stopAccessingSecurityScopedResource. Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource (Note: this is not reference counted).
     @available(OSX 10.7, iOS 8.0, *)
     public func startAccessingSecurityScopedResource() -> Bool {
         return _url.startAccessingSecurityScopedResource()