Skip to content

Commit cc94f30

Browse files
amartini51amartini51
committed
Track 'main' to resolve merge conflict
Trivial conflict in Concurrency between the cross reference (added by the previous commit) and the beta banner (added on 'main').
2 parents 9056504 + c192e87 commit cc94f30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+284
-10
lines changed

‎TSPL.docc/GuidedTour/AboutSwift.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ Swift continues to evolve with thoughtful new features and powerful capabilities
4545
The goals for Swift are ambitious.
4646
We can’t wait to see what you create with it.
4747

48+
> Beta Software:
49+
>
50+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
51+
>
52+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
53+
4854
<!--
4955
This source file is part of the Swift.org open source project
5056

‎TSPL.docc/GuidedTour/Compatibility.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
Learn what functionality is available in older language modes.
44

5-
This book describes Swift 6.1,
6-
the default version of Swift that's included in Xcode 16.3.
7-
You can use the Swift 6.1 compiler to build code
8-
that's written in Swift 6.1, Swift 5, Swift 4.2, or Swift 4.
5+
This book describes Swift 6.2,
6+
the default version of Swift that's included in Xcode 26.
7+
You can use the Swift 6.2 compiler to build code
8+
that's written in Swift 6.2, Swift 5, Swift 4.2, or Swift 4.
99

10-
When you use the Swift 6.1 compiler
10+
When you use the Swift 6.2 compiler
1111
to build code that uses the Swift 5 language mode,
12-
you can use the new features from Swift 6.1 ---
12+
you can use the new features from Swift 6.2 ---
1313
they're enabled either by default or by an upcoming feature flag.
1414
However, to enable strict concurrency checking,
15-
you need to upgrade to the Swift 6.1 language mode.
15+
you need to upgrade to the Swift 6.2 language mode.
1616

1717
In addition,
1818
when you use Xcode 15.3 to build Swift 4 and Swift 4.2 code,
@@ -35,14 +35,20 @@ that provides the corresponding concurrency types.
3535
On Apple platforms, set a deployment target
3636
of at least iOS 13, macOS 10.15, tvOS 13, watchOS 6, or visionOS 1.
3737

38-
A target written in Swift 6.1 can depend on
38+
A target written in Swift 6.2 can depend on
3939
a target that's written in Swift 5, Swift 4.2 or Swift 4,
4040
and vice versa.
4141
This means, if you have a large project
4242
that's divided into multiple frameworks,
4343
you can migrate your code to a newer language version
4444
one framework at a time.
4545

46+
> Beta Software:
47+
>
48+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
49+
>
50+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
51+
4652
<!--
4753
This source file is part of the Swift.org open source project
4854

‎TSPL.docc/GuidedTour/GuidedTour.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,6 +2448,12 @@ anyCommonElements([1, 2, 3], [3])
24482448
Writing `<T: Equatable>`
24492449
is the same as writing `<T> ... where T: Equatable`.
24502450

2451+
> Beta Software:
2452+
>
2453+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
2454+
>
2455+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
2456+
24512457
<!--
24522458
This source file is part of the Swift.org open source project
24532459

