Merge branch 'master' of https://github.com/prebid/prebid.github.io i…

…nto master

_assets/sass/base/_base.scss

@@ -1,3 +1,9 @@
 img {
   max-width: 100%;
 }
+
+div {
+  min-width: 0;
+}
+
+

_assets/sass/components/_pb.scss

@@ -99,6 +99,10 @@
     }
   }
 
+  .pb-code-hl-wrap {
+    width: 100%;
+  }
+
   .highlight, .pb-code-hl {
     margin-top: 20px;
     margin-bottom: 20px;

_data/partners.yml

@@ -2,33 +2,33 @@
   link: https://www.indexexchange.com/
   imgURL: /assets/images/partners/leader/IX-logo.png
   type: leader
-  
+
 - company: Magnite
   link: https://www.magnite.com/
   imgURL: /assets/images/partners/leader/Magnite_logo.png
   type: leader
-  
-- company: MediaMath 
+
+- company: MediaMath
   link: https://www.mediamath.com/
   imgURL: /assets/images/partners/leader/MediaMath-wordmark.png
   type: leader
-  
-- company: OpenX 
+
+- company: OpenX
   link: https://www.openx.com/
   imgURL: /assets/images/partners/leader/openx.png
   type: leader
-  
-- company: Pubmatic 
+
+- company: Pubmatic
   link: https://pubmatic.com/products/header-bidding/
   imgURL: /assets/images/partners/leader/pubmatic.png
   type: leader
 
-- company: SpotX 
+- company: SpotX
   link: https://spotx.tv
   imgURL: /assets/images/partners/leader/spotx_logo.png
   type: leader
 
-- company: theTradeDesk 
+- company: theTradeDesk
   link: https://www.thetradedesk.com/
   imgURL: /assets/images/partners/leader/TTD_logo.png
   type: leader
@@ -37,38 +37,38 @@
   link: https://www.xandr.com/platform/
   imgURL: /assets/images/partners/founders/xandr.png
   type: leader
-  
+
 - company: Beachfront Media
   link: https://www.beachfront.com/
   imgURL: /assets/images/partners/tech/beachfront_logo.png
   type: technology
-  
-- company: Conversant 
+
+- company: Conversant
   link: https://www.conversantmedia.com/
   imgURL: /assets/images/partners/tech/conversant_logo.png
   type: technology
-  
-- company: Criteo 
+
+- company: Criteo
   link: https://www.criteo.com/for-publishers/products/criteo-direct-bidder/
   imgURL: /assets/images/partners/tech/criteo.png
   type: technology
-  
-- company: Datablocks 
+
+- company: Datablocks
   link: https://datablocks.net/
   imgURL: /assets/images/partners/tech/datablocks_logo.png
   type: technology
-  
-- company: LiveRamp 
+
+- company: LiveRamp
   link: https://liveramp.com/
   imgURL: /assets/images/partners/tech/LiveRamp-Logo.png
   type: technology
-  
-- company: Marfeel 
+
+- company: Marfeel
   link: https://www.marfeel.com/
   imgURL: /assets/images/partners/tech/marfeel.png
   type: technology
-  
-- company: PubNative 
+
+- company: PubNative
   link: https://pubnative.net/
   imgURL: /assets/images/partners/tech/Pubnative-RGB-Logo.png
   type: technology
@@ -78,27 +78,27 @@
   imgURL: /assets/images/partners/tech/rakuten_logo.png
   type: technology
 
-- company: StreamAMP 
+- company: StreamAMP
   link: https://streamamp.com/
   imgURL: /assets/images/partners/tech/StreamAMP_logo.png
   type: technology
 
-- company: Tapad 
+- company: Tapad
   link: https://tapad.com/
   imgURL: /assets/images/partners/tech/tapad_logo.png
   type: technology
 
-- company: Verizon Media 
+- company: Verizon Media
   link: https://www.verizonmedia.com/advertising
   imgURL: /assets/images/partners/tech/verizon_logo.png
   type: technology
-  
-- company: Advance Local Media 
+
+- company: Advance Local Media
   link: https://advancelocal.com
   imgURL: /assets/images/partners/publisher/advancelocal_logo.png
   type: publisher
 
-- company: CafeMedia 
+- company: CafeMedia
   link: https://www.cafemedia.com/
   imgURL: /assets/images/partners/publisher/cafemedia.png
   type: publisher
@@ -107,28 +107,28 @@
   link: https://www.chegg.com/
   imgURL: /assets/images/partners/publisher/chegg.png
   type: publisher
-  
+
 - company: diDNA
   link: https://didna.io/
   imgURL: /assets/images/partners/publisher/didna-logo.png
   type: publisher
-  
+
 - company: Freestar
   link: https://freestar.com/
   imgURL: /assets/images/partners/publisher/freestar-logo.png
   type: publisher
-  
+
 - company: Glewed TV
   link: https://www.glewed.tv/
   imgURL: /assets/images/partners/publisher/glewed_logo.png
   type: publisher
-  
+
 - company: Hive Media
   link: https://www.hivemedia.com
   imgURL: /assets/images/partners/publisher/Hive-Media-Group-Stacked-Color-web.png
   type: publisher
-  
-- company: Insider, Inc. 
+
+- company: Insider, Inc.
   link: https://www.insider-inc.com/
   imgURL: /assets/images/partners/publisher/Insider_Inc_logo.png
   type: publisher
@@ -163,12 +163,7 @@
   imgURL: /assets/images/partners/publisher/SHE_Media_Logo.png
   type: publisher
 
-- company: Sortable 
-  link: https://www.sortable.com/
-  imgURL: /assets/images/partners/publisher/sortable.png
-  type: publisher
-
-- company: Havas 
+- company: Havas
   link: https://havasmedia.com/
   imgURL: /assets/images/partners/buyer/Havas_Media_Logo.png
   type: buyer

dev-docs/add-rtd-submodule.md

@@ -176,17 +176,34 @@ submodule('realTimeData', subModuleObj);
 This is the function that will allow RTD sub-modules to modify the AdUnit object for each auction. It's called as part of the requestBids hook.
 
 1. RTD-core will call this function with:
-    - reqBidsConfigObj: the object that's passed to [`pbjs.requestBids`](). Note that several auctions can happen concurrently, so the sub-module must be ready to support this.
+    - reqBidsConfigObj: a slightly modified version of the object that's passed to `pbjs.requestBids` (see [below](#reqBidsConfigObj)). Note that several auctions can happen concurrently, so the sub-module must be ready to support this.
     - callback: lets RTD-core know which auction the sub-module is done with.
     - config: the sub-module's config params provided by the publisher
     - userConsent object (see above)
 2. Your sub-module may update the reqBidsConfigObj and hit the callback. To inject data into the bid requests, you should follow one of these conventions:
     - Recommended: use one of these [First Party Data](/features/firstPartyData.html) conventions:
         - For AdUnit-specific first party data, set AdUnit.ortb2Imp.ext.data.ATTRIBUTES
-        - For global first party data, call 'pbjs.[mergeConfig](/dev-docs/publisher-api-reference/mergeConfig.html)()' 
-        - If the data is not meant to go to all bidders, the module should use 'pbjs.[mergeBidderConfig](/dev-docs/publisher-api-reference/mergeBidderConfig.html)()' and support a parameter to allow the publisher to define which bidders are to receive the data.
+        - For global first party data, including bidder-specific data, modify the `reqBidsConfigObj` as shown [below](#reqBidsConfigObj) 
     - Not recommended: Place your data in bidRequest.rtd.RTDPROVIDERCODE.ATTRIBUTES and then get individual adapters to specifically read that location. Note that this method won't pass data to Prebid Server adapters.
 
+<a id="reqBidsConfigObj" />
+
+The `reqBidsConfigObj` parameter is a copy of the object passed to [`requestBids`](/dev-docs/publisher-api-reference/requestBids.html), except for:
+
+- `adUnits` and `timeout` are always defined (if the publisher didn't provide them, the default values are filled in - `pbjs.adUnits` and `getConfig('bidderTimeout')` respectively)
+- `ortb2` is replaced with an `ortb2Fragments` object, intended to be inspected and / or modified by your module.
+
+The `ortb2Fragments` parameter is an object containing two properties:
+
+- `global`, an object containing global (not bidder-specific) first party data in the same OpenRTB format used by `setConfig({ortb2})`
+- `bidder`, a map from bidder code to bidder-specific, OpenRTB-formatted first party data.
+
+Your module may modify either or both with additional data. If adding bidder-specific data in `ortb2Fragments.bidder`, it should also support a parameter to allow the publisher to define which bidders are to receive the data.
+
+{: .alert.alert-warning :}
+Before version 7, the pattern for first party data inspection and enrichment by RTD modules was `getConfig({ortb2])` / `mergeConfig({ortb2})`. With the introduction of [auction-specific data](/features/firstPartyData.html#supplying-auction-specific-data) in 7, the global `getConfig('ortb2')` is "frozen"
+at the time `requestBids` is called, and RTD submodules that wish to modify it are required to work on `ortb2Fragments` instead - as any additional call to `mergeConfig` will only take effect on the *next* auction.  
+
 **Code Example**
 
 {% highlight text %}
@@ -205,7 +222,12 @@ function init(config, userConsent) {
 
 function alterBidRequests(reqBidsConfigObj, callback, config, userConsent) {
   // do stuff
-  // put data in AdUnit.ortb2Imp.ext.data.* or rtd.RTDPROVIDERCODE.*
+  // put data in adUnits' ortb2Imp:
+  reqBidsConfigObj.adUnits.forEach((adUnit) => mergeDeep(adUnit, 'ortb2Imp.ext', myCustomData);
+  // or in global first party data:
+  mergeDeep(reqBidsConfigObj.ortb2Fragments.global, myCustomData);
+  // or in bidder-specific first party data:
+  config.bidders.forEach((bidderCode) => mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, {[bidderCode]: myCustomData});
   callback();
 }
 

dev-docs/analytics/pianoDmp.md

@@ -0,0 +1,24 @@
+---
+layout: analytics
+title: Piano DMP
+description: Piano DMP Analytics Adapter
+modulecode: pianoDmp
+gdpr_supported: true
+usp_supported: false
+coppa_supported: false
+prebid_member: false
+gvl_id: 412
+enable_download: true
+---
+
+#### Registration
+
+Please visit [https://piano.io/product/dmp/](https://piano.io/product/dmp/) for more information.
+
+### Example Configuration
+
+```
+  pbjs.enableAnalytics({
+    provider: 'pianoDmp'
+  });
+```