Merge branch 'master' into IncrementX_document_update

_data/sidebar.yml

@@ -227,7 +227,7 @@
 
 - sbSecId: 1
   title: Native Ads
-  link: /formats/native.html
+  link: /dev-docs/examples/native-ad-example.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:

dev-docs/bidders/appnexus.md

@@ -28,6 +28,7 @@ sidebarType: 1
   - [Video Object](#video-object)
   - [User Object](#user-object)
   - [App Object](#app-object)
+  - [Video Bid params and Video MediaTypes params](#video-bid-params-and-video-mediatypes-params)
   - [Custom Targeting keys](#custom-targeting-keys)
   - [Auction Level Keywords](#auction-level-keywords)
   - [Passing Keys Without Values](#passing-keys-without-values)
@@ -80,12 +81,14 @@ The table below will reflect both formats, though it's recommended to use the lo
 
 #### Video Object
 
+For details on how these video params work with the params set in the adUnit.mediaTypes.video object, see [Video Bid params and Video MediaTypes params](#appnexus-video-params) section below.
+
 {: .table .table-bordered .table-striped }
 | Name              | Description                                                                                                                                                                                                                                  | Type             |
 |-------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------|
 | `minduration` | Integer that defines the minimum video ad duration in seconds. | `integer` |
 | `maxduration` | Integer that defines the maximum video ad duration in seconds. | `integer` |
-|`context` | A string that indicates the type of video ad requested.  Allowed values: `"pre_roll"`; `"mid_roll"`; `"post_roll"`; `"outstream"`. | `string` |
+|`context` | A string that indicates the type of video ad requested.  Allowed values: `"pre_roll"`; `"mid_roll"`; `"post_roll"`; `"outstream"`; `"in-banner"`, `"in-feed"`, `"interstitial"`, `"accompanying_content_pre_roll"`, `"accompanying_content_mid_roll"`, `"accompanying_content_post_roll"`. | `string` |
 | `skippable` | Boolean which, if `true`, means the user can click a button to skip the video ad.  Defaults to `false`. | `boolean` |
 |`skipoffset`| Integer that defines the number of seconds until an ad can be skipped.  Assumes `skippable` setting was set to `true`. | `integer` |
 | `playback_method` | A string that sets the playback method supported by the publisher.  Allowed values: `"auto_play_sound_on"`; `"auto_play_sound_off"`; `"click_to_play"`; `"mouse_over"`; `"auto_play_sound_unknown"`. | `string` |
@@ -150,6 +153,16 @@ pbjs.bidderSettings = {
 }
 ```
 
+<a name="appnexus-video-params"></a>
+
+#### Video Bid params and Video MediaTypes params
+
+It is possible to have setup video params within the adUnit's AppNexus bid object as well as in the adUnit's `mediaTypes.video` object.  In this case, there is a set of logic that the AppNexus bid adapter follows to resolve which values should be passed along to the ad server request.  Generally speaking, the adapter prefers the values from bid param video object over the mediaTypes video object, in order to preserve historical setups.  So for instance, if the playbackmethod field was set in both locations, then the bid params `playback_method` would be chosen over the mediaTypes `playbackmethod`.  If there are different fields set between the two locations and they don't overlap, then the `mediaTypes.video` params would be included along with the bid params.
+
+To note - not all the fields between the two locations have a single direct comparison, nor are all fields from the `mediaTypes.video` object are supported by the ad server endpoint.  The fields/values set in the `mediaTypes.video` object follow the OpenRTB convention, while our bid params follow the convention for the ad server endpoint (which is **not** a straight OpenRTB endpoint).  The AppNexus bid adapter converts the matching fields from the `mediaTypes.video` object where there is a correlation to help support as much as possible.  For example, to help infer the `context` field, the adapter will look to the `mediaTypes.video.plcmt`, `mediaTypes.video.startdelay`, and `mediaTypes.video.placement` fields to help determine the appropriate `context` value.  The `startdelay` field is included here to help clarify the type of instream video that is used (ie pre/mid/post-roll).  
+
+If you want to transition from video bid params to use the `mediaTypes.video` params (to simplify the adUnit setup), please contact your AppNexus contact to help identify the proper fields/values are populated to ensure a smooth transition.
+
 <a name="appnexus-auction-keywords"></a>
 
 #### Auction Level Keywords

dev-docs/bidders/docereeadmanager.md

@@ -3,7 +3,7 @@ layout: bidder
 title: Doceree AdManager
 description: Doceree AdManager Prebid Bidder Adapter
 pbjs: true
-biddercode: docereeAdManager
+biddercode: docereeadmanager
 media_types: banner
 gvl_id: 1063
 tcfeu_supported: true

dev-docs/bidders/freedomadnetwork.md

@@ -0,0 +1,36 @@
+---
+layout: bidder
+title: Freedom Ad Network
+description: Freedom Ad Network Bidder Adapter
+biddercode: freedomadnetwork
+gvl_id: none
+coppa_supported: true
+media_types: banner, native
+multiformat_supported: will-bid-on-any, will-bid-on-one, will-not-bid
+safeframes_ok: false
+deals_supported: false
+floors_supported: false
+fpd_supported: false
+pbjs: true
+prebid_member: false
+sidebarType: 1
+tcfeu_supported: false
+dsa_supported: false
+usp_supported: false
+schain_supported: false
+dchain_supported: false
+pbs: false
+ortb_blocking_supported: false
+privacy_sandbox: no
+---
+
+### Note
+
+The Freedom Ad Network Adapter requires setup before beginning. Please contact us at [[email protected]](mailto:[email protected]).
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name          | Scope    | Description           | Example   | Type      |
+|---------------|----------|-----------------------|-----------|-----------|
+| `placementId`      | required | Placement ID         | `'e6203f1e-bd6d-4f42-9895-d1a19cdb83c8'`    | `string` |

dev-docs/bidders/ssp_geniee.md

@@ -0,0 +1,43 @@
+---
+layout: bidder
+title: Geniee SSP
+description: Geniee SSP Bidder Adapter
+biddercode: ssp_geniee
+userId: imuId
+media_types: banner
+safeframes_ok: false
+sidebarType: 1
+pbjs: true
+tcfeu_supported: false
+dsa_supported: false
+gvl_id: none
+usp_supported: false
+coppa_supported: false
+gpp_sids: none
+schain_supported: false
+dchain_supported: false
+deals_supported: false
+floors_supported: false
+fpd_supported: false
+pbs: false
+prebid_member: false
+multiformat_supported: will-bid-on-one
+ortb_blocking_supported: partial
+privacy_sandbox: no
+---
+### Note
+
+This is [Geniee](https://geniee.co.jp) Bidder Adapter for Prebid.js.
+
+{: .alert.alert-info :}
+This is Geniee *SSP* Bidder Adapter. The another adapter named "Geniee Bid Adapter" is Geniee *DSP* Bidder Adapter.
+
+Please contact us before using the adapter.
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+|     Name     |  Scope   |      Description                                |  Example  |   Type    |
+|--------------|----------|-------------------------------------------------|-----------|-----------|
+|  `zoneId`    | required |    Zone ID                                      |  `123456` | `integer` |
+|  `currency`  | Optional | Currency setting (`'JPY'`(Default) or `'USD'`)  | `'JPY'`   | `string`  |

dev-docs/bidders/taboola.md

@@ -19,7 +19,7 @@ safeframes_ok: true
 fpd_supported: true
 ortb_blocking_supported: partial
 deals_supported: false
-pbs_app_supported: false
+pbs_app_supported: true
 multiformat_supported: will-not-bid
 sidebarType: 1
 ---