‎TSPL.docc/LanguageGuide/AccessControl.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,12 @@ but a public type alias can't alias an internal, file-private, or private type.
15081508
```
15091509
-->
15101510

1511+
> Beta Software:
1512+
>
1513+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1514+
>
1515+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1516+
15111517
<!--
15121518
This source file is part of the Swift.org open source project
15131519

‎TSPL.docc/LanguageGuide/AdvancedOperators.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,6 +1561,12 @@ see <doc:Attributes#resultBuilder>.
15611561
TODO: generic operators
15621562
-->
15631563

1564+
> Beta Software:
1565+
>
1566+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1567+
>
1568+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1569+
15641570
<!--
15651571
This source file is part of the Swift.org open source project
15661572

‎TSPL.docc/LanguageGuide/AutomaticReferenceCounting.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,12 @@ paragraph = nil
15121512
For more information about capture lists,
15131513
see <doc:Expressions#Capture-Lists>.
15141514

1515+
> Beta Software:
1516+
>
1517+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1518+
>
1519+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1520+
15151521
<!--
15161522
This source file is part of the Swift.org open source project
15171523

‎TSPL.docc/LanguageGuide/BasicOperators.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,12 @@ but the overall intention is clearer to the reader.
12311231
Readability is always preferred over brevity;
12321232
use parentheses where they help to make your intentions clear.
12331233

1234+
> Beta Software:
1235+
>
1236+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1237+
>
1238+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1239+
12341240
<!--
12351241
This source file is part of the Swift.org open source project
12361242

‎TSPL.docc/LanguageGuide/ClassesAndStructures.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,12 @@ see [Manual Memory Management](https://developer.apple.com/documentation/swift/s
710710
QUESTION: what's the deal with tuples and reference types / value types?
711711
-->
712712

713+
> Beta Software:
714+
>
715+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
716+
>
717+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
718+
713719
<!--
714720
This source file is part of the Swift.org open source project
715721

‎TSPL.docc/LanguageGuide/Closures.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,6 +1333,12 @@ As a result,
13331333
the value of the `customerProvider` argument
13341334
must be allowed to escape the function's scope.
13351335

1336+
> Beta Software:
1337+
>
1338+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1339+
>
1340+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1341+
13361342
<!--
13371343
This source file is part of the Swift.org open source project
13381344

‎TSPL.docc/LanguageGuide/CollectionTypes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,12 @@ Swift's `Dictionary` type doesn't have a defined ordering.
14831483
To iterate over the keys or values of a dictionary in a specific order,
14841484
use the `sorted()` method on its `keys` or `values` property.
14851485

1486+
> Beta Software:
1487+
>
1488+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1489+
>
1490+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1491+
14861492
<!--
14871493
This source file is part of the Swift.org open source project
14881494

‎TSPL.docc/LanguageGuide/Concurrency.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,12 @@ You can also use an unavailable conformance
16251625
to suppress implicit conformance to a protocol,
16261626
as discussed in <doc:Protocols#Implicit-Conformance-to-a-Protocol>.
16271627

1628+
> Beta Software:
1629+
>
1630+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1631+
>
1632+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1633+
16281634
<!--
16291635
This source file is part of the Swift.org open source project
16301636

‎TSPL.docc/LanguageGuide/ControlFlow.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,6 +2350,12 @@ when the check contains only fallback code.
23502350
You can use it with if-let, and other Boolean conditions, using a comma
23512351
-->
23522352

2353+
> Beta Software:
2354+
>
2355+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
2356+
>
2357+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
2358+
23532359
<!--
23542360
This source file is part of the Swift.org open source project
23552361

‎TSPL.docc/LanguageGuide/Deinitialization.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,12 @@ and so it's deallocated in order to free up its memory.
242242
Just before this happens, its deinitializer is called automatically,
243243
and its coins are returned to the bank.
244244

245+
> Beta Software:
246+
>
247+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
248+
>
249+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
250+
245251
<!--
246252
This source file is part of the Swift.org open source project
247253

‎TSPL.docc/LanguageGuide/Enumerations.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,12 @@ by evaluating the expression on the left-hand side,
854854
evaluating the expression on the right-hand side,
855855
and then adding them or multiplying them.
856856

857+
> Beta Software:
858+
>
859+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
860+
>
861+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
862+
857863
<!--
858864
This source file is part of the Swift.org open source project
859865

‎TSPL.docc/LanguageGuide/ErrorHandling.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,12 @@ even when no error handling code is involved.
982982
For more information,
983983
see <doc:ControlFlow#Deferred-Actions>.
984984

985+
> Beta Software:
986+
>
987+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
988+
>
989+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
990+
985991
<!--
986992
This source file is part of the Swift.org open source project
987993

‎TSPL.docc/LanguageGuide/Extensions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,12 @@ and prints an appropriate description.
682682
> can be written in shorthand form inside the `switch` statement,
683683
> such as `.negative` rather than `Int.Kind.negative`.
684684
685+
> Beta Software:
686+
>
687+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
688+
>
689+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
690+
685691
<!--
686692
This source file is part of the Swift.org open source project
687693

‎TSPL.docc/LanguageGuide/Functions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,12 @@ print("zero!")
13041304
```
13051305
-->
13061306

