refresh from main, fix merge conflict in updates doc

Author: genwhittTTD

docs/guides/integration-prebid.md

@@ -28,7 +28,7 @@ UID2 provides a Prebid.js module that supports the following:
 For additional flexibility, UID2 also provides alternative methods for some of the features and complementary products, such as a JavaScript SDK.
 
 :::caution
-UID2 is not designed to be used where GDPR applies. The module checks the consent data that's passed in, and does not operate if the `gdprApplies` flag is set to `true`.
+UID2 is not designed to be used where <Link href="../ref-info/glossary-uid#gl-gdpr">GDPR</Link> applies. The module checks the consent data that's passed in, and does not operate if the `gdprApplies` flag is set to `true`.
 :::
 
 <!-- GDPR statement difference for UID2/EUID | UID2 is not designed to be used where GDPR applies | EUID is designed to be used only where GDPR applies. -->

docs/ref-info/glossary-uid.md

@@ -51,6 +51,9 @@ import Link from '@docusaurus/Link';
 **F**
 <a href="#gl-first-level-hash">First-level hash</a> 
 
+**G**
+<a href="#gl-gdpr">GDPR</a>
+
 **H**
 <a href="#gl-hash">Hash</a> 
 
@@ -261,6 +264,15 @@ import Link from '@docusaurus/Link';
 
 </dl>
 
+### G
+
+<dl>
+
+<dt><MdxJumpAnchor id="gl-gdpr"><a href="#gl-gdpr">GDPR</a></MdxJumpAnchor></dt>
+<dd>The GDPR, or General Data Protection Regulation, is a European privacy and security law that regulates how organizations target or collect data related to residents of the European Union.</dd>
+
+</dl>
+
 ### H
 
 <dl>

docs/ref-info/updates-doc.md

@@ -21,6 +21,18 @@ For details, see [Snowflake Integration Guide](../guides/integration-snowflake.m
 
 <!-- APIDOCS-2918 -->
 
+### Updated: Instructions for Using the UID2 Portal
+
+February 10, 2025
+
+We've updated the instructions in the UID2 integration guides, SDK docs, and endpoint docs to include information about account setup in the UID2 Portal.
+
+For details, see any implementation guide: for example, [Client-Side Integration Guide for JavaScript](../guides/integration-javascript-client-side.md#complete-uid2-account-setup-and-configure-account) or [SDK for Android Reference Guide](../sdks/sdk-ref-android.md#api-permissions). 
+
+These changes also clarify the different procedures for getting credentials depending on the environment: see expanded information on the [Credentials](../getting-started/gs-credentials.md) and [Environments](../getting-started/gs-environments.md) pages.
+
+<!-- APIDOCS-2828 -->
+
 ### New: Expanded and Restructured Advertiser/Data Provider Doc
 
 January 10, 2025