Fix merge conflicts

README.md

@@ -4,26 +4,26 @@ description: Welcome to the home of Adobe Experience Platform Mobile SDK documen
 
 # Home
 
+{% hint style="success" %}
+## Good to go for iOS 15
+
+Adobe Experience Platform Mobile SDKs have been functionally tested on iOS 15 release candidate versions. Please make sure you use [current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md) to ensure compatibility.
+{% endhint %}
+
 {% hint style="info" %}
 ## Interested in Kotlin?
 
-We're looking for feedback on how we can better support our customers using (or planning to use) [Kotlin](https://kotlinlang.org/) in their mobile apps.
+We're looking for feedback on how we can better support our customers using \(or planning to use\) [Kotlin](https://kotlinlang.org/) in their mobile apps.
 
 Please take a [quick survey ](https://forms.office.com/r/5E5d7pJivG)a let us know if you're interested in a Kotlin-based version of the Adobe Experience Platform Mobile SDK.
 {% endhint %}
 
 {% hint style="success" %}
 ## Swift SDKs are here!
 
-We've released Swift versions for our iOS SDKs - please see [Current SDK Versions](resources/upgrading-to-aep/current-sdk-versions.md) for available Swift extensions and reference documentation. 
-
-The Swift iOS SDKs are open source! Read more about [our move to Swift and open source](https://medium.com/adobetech/adobe-experience-platform-mobile-sdks-move-to-swift-for-ios-6aa67b67b4d4). 
-{% endhint %}
-
-{% hint style="warning" %}
-## Migrate to Swift
+We've released Swift versions for our iOS SDKs - please see [Current SDK Versions](resources/upgrading-to-aep/current-sdk-versions.md) for available Swift extensions and reference documentation.
 
-If you are currently using our Objective-C (ACP-prefix libraries), please see our [Migrating to Swift](resources/migrate-to-swift.md) guide for next steps.
+The Swift iOS SDKs are open source! Read more about [our move to Swift and open source](https://medium.com/adobetech/adobe-experience-platform-mobile-sdks-move-to-swift-for-ios-6aa67b67b4d4).
 {% endhint %}
 
 {% hint style="success" %}
@@ -48,15 +48,15 @@ Experience Platform Mobile SDKs are available for Android, iOS, and a [variety](
 
 The Adobe Experience Platform Mobile SDK provides support for the following platforms:
 
-* Android (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#android) for download links)
-* iOS - Swift (New! - see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#android) for repos, download links)
-* iOS - Objective C (includes iOS, iPadOS, and tvOS) (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#ios) for download links)
-* Cordova (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#cordova) for download links)
-* React Native (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#react-native) for download links)
-* Flutter (in beta, see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#flutter-beta) for download links)
-* Unity (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md) for download links)
+* Android \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#android) for download links\)
+* iOS - Swift \(New! - see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#android) for repos, download links\)
+* iOS - Objective C \(includes iOS, iPadOS, and tvOS\) \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#ios) for download links\)
+* Cordova \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#cordova) for download links\)
+* React Native \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#react-native) for download links\)
+* Flutter \(in beta, see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#flutter-beta) for download links\)
+* Unity \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md) for download links\)
 * [WeChat Mini Programs](resources/adobe-experience-platform-mini-programs-sdk/)
-* Xamarin (see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#xamarin) for download links)
+* Xamarin \(see [Current SDK versions](resources/upgrading-to-aep/current-sdk-versions.md#xamarin) for download links\)
 
 ## Quick Links
 

SUMMARY.md

@@ -32,6 +32,7 @@
     * [Configuration API reference](foundation-extensions/mobile-core/configuration/configuration-api-reference.md)
     * [Configuration event reference](foundation-extensions/mobile-core/configuration/configuration-event-reference.md)
   * [Identity](foundation-extensions/mobile-core/identity/README.md)
+    * [Migrating to AEPIdentity reference](foundation-extensions/mobile-core/identity/migration.md)
     * [Identity API reference](foundation-extensions/mobile-core/identity/identity-api-reference.md)
     * [Identity event reference](foundation-extensions/mobile-core/identity/identity-event-reference.md)
   * [Lifecycle](foundation-extensions/mobile-core/lifecycle/README.md)
@@ -49,7 +50,10 @@
   * [Rules Engine](foundation-extensions/mobile-core/rules-engine/README.md)
     * [Rules Engine technical details](foundation-extensions/mobile-core/rules-engine/rules-engine-details.md)
     * [Rules Engine consequence details](foundation-extensions/mobile-core/rules-engine/rules-engine-consequence-details.md)
-  * [Platform Services](foundation-extensions/mobile-core/platform-services.md)
+  * [Platform Services](foundation-extensions/mobile-core/platform-services/README.md)
+    * [Network Service](foundation-extensions/mobile-core/platform-services/network-service.md)
+    * [DataQueue Service](foundation-extensions/mobile-core/platform-services/data-queue-service.md)
+    * [SystemInfo/DeviceInfo Service](foundation-extensions/mobile-core/platform-services/system-device-info-service.md)
 * [Adobe Experience Platform Edge Network](foundation-extensions/experience-platform-extension/README.md)
   * [Release Notes](foundation-extensions/experience-platform-extension/release-notes.md)
   * [Edge Network API reference](foundation-extensions/experience-platform-extension/edge-network-api-reference.md)
@@ -61,16 +65,20 @@
 * [Identity for Edge Network](foundation-extensions/identity-for-edge-network/README.md)
   * [Release Notes](foundation-extensions/identity-for-edge-network/release-notes-1.md)
   * [API Reference](foundation-extensions/identity-for-edge-network/api-reference.md)
-  * [Frequently Asked Questions](foundation-extensions/identity-for-edge-network/identity-faq.md)
+  * [Frequently asked questions](foundation-extensions/identity-for-edge-network/identity-faq.md)
+* [Lifecycle for Edge Network](foundation-extensions/lifecycle-for-edge-network/README.md)
+  * [API Reference](foundation-extensions/lifecycle-for-edge-network/lifecycle-api-reference.md)
+  * [Event Reference](foundation-extensions/lifecycle-for-edge-network/lifecycle-event-reference.md)
+  * [Metrics](foundation-extensions/lifecycle-for-edge-network/lifecycle-metrics.md)
 * [Adobe Experience Platform Assurance](foundation-extensions/adobe-experience-platform-assurance/README.md)
-  * [Migrating to AEPAssurance(3.x) reference](foundation-extensions/adobe-experience-platform-assurance/migration.md)
+  * [Migrating to AEPAssurance\(3.x\) reference](foundation-extensions/adobe-experience-platform-assurance/migration.md)
   * [Release Notes](foundation-extensions/adobe-experience-platform-assurance/adobe-experience-platform-assurance-release-notes.md)
   * [Assurance API reference](foundation-extensions/adobe-experience-platform-assurance/assurance-api-reference.md)
   * [Resolving Common Issues](foundation-extensions/adobe-experience-platform-assurance/assurance-sdk-error-logs.md)
 * [Adobe Experience Platform Places Service](foundation-extensions/places/README.md)
   * [Migrating to AEPPlaces reference](foundation-extensions/places/migration.md)
   * [Places API reference](foundation-extensions/places/places-usage-reference.md)
-  * [ACPPlaces (iOS) reference](foundation-extensions/places/adobe-places.md)
+  * [ACPPlaces \(iOS\) reference](foundation-extensions/places/adobe-places.md)
 * [Profile](foundation-extensions/profile/README.md)
   * [Migrating to AEPUserProfile](foundation-extensions/profile/acpuserprofile-aepuserprofile.md)
   * [Release Notes](foundation-extensions/profile/profile-release-notes.md)
@@ -113,7 +121,7 @@
   * [Migrating to AEPTarget reference](using-mobile-extensions/adobe-target/migration.md)
   * [Release Notes](using-mobile-extensions/adobe-target/adobe-target-release-notes.md)
   * [Target API reference](using-mobile-extensions/adobe-target/target-api-reference.md)
-  * [Target API reference (deprecated in 2.x)](using-mobile-extensions/adobe-target/target-api-reference-deprecated.md)
+  * [Target API reference \(deprecated in 2.x\)](using-mobile-extensions/adobe-target/target-api-reference-deprecated.md)
   * [Target event reference](using-mobile-extensions/adobe-target/target-event-reference.md)
 * [Adobe Experience Platform Offer Decisioning](using-mobile-extensions/offer-decisioning/README.md)
   * [API Reference](using-mobile-extensions/offer-decisioning/api-reference.md)

adobe-experience-cloud-and-apples-idfa-announcement.md

@@ -9,22 +9,22 @@ description: 'Last Updated September 2, 2020'
 Apple recently announced [new changes](https://developer.apple.com/app-store/user-privacy-and-data-use/) to iOS 14, which are scheduled to take effect later in 2020/2021. Among the highlights of the changes:
 
 1. Apple will ask app developers to self-report data types collected and how they may be used by the brand. 
-2. Beginning iOS 14, apps will need to ask & receive user’s permission to be tracked (specifically referring to accessing the device’s advertising identifier or IDFA). 
+2. Beginning iOS 14, apps will need to ask & receive user’s permission to be tracked \(specifically referring to accessing the device’s advertising identifier or IDFA\). 
 3. Apple is introducing a new variant of device location signal labelled “reduced” or “Approximate Location”.
 
 ## Next Steps & Industry Reaction
 
 Apple continues to release new details regarding these changes, and fuller business, legal, and technical impact assessments will follow accordingly. On the legal and technical sides, these changes raise questions as to how to best effectuate consumer rights and choices under laws like GDPR, CCPA, and the like.
 
-In terms of early reactions, the US ad trades are still evaluating and further preparing responses. [The Association of National Advertisers (ANA)](https://www.ana.net/content/show/id/60948) expressed concerns about the impact these changes would have on personalization, measurement and marketing communications, underscoring the importance of having a coordinated ecosystem wide solution not determined by a single company.
+In terms of early reactions, the US ad trades are still evaluating and further preparing responses. [The Association of National Advertisers \(ANA\)](https://www.ana.net/content/show/id/60948) expressed concerns about the impact these changes would have on personalization, measurement and marketing communications, underscoring the importance of having a coordinated ecosystem wide solution not determined by a single company.
 
 IAB Europe released a [letter to Tim Cook](https://iabeurope.eu/all-news/marketing-professionals-urge-apple-to-adopt-standards-promoting-interoperability-and-more-predictable-user-privacy/) on July 2,
 
 > Marketing professionals urge Apple to adopt standards promoting interoperability and more predictable user privacy
 
 along with concerns about developers’ abilities to continue to meet their legal obligations under the announced guidelines.
 
-Given that these developments are taking place against the backdrop of broader changes to addressable communications in the wider ecosystem (e.g., browser changes) Adobe is engaged in the appropriate policy and technical forums to work on these important issues.
+Given that these developments are taking place against the backdrop of broader changes to addressable communications in the wider ecosystem \(e.g., browser changes\) Adobe is engaged in the appropriate policy and technical forums to work on these important issues.
 
 Adobe is proud to join the Partnership for Responsible Addressable Media as a founding member. We support the partnership’s principles and objectives to develop common standards, technologies, and practices for addressability. This cross-industry approach is critical to building consumer trust, powering exceptional digital experiences designed to delight consumers, and driving innovation that supports continued growth of the digital economy in a responsible and transparent way.
 
@@ -48,7 +48,7 @@ Audience Manager will continue to enable customers to collect, and store data us
 
 ### Adobe Advertising Cloud
 
-Advertising Cloud will enable its customers to continue to deliver digital advertising campaigns on app inventory against targeted audiences provided by customers (via standard data onboarding processes). Customers should work with their data providers to only include user IDs they deem appropriate (e.g. opted-in IDFAs) in any segments that are provided to Advertising Cloud for purposes such as targeting, frequency capping, and measurement, etc.
+Advertising Cloud will enable its customers to continue to deliver digital advertising campaigns on app inventory against targeted audiences provided by customers \(via standard data onboarding processes\). Customers should work with their data providers to only include user IDs they deem appropriate \(e.g. opted-in IDFAs\) in any segments that are provided to Advertising Cloud for purposes such as targeting, frequency capping, and measurement, etc.
 
 Please contact your Adobe Customer Success Manager or account representatives for further detail.