1307+
> Beta Software:
1308+
>
1309+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
1310+
>
1311+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
1312+
13071313
<!--
13081314
This source file is part of the Swift.org open source project
13091315

‎TSPL.docc/LanguageGuide/Generics.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,6 +2046,12 @@ see the reference for that protocol.
20462046
TODO: Describe how Optional<Wrapped> works
20472047
-->
20482048

2049+
> Beta Software:
2050+
>
2051+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
2052+
>
2053+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
2054+
20492055
<!--
20502056
This source file is part of the Swift.org open source project
20512057

‎TSPL.docc/LanguageGuide/Inheritance.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,12 @@ Any attempt to subclass a final class is reported as a compile-time error.
606606
TODO: Overriding Type Methods
607607
-->
608608

609+
> Beta Software:
610+
>
611+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
612+
>
613+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
614+
609615
<!--
610616
This source file is part of the Swift.org open source project
611617

‎TSPL.docc/LanguageGuide/Initialization.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2954,6 +2954,12 @@ print(board.squareIsBlackAt(row: 7, column: 7))
29542954
```
29552955
-->
29562956

2957+
> Beta Software:
2958+
>
2959+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
2960+
>
2961+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
2962+
29572963
<!--
29582964
This source file is part of the Swift.org open source project
29592965

‎TSPL.docc/LanguageGuide/Macros.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,12 @@ in no particular order:
763763
- `TokenSyntax`
764764
-->
765765

766+
> Beta Software:
767+
>
768+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
769+
>
770+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
771+
766772
<!--
767773
This source file is part of the Swift.org open source project
768774

‎TSPL.docc/LanguageGuide/MemorySafety.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,12 @@ it doesn't allow the access.
747747
on performance and memory usage.
748748
-->
749749

750+
> Beta Software:
751+
>
752+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
753+
>
754+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
755+
750756
<!--
751757
This source file is part of the Swift.org open source project
752758

‎TSPL.docc/LanguageGuide/Methods.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,12 @@ if player.tracker.advance(to: 6) {
650650
(see Doug's comments from the 2014-03-12 release notes)
651651
-->
652652

653+
> Beta Software:
654+
>
655+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
656+
>
657+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
658+
653659
<!--
654660
This source file is part of the Swift.org open source project
655661

‎TSPL.docc/LanguageGuide/NestedTypes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ For the example above,
192192
this enables the names of `Suit`, `Rank`, and `Values` to be kept deliberately short,
193193
because their names are naturally qualified by the context in which they're defined.
194194

195+
> Beta Software:
196+
>
197+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
198+
>
199+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
200+
195201
<!--
196202
This source file is part of the Swift.org open source project
197203

‎TSPL.docc/LanguageGuide/OpaqueTypes.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@ which means that the type of `twelve` is also inferred to be `Int`.
921921
}
922922
-->
923923

924-
925924
## Opaque Parameter Types
926925

927926
In addition to writing `some` to return an opaque type,
@@ -982,6 +981,12 @@ In addition,
982981
using the lightweight syntax for very complex constraints
983982
can be hard to read.
984983

984+
> Beta Software:
985+
>
986+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
987+
>
988+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
989+
985990
<!--
986991
This source file is part of the Swift.org open source project
987992

‎TSPL.docc/LanguageGuide/OptionalChaining.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,12 @@ if let beginsWithThe =
883883
the sugar for optional protocol requirements works.
884884
-->
885885

886+
> Beta Software:
887+
>
888+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
889+
>
890+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
891+
886892
<!--
887893
This source file is part of the Swift.org open source project
888894

‎TSPL.docc/LanguageGuide/Properties.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,6 +2060,12 @@ print(AudioChannel.maxInputLevelForAllChannels)
20602060
```
20612061
-->
20622062

2063+
> Beta Software:
2064+
>
2065+
> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
2066+
>
2067+
> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
2068+
20632069
<!--
20642070
This source file is part of the Swift.org open source project
20652071

0 commit comments

Comments
 (0)