Upstream

.gitignore

@@ -9,3 +9,6 @@ Gemfile.lock
 .jekyll-metadata
 *ads.txt.bkp*
 .sass-cache
+
+# Files generated by `npm install`
+node_modules/

Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'github-pages', '>= 30'
+gem 'github-pages', '>= 30'

README.md

@@ -42,7 +42,7 @@ The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](ht
 For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
 
 1. follow the instructions at https://nodejs.dev to install Node.js for your OS
-1. `npm install` to install packages for building assets
+1. `npm ci` to install packages for building assets
 1. build assets as described below
 
 <a name="running-jekyll-locally" />

_assets/sass/components/_autocomplete-filter.scss

@@ -0,0 +1,12 @@
+.pb-content {
+  .autocomplete-filter {
+    padding: 10px 15px;
+    border: 1px solid #b3c1cc;
+    background-color: rgba(236, 243, 245, 0.35);
+
+    &:focus {
+      outline: none;
+    }
+  }
+}
+

_assets/sass/components/_bidder-list.scss

@@ -1,14 +1,4 @@
 .pb-content {
-  .bidder-filter {
-    padding: 10px 15px;
-    border: 1px solid #b3c1cc;
-    background-color: rgba(236, 243, 245, 0.35);
-
-    &:focus {
-      outline: none;
-    }
-  }
-
   .c-bidder-list-group {
     h4 {
       color: #797f90;

_assets/sass/main.scss

@@ -34,6 +34,7 @@
 @import 'components/social-media';
 @import 'components/table';
 @import 'components/download-form';
+@import 'components/autocomplete-filter';
 @import 'components/bidder-list';
 @import 'components/search';
 

_data/dropdown_v2.yml

@@ -349,7 +349,7 @@
     sectionId: 4
     sectionName: Resources
     title: Prebid.org
-    link:  http://www.prebid.org
+    link:  https://www.prebid.org
     needsDivider: 1
     isHeader: 0
     isSubSectionStart: 1
@@ -358,7 +358,7 @@
     sectionId: 4
     sectionName: Resources
     title: Blog
-    link:  http://www.prebid.org/blog
+    link:  https://www.prebid.org/blog
     needsDivider: 0
     isHeader: 0
     isSubSectionStart: 1

_data/sidebar.yml

@@ -180,7 +180,7 @@
 
 - sbSecId: 1
   title: Native Ads
-  link: /dev-docs/examples/native-ad-example.html
+  link: /formats/native.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -234,6 +234,15 @@
   isSectionHeader: 0
   sectionTitle:
   subgroup: 1
+
+- sbSecId: 1
+  title: Meta Bid Filtering
+  link: /dev-docs/examples/meta-bid-filtering.html
+  Item: 1
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 1
 
 - sbSecId: 1
   title: Troubleshooting
@@ -1326,21 +1335,13 @@
   subgroup: 1
 
 - sbSecId: 4
-  title: 'JW Player (Hosted)'
+  title: 'JW Player (Self-Hosted)'
   link: /examples/video/instream/jwplayer/pb-ve-jwplayer-hosted.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 1
 
-- sbSecId: 4
-  title: 'JW Player (Playlist)'
-  link: /examples/video/instream/jwplayer/pb-ve-jwplayer-playlist.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 1
-
 - sbSecId: 4
   title: 'Kaltura'
   link: /examples/video/instream/kaltura/pb-ve-kaltura.html
@@ -1399,29 +1400,13 @@
   subgroup: 1
 
 - sbSecId: 4
-  title: 'JW Player (Hosted)'
+  title: 'JW Player (Self-Hosted)'
   link: /examples/video/server/jwplayer/pbs-ve-jwplayer-hosted.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 1
 
-- sbSecId: 4
-  title: 'JW Player (Playlist)'
-  link: /examples/video/server/jwplayer/pbs-ve-jwplayer-playlist.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 1
-
-- sbSecId: 4
-  title: 'JW Player (Player 7)'
-  link: /examples/video/server/jwplayer/pbs-ve-jwplayer-jwplayer7.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 1
-
 - sbSecId: 4
   title: 'Kaltura'
   link: /examples/video/server/kaltura/pbs-ve-kaltura.html
@@ -1737,6 +1722,14 @@
   sectionTitle:
   subgroup: 3
 
+- sbSecId: 5
+  title: Programmatic Guaranteed
+  link: /prebid-server/features/pg/pbs-pg-idx.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 3
+
 - sbSecId: 5
   title: Developers
   link:
@@ -1934,7 +1927,7 @@
 
 - sbSecId: 6
   title: Native
-  link: /dev-docs/show-native-ads.html
+  link: /prebid/native-implementation.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -2046,3 +2039,41 @@
   isSectionHeader: 0
   sectionTitle:
   subgroup: 0
+
+#-------------- Prebid Identity --------------|
+
+- sbSecId: 9
+  title:
+  link:
+  isHeader: 0
+  isSectionHeader: 1
+  sectionTitle: Prebid Identity
+  sectionId: prebid-identity
+  subgroup: 1000
+  sbCollapseId: prebid-identity
+
+- sbSecId: 9
+  title: invis
+  link:
+  isHeader: 1
+  headerId: invis
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
+- sbSecId: 9
+  title: Identity Overview
+  link: /identity/prebid-identity.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
+- sbSecId: 9
+  title: SharedID
+  link: /identity/sharedid.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+

_includes/adops/adops-gam-video-setup.html

@@ -29,7 +29,7 @@ <h2 id="line-item-setup">Line Item Setup</h2>
   <li>In the <b>New line item</b> dialog, choose "Video".</li>
   <li>Select the appropriate Line Item Type, etc.</li>
   <li>In the <b>Expected creatives</b> section, choose your video size, e.g., 640x480v.</li>
-  <li>Set the dates, rate, limit, and targeting as desired. For example, for <a href="/dev-docs/publisher-api-reference.html#setConfig-Send-All-Bids">SendAllBids</a> include targeting for "hb_bidder_rubicon=rubicon" as well as the hb_pb_rubicon targeting. This isn't needed if only creating one set of orders for all bidders.</li>
+  <li>Set the dates, rate, limit, and targeting as desired. For example, for <a href="/dev-docs/publisher-api-reference/setConfig.html#setConfig-Send-All-Bids">SendAllBids</a> include targeting for "hb_bidder_rubicon=rubicon" as well as the hb_pb_rubicon targeting. This isn't needed if only creating one set of orders for all bidders.</li>
   <li>Remember to set the hb_pb=BUCKET targeting for each line item, or hb_pb_BIDDER=BUCKET if using separate line items for each bidder.</li>
   <li>Save the line item.</li>
 </ol>
@@ -39,16 +39,11 @@ <h2 id="line-item-setup">Line Item Setup</h2>
 <h2 id="creative-setup">Creative Setup</h2>
 
 When setting up video creatives, it's important to understand where the VAST XML is stored for each of your bidders. The most common place to store VAST XML is AppNexus' cache, but some bidders (such as RubiconProject and SpotX) use their own cache services. To support such
-bidders, you will need to choose one of the following approaches:
-<ul>
-<li>Create a separate line item for each bidder.</li>
-<li>Include a creative for each cache service utilized by your implementation.</li>
-<li>Use the <a href="/dev-docs/publisher-api-reference.html#setConfig-vast-cache">ignoreBidderCacheKey</a> option on setConfig({cache}).</li>
-</ul>
+bidders, see the <a href="#multiple_cache_locations">Multiple Cache Locations</a> instructions below.
 
 <h3 id="creative-single-cache">Single Cache Location</h3>
 
-If you only use bidders that provide full VAST responses, no special setup is needed. Otherwise, do the following:
+If you only use bidders that provide full VAST responses, do the following:
 
 <p>1. For each line item you create, click on the <b>Creatives</b> tab, click the <b>ADD CREATIVE</b> button, and choose the size you're entering.</p>
 
@@ -75,18 +70,21 @@ <h3 id="creative-single-cache">Single Cache Location</h3>
    URL failed. This is expected, since the creative URL above points
    to a server-side asset cache hosted by Prebid Server.</p>
 
-<p>4. Set the <b>Duration</b> to <b>1</b>.</p>
+<p>4. Set the <b>Duration</b> to the max length of video ads you serve. If you don't know what the max length is, set it to <b>30</b>.</p>
+
+<p class="alert alert-warning">In the past Prebid used to recommend setting duration to 0 or 1, but GAM now requires that this field reflect the actual video ad length. Since ads flowing through header bidding are going to differ in length, choose a value that matches a common ad length like 15 or 30.</p>
 
 <p>The resulting creative should look something like the following:</p>
 
 <p><img src="/assets/images/ad-ops/dfp-creative-setup/appnexus_vast_tag.png" alt="Google Ad Manager Video Creative Setup"/></p>
 
+<a name="multiple_cache_locations">
 <h3 id="creative-multiple-cache">Multiple Cache Locations</h3>
 
 If you're utilizing any bidders that cache their own VAST, you have two options:
 
 <ul>
-<li>If you're using Prebid.js 4.28 or later, you can specify the <a href="/dev-docs/publisher-api-reference.html#setConfig-vast-cache">ignoreBidderCacheKey</a> option on setConfig({cache}). This will cause the browser to generate a VAST wrapper and cache it in your standard location. Then you can use the instructions
+<li>If you're using Prebid.js 4.28 or later, you can specify the <a href="/dev-docs/publisher-api-reference/setConfig.html#setConfig-vast-cache">ignoreBidderCacheKey</a> option on setConfig({cache}). This will cause the browser to generate a VAST wrapper and cache it in your standard location. Then you can use the instructions
 above for "Single Cache Location". The tradeoff is that this approach requires
 the video player to unwrap one extra level of VAST.</li>
 <li>Utilize creative-level targeting in the ad server. Keep reading for more details.</li>