Merge branch 'prebid:master' into master

.github/workflows/ci.yml

@@ -18,14 +18,14 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: tj-actions/changed-files@v37
+      - uses: tj-actions/changed-files@v41
         id: changed-files
         with:
           files: '**/*.md'
           separator: ","
-      - uses: DavidAnson/markdownlint-cli2-action@v11
+      - uses: DavidAnson/markdownlint-cli2-action@v15
         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'

.gitignore

@@ -13,6 +13,7 @@ Gemfile.lock
 
 # Files generated by `npm install`
 node_modules/
+!_sass/node_modules
 /.vs/prebid.github.io/v17/.suo
 /.vs/slnx.sqlite
 /.vs

.markdownlint.json

@@ -1,5 +1,6 @@
 {
     "default": true,
+    "MD009": false,
     "MD013": false,
     "MD022": false,
     "MD024": false,

README.md

@@ -41,11 +41,11 @@ The site is hosted on GitHub pages, and uses [Jekyll](https://jekyllrb.com/) to
 1. gem install github-pages
 1. start Jekyll as described below
 
-For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
+For CSS, the site uses Jekyll board tools to compile SCSS down to CSS.
 
-1. follow the instructions at [/nodejs.dev](https://nodejs.dev) to install Node.js for your OS
-1. `npm ci` to install packages for building assets
-1. build assets as described below
+1. Install `boostrap` via `npm install` to make the build work
+1. [Jekyll assets management](https://jekyllrb.com/docs/assets/)
+1. [Jekyll SASS plugin](https://jekyllrb.com/docs/configuration/sass/)
 
 The markdown files are linted via [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli). VSCode supports the [.markdownlintignore](.markdownlintignore) file.
 You may need to configure the disabled rules specified in [.markdownlint.json](.markdownlint.json) directly in your project settings. You can invoke linting in CLI via

_config.yml

@@ -87,7 +87,8 @@ collections:
 
 port: 8080
 
-exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js', 'find-ungrouped-bidders.sh' ]
+exclude: ['README.md', 'LICENSE', 'Gemfile.lock', 'Gemfile', 'vendor', 'find-ungrouped-bidders.sh' ]
+include: ['node_modules']
 
 keep_files:
   - assets/css/main-bundle.css

_data/sidebar.yml

@@ -50,6 +50,14 @@
   isSectionHeader: 0
   subgroup: 0
 
+- sbSecId: 0
+  title: Glossary
+  link: /overview/glossary.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
 - sbSecId: 0
   title: Codes of Conduct
   link:
@@ -122,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
@@ -264,7 +258,7 @@
   subgroup: 1
 
 - sbSecId: 1
-  title: Using Prebid.js with AppNexus Publisher Ad Server
+  title: Using Prebid.js with Microsoft Monetize Ad Server
   link: /dev-docs/examples/use-prebid-with-appnexus-ad-server.html
   isHeader: 0
   isSectionHeader: 0
@@ -372,6 +366,14 @@
   sectionTitle:
   subgroup: 3
 
+- sbSecId: 1
+  title: Internal API Reference
+  link: /dev-docs/internal-api-reference.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 3
+
 - sbSecId: 1
   title: Ad Unit Reference
   link: /dev-docs/adunit-reference.html
@@ -791,7 +793,7 @@
 
 - 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:
@@ -872,7 +874,7 @@
 
 - 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:
@@ -886,6 +888,14 @@
   sectionTitle:
   subgroup: 3
 
+- sbSecId: 2
+  title: Prebid Plugin Renderer
+  link: /prebid-mobile/pbm-api/android/pbm-plugin-renderer.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 3
+
 #--------------Ad Ops--------------|
 
 - sbSecId: 3
@@ -1090,7 +1100,7 @@
   subgroup: 2
 
 - sbSecId: 3
-  title: "AppNexus Publisher"
+  title: "Microsoft Monetize Publisher"
   link:
   isHeader: 0
   isSectionHeader: 0
@@ -1330,6 +1340,14 @@
   sectionTitle:
   subgroup: 0
 
+- sbSecId: 5
+  title: 'PBS+Digital Out Of Home'
+  link: /prebid-server/use-cases/pbs-dooh.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
 - sbSecId: 5
   title: 'Hosting Your Own PBS'
   link: /prebid-server/hosting/pbs-hosting.html
@@ -1714,7 +1732,7 @@
 
 - sbSecId: 6
   title: Video
-  link: /prebid-video/video-overview.html
+  link: /formats/video.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1783,12 +1801,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 and MSPA
+  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
@@ -1843,15 +1883,6 @@
   sectionTitle:
   subgroup: 0
 
-- sbSecId: 8
-  title: Dr. Prebid Validation App
-  link: /prebid-mobile/dr-prebid.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 0
-
-
  #-------------- Prebid Identity --------------|
 
 - sbSecId: 9

_includes/code/mobile-sdk.html

@@ -0,0 +1,17 @@
+
+<ul class="nav nav-tabs" role="tablist">
+  <li class="nav-item ui-tab" role="presentation">
+    <button class="nav-link active" id="{{ include.id }}-kotlin-tab" data-toggle="tab" data-target="#{{ include.id }}-kotlin" type="button" role="tab" aria-controls="kotlin" aria-selected="true">Kotlin</button>
+  </li>
+  <li class="nav-item ui-tab" role="presentation">
+    <button class="nav-link" id="{{ include.id }}swift-tab" data-toggle="tab" data-target="#{{ include.id }}-swift" type="button" role="tab" aria-controls="swift" aria-selected="false">Swift</button>
+  </li>
+</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">
+    {{ include.kotlin | markdownify }}
+  </div>
+  <div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
+    {{ include.swift | markdownify }}
+  </div>
+</div>