Merge branch 'prebid:master' into master

NativoPlatform · Aug 16, 2024 · f7f772c · f7f772c
2 parents 89032da + df82a56
commit f7f772c
Show file tree

Hide file tree

Showing 471 changed files with 16,424 additions and 8,754 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,17 +15,17 @@ jobs:
     name: run markdownlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: tj-actions/changed-files@v37
+      - uses: tj-actions/changed-files@v44
         id: changed-files
         with:
           files: '**/*.md'
           separator: ","
-      - uses: DavidAnson/markdownlint-cli2-action@v13
+      - uses: DavidAnson/markdownlint-cli2-action@v16
         if: steps.changed-files.outputs.any_changed == 'true'
         with:
-          globs: ${{ steps.changed-files.outputs.all_changed_files }}
+          globs: "${{ steps.changed-files.outputs.all_changed_files }},!_includes"
           separator: ","
           config: '.markdownlint.json'
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -1,5 +1,6 @@
 {
     "default": true,
+    "MD009": false,
     "MD013": false,
     "MD022": false,
     "MD024": false,

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gem 'github-pages', '>= 228'
-
+gem 'ffi', '1.16.3'
 gem "webrick", "~> 1.7"
diff --git a/_data/dropdown_v2.yml b/_data/dropdown_v2.yml
@@ -61,8 +61,8 @@
   - subsectionId: 0
     sectionId: 1
     sectionName: Product
-    title: Analytics
-    link: /overview/analytics.html
+    title: Modules
+    link: /dev-docs/modules/index.html
     needsDivider: 0
     isHeader: 0
     isSubHeader: 0
@@ -71,8 +71,8 @@
   - subsectionId: 0
     sectionId: 1
     sectionName: Product
-    title: Modules
-    link: /dev-docs/modules/index.html
+    title: Publisher API
+    link: /dev-docs/publisher-api-reference.html
     needsDivider: 0
     isHeader: 0
     isSubHeader: 0
@@ -81,8 +81,8 @@
   - subsectionId: 0
     sectionId: 1
     sectionName: Product
-    title: Publisher API
-    link: /dev-docs/publisher-api-reference.html
+    title: Bidder Params
+    link: /dev-docs/bidders.html
     needsDivider: 0
     isHeader: 0
     isSubHeader: 0
@@ -91,8 +91,8 @@
   - subsectionId: 0
     sectionId: 1
     sectionName: Product
-    title: Bidder Params
-    link: /dev-docs/bidders.html
+    title: Analytics
+    link: /overview/analytics.html
     needsDivider: 0
     isHeader: 0
     isSubHeader: 0
@@ -244,15 +244,6 @@
     isHeader: 0
     isSubSectionStart: 0
 
-  - subsectionId: 2
-    sectionId: 2
-    sectionName: Support
-    title: Training Videos
-    link: /videos/index.html
-    needsDivider: 0
-    isHeader: 0
-    isSubSectionStart: 0
-
   - subsectionId: 2
     sectionId: 2
     sectionName: Support
@@ -285,6 +276,15 @@
     sectionName: Support
     title: Prebid Server
     link: /faq/prebid-server-faq.html
+    needsDivider: 0
+    isHeader: 0
+    isSubSectionStart: 0
+
+  - subsectionId: 3
+    sectionId: 2
+    sectionName: Support
+    title: Prebid Mobile
+    link: /faq/prebid-mobile-faq.html
     needsDivider: 1
     isHeader: 0
     isSubSectionStart: 0

diff --git a/_data/partners.yml b/_data/partners.yml
@@ -173,11 +173,6 @@
   imgURL: /assets/images/partners/community/Adform-Logo.png
   type: community
 
-- company: Adomik
-  link: https://adomik.com/
-  imgURL: /assets/images/partners/community/Adomik-logo.png
-  type: community
-
 - company: Adtelligent
   link: https://adtelligent.com/
   type: community

diff --git a/_data/sidebar.yml b/_data/sidebar.yml
@@ -130,20 +130,6 @@
   isSectionHeader: 0
   subgroup: 2
 
-- sbSecId: 0
-  title: Prebid and MSPA
-  link: /features/mspa-usnat.html
-  isHeader: 0
-  isSectionHeader: 0
-  subgroup: 2
-
-- sbSecId: 0
-  title: Prebid and Quebec Privacy Support
-  link: /features/ac-quebec.html
-  isHeader: 0
-  isSectionHeader: 0
-  subgroup: 2
-
 #--------------Prebid.js--------------|
 
 - sbSecId: 1
@@ -198,6 +184,14 @@
   sectionTitle:
   subgroup: 0
 
+- sbSecId: 1
+  title: Analytics For Prebid
+  link: /overview/analytics.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
 - sbSecId: 1
   title: Consent Management Best Practices
   link: /dev-docs/cmp-best-practices.html
@@ -263,14 +257,6 @@
   sectionTitle:
   subgroup: 1
 
-- sbSecId: 1
-  title: Legacy Browser Example
-  link: /dev-docs/examples/legacy-browser-example.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 1
-
 - sbSecId: 1
   title: Using Prebid.js with Microsoft Monetize Ad Server
   link: /dev-docs/examples/use-prebid-with-appnexus-ad-server.html
@@ -521,31 +507,6 @@
   sectionTitle:
   subgroup: 6
 
-- sbSecId: 1
-  title: Analytics
-  link:
-  isHeader: 1
-  headerId: analytics
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 7
-
-- sbSecId: 1
-  title: Analytics For Prebid
-  link: /overview/analytics.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 7
-
-- sbSecId: 1
-  title: Prebid Analytics for GA
-  link: /overview/ga-analytics.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 7
-
 - sbSecId: 1
   title: Features
   link:
@@ -757,6 +718,14 @@
   sectionTitle:
   subgroup: 2
 
+- sbSecId: 2
+  title: Global Parameters
+  link: /prebid-mobile/pbm-api/ios/pbm-targeting-ios.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 2
+
 - sbSecId: 2
   title: GAM Original Integration
   link: /prebid-mobile/pbm-api/ios/ios-sdk-integration-gam-original-api.html
@@ -797,17 +766,9 @@
   sectionTitle:
   subgroup: 2
 
-- sbSecId: 2
-  title: Targeting Parameters
-  link: /prebid-mobile/pbm-api/ios/pbm-targeting-ios.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 2
-
 - sbSecId: 2
   title: Ad Experience Controls
-  link: /prebid-mobile/modules/rendering/ios-sdk-customization-controls.html
+  link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -838,6 +799,14 @@
   sectionTitle:
   subgroup: 3
 
+- sbSecId: 2
+  title: Global Parameters
+  link: /prebid-mobile/pbm-api/android/pbm-targeting-params-android.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 3
+
 - sbSecId: 2
   title: GAM Original Integration
   link: /prebid-mobile/pbm-api/android/android-sdk-integration-gam-original-api.html
@@ -878,17 +847,9 @@
   sectionTitle:
   subgroup: 3
 
-- sbSecId: 2
-  title: Targeting Parameters
-  link: /prebid-mobile/pbm-api/android/pbm-targeting-params-android.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 3
-
 - sbSecId: 2
   title: Ad Experience Controls
-  link: /prebid-mobile/modules/rendering/android-sdk-customization-controls.html
+  link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1056,6 +1017,14 @@
   sectionTitle:
   subgroup: 2
 
+- sbSecId: 3
+  title: 'Header Bidding Trafficking Setup'
+  link: /adops/gam-hbt-step-by-step.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 2
+
 - sbSecId: 3
   title: 'Line Item Setup'
   link: /adops/step-by-step.html
@@ -1260,13 +1229,6 @@
   sectionTitle:
   subgroup: 0
 
-- sbSecId: 4
-  title: Training Videos
-  link: /videos/prebid-video.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 0
 
 - sbSecId: 4
   title: Prebid.js Video Module
@@ -1517,16 +1479,16 @@
   subgroup: 3
 
 - sbSecId: 5
-  title: Programmatic Guaranteed
-  link: /prebid-server/features/pg/pbs-pg-idx.html
+  title: Modules
+  link: /prebid-server/pbs-modules/
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 3
 
 - sbSecId: 5
-  title: Modules
-  link: /prebid-server/pbs-modules/
+  title: Prebid Cache Storage
+  link: /prebid-server/features/pbs-pbc-storage.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1746,7 +1708,7 @@
 
 - sbSecId: 6
   title: Video
-  link: /prebid-video/video-overview.html
+  link: /formats/video.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1815,12 +1777,34 @@
   subgroup: 0
 
 - sbSecId: 7
-  title: Training Videos
-  link: /videos/
-  isHeader: 0
+  title: Privacy Resources
+  link:
+  isHeader: 1
+  headerId: privacy
   isSectionHeader: 0
   sectionTitle:
-  subgroup: 0
+  subgroup: 1
+
+- sbSecId: 7
+  title: Prebid Privacy Overview
+  link: /support/privacy-resources.html
+  isHeader: 0
+  isSectionHeader: 0
+  subgroup: 1
+
+- sbSecId: 7
+  title: Prebid US Compliance
+  link: /features/mspa-usnat.html
+  isHeader: 0
+  isSectionHeader: 0
+  subgroup: 1
+
+- sbSecId: 7
+  title: Prebid and Quebec Privacy Support
+  link: /features/ac-quebec.html
+  isHeader: 0
+  isSectionHeader: 0
+  subgroup: 1
 
 - sbSecId: 7
   title: FAQs

diff --git a/_includes/code/mobile-sdk.html b/_includes/code/mobile-sdk.html
@@ -9,9 +9,9 @@
 </ul>
 <div class="tab-content" id="code-tab-content">
   <div class="tab-pane fade show active" id="{{ include.id }}-kotlin" role="tabpanel" aria-labelledby="{{ include.id }}-kotlin-tab">
-    <pre><code class="language-kotlin">{{ include.kotlin }}</code></pre>
+    {{ include.kotlin | markdownify }}
   </div>
   <div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
-    <pre><code class="language-swift">{{ include.swift }}</code></pre>
+    {{ include.swift | markdownify }}
   </div>
 </div>