Update various documentation to avoid the "bundle" terminology

Author: d-ronnqvist

Sources/SwiftDocC/Checker/Checkers/DuplicateTopicsSection.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -11,9 +11,7 @@
 public import Foundation
 public import Markdown
 
-/**
- A `Document` may only have one level-2 "Topics" heading at the top level, since it serves as structured data for a documentation bundle's hierarchy.
- */
+/// A document only supports a single level-2 "Topics" heading at the top level, because it's used to define the documentation's hierarchy.
 public struct DuplicateTopicsSections: Checker {
     /// The list of level-2 headings with the text "Topics" found in the document.
     public var foundTopicsHeadings = [Heading]()

Sources/SwiftDocC/Converter/DocumentationContextConverter.swift

@@ -40,9 +40,9 @@ public class DocumentationContextConverter {
     /// The remote source control repository where the documented module's source is hosted.
     let sourceRepository: SourceRepository?
 
-    /// Creates a new node converter for the given bundle and context.
+    /// Creates a new node converter for the given context.
     ///
-    /// The converter uses bundle and context to resolve references to other documentation and describe the documentation hierarchy.
+    /// The converter uses the context to resolve references to other documentation and describe the documentation hierarchy.
     ///
     /// - Parameters:
     ///   - context: The context that the converter uses to to resolve references it finds in the documentation node's content.

Sources/SwiftDocC/DocumentationService/Models/Services/Convert/ConvertRequest.swift

@@ -13,11 +13,11 @@ public import Foundation
 
 /// A request to convert in-memory documentation.
 public struct ConvertRequest: Codable {
-    /// Information about the documentation bundle to convert.
+    /// Information about the documentation catalog to convert.
     ///
     /// ## See Also
-    /// - ``DocumentationBundle/Info``
     public var bundleInfo: DocumentationContext.Inputs.Info
+    /// - ``DocumentationContext/Inputs/Info``
 
     /// Feature flags to enable when performing this convert request.
     public var featureFlags: FeatureFlags
@@ -51,16 +51,16 @@ public struct ConvertRequest: Codable {
     /// Whether the conversion's render reference store should be included in the response.
     ///
     /// The ``RenderReferenceStore`` contains compiled information for documentation nodes registered in a context. This
-    /// information can be used as a lightweight index of the available documentation content in the bundle that's been converted.
+    /// information can be used as a lightweight index of the available documentation content in the context that's been converted.
     public var includeRenderReferenceStore: Bool?
 
-    /// The file location of the bundle to convert, if any.
+    /// The file location of the catalog to convert, if any.
     public var bundleLocation: URL?
 
-    /// The symbols graph data included in the documentation bundle to convert.
+    /// The symbols graph data included in the documentation catalog to convert.
     ///
     /// ## See Also
-    /// - ``DocumentationBundle/symbolGraphURLs``
+    /// - ``DocumentationContext/Inputs/symbolGraphURLs``
     public var symbolGraphs: [Data]
 
     /// The mapping of external symbol identifiers to lines of a documentation comment that overrides the value in the symbol graph.
@@ -72,20 +72,20 @@ public struct ConvertRequest: Codable {
     /// Whether the conversion's rendered documentation should include source file location metadata.
     public var emitSymbolSourceFileURIs: Bool
 
-    /// The article and documentation extension file data included in the documentation bundle to convert.
+    /// The article and documentation extension file data included in the documentation catalog to convert.
     ///
     /// ## See Also
-    /// - ``DocumentationBundle/markupURLs``
+    /// - ``DocumentationContext/Inputs/markupURLs``
     public var markupFiles: [Data]
 
 
-    /// The tutorial file data included in the documentation bundle to convert.
+    /// The tutorial file data included in the documentation catalog to convert.
     public var tutorialFiles: [Data]
 
-    /// The on-disk resources in the documentation bundle to convert.
+    /// The on-disk resources in the documentation catalog to convert.
     ///
     /// ## See Also
-    /// - ``DocumentationBundle/miscResourceURLs``
+    /// - ``DocumentationContext/Inputs/miscResourceURLs``
     public var miscResourceURLs: [URL]
 
     /// The symbol identifiers that have an expanded documentation page available if they meet the associated access level requirement.
@@ -97,22 +97,22 @@ public struct ConvertRequest: Codable {
 
     /// Creates a request to convert in-memory documentation.
     /// - Parameters:
-    ///   - bundleInfo: Information about the bundle to convert.
+    ///   - bundleInfo: Information about the catalog to convert.
     ///   - featureFlags: Feature flags to enable when performing this convert request.
     ///   - externalIDsToConvert: The external IDs of the symbols to convert.
     ///   - documentPathsToConvert: The paths of the documentation nodes to convert.
     ///   - includeRenderReferenceStore: Whether the conversion's render reference store should be included in the
     ///   response.
-    ///   - bundleLocation: The file location of the documentation bundle to convert, if any.
-    ///   - symbolGraphs: The symbols graph data included in the documentation bundle to convert.
+    ///   - bundleLocation: The file location of the documentation catalog to convert, if any.
+    ///   - symbolGraphs: The symbols graph data included in the documentation catalog to convert.
     ///   - overridingDocumentationComments: The mapping of external symbol identifiers to lines of a
     ///   documentation comment that overrides the value in the symbol graph.
     ///   - emitSymbolSourceFileURIs: Whether the conversion's rendered documentation should include source file location metadata.
     ///   - knownDisambiguatedSymbolPathComponents: The mapping of external symbol identifiers to
     ///   known disambiguated symbol path components.
-    ///   - markupFiles: The article and documentation extension file data included in the documentation bundle to convert.
-    ///   - tutorialFiles: The tutorial file data included in the documentation bundle to convert.
-    ///   - miscResourceURLs: The on-disk resources in the documentation bundle to convert.
+    ///   - markupFiles: The article and documentation extension file data included in the documentation catalog to convert.
+    ///   - tutorialFiles: The tutorial file data included in the documentation catalog to convert.
+    ///   - miscResourceURLs: The on-disk resources in the documentation catalog to convert.
     ///   - symbolIdentifiersWithExpandedDocumentation: A dictionary of identifiers to requirements for these symbols to have expanded
     ///   documentation available.
     public init(

Sources/SwiftDocC/DocumentationService/Models/Services/Convert/ConvertResponse.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -18,10 +18,10 @@ public struct ConvertResponse: Codable {
     /// The render nodes that were created as part of the conversion, encoded as JSON.
     public var renderNodes: [Data]
 
-    /// The render reference store that was created as part of the bundle's conversion, encoded as JSON.
+    /// The render reference store that was created as part of the documentation's conversion, encoded as JSON.
     ///
     /// The ``RenderReferenceStore`` contains compiled information for documentation nodes that were registered as part of
-    /// the conversion. This information can be used as a lightweight index of the available documentation content in the bundle that's
+    /// the conversion. This information can be used as a lightweight index of the available documentation content in the context that's
     /// been converted.
     public var renderReferenceStore: Data?
 

Sources/SwiftDocC/Indexing/Navigator/AvailabilityIndex+Ext.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -63,7 +63,7 @@ extension AvailabilityIndex {
 // MARK: - InterfaceLanguage
 
 /**
- Interface Language identifies a programming language used to index a content of a documentation bundle.
+ Interface Language identifies a programming language used to index a content of a documentation context.
 
  - Note: The name reflects what a render node JSON provides to identify a programming language.
  The name has been decided to avoid confusion with locale languages.

Sources/SwiftDocC/Indexing/Navigator/NavigatorIndex.swift

@@ -14,7 +14,7 @@ import Crypto
 /**
  A `NavigatorIndex` contains all the necessary information to display the data inside a navigator.
  The data ranges from the tree to the necessary pieces of information to filter the content and perform actions in a fast way.
- A navigator index is created per bundle and needs a bundle identifier to correctly work. Anonymous bundles are allowed, but they limit
+ A navigator index is created per context and needs a bundle identifier to correctly work. Anonymous bundles are allowed, but they limit
  the functionalities of the index.
 
  A `NavigatorIndex` is composed by two main components:

Sources/SwiftDocC/Infrastructure/Bundle Assets/BundleData.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -20,7 +20,7 @@ public struct BundleData {
 
     /// Creates a bundle data value given its location and an associated trait collection.
     /// - Parameters:
-    ///   - url: The location of the resource in the documentation bundle.
+    ///   - url: The location of the resource in the documentation catalog.
     ///   - traitCollection: An optional trait collection associated with the resource.
     public init(url: URL, traitCollection: DataTraitCollection?) {
         self.url = url

Sources/SwiftDocC/Infrastructure/Context/DocumentationContext+Configuration.swift

@@ -36,7 +36,7 @@ extension DocumentationContext {
             /// path components into the documentation context.
             var knownDisambiguatedSymbolPathComponents: [String: [String]]?
 
-            /// Controls whether bundle registration should allow registering articles when no technology root is defined.
+            /// Controls whether catalog registration should allow registering articles when no technology root is defined.
             ///
             /// Set this property to `true` to enable registering documentation for standalone articles,
             /// for example when using ``ConvertService``.

Sources/SwiftDocC/Infrastructure/ConvertActionConverter.swift

@@ -21,7 +21,7 @@ package enum ConvertActionConverter {
     static package let signposter = NoOpSignposterShim()
 #endif
 
-    /// Converts the documentation bundle in the given context and passes its output to a given consumer.
+    /// Converts the documentation catalog in the given context and passes its output to a given consumer.
     ///
     /// - Parameters:
     ///   - context: The context of documentation information to convert.
@@ -105,7 +105,7 @@ package enum ConvertActionConverter {
 
         // Consume external links and add them into the sidebar.
         for externalLink in context.externalCache {
-            // Here we're associating the external node with the **current** bundle's bundle ID.
+            // Here we're associating the external node with the **current** local bundle ID.
             // This is needed because nodes are only considered children if the parent and child's bundle ID match.
             // Otherwise, the node will be considered as a separate root node and displayed separately.
             let externalRenderNode = ExternalRenderNode(externalEntity: externalLink.value, bundleIdentifier: id)