fix merge conflict

dev-docs/bidders/akcelo.md

@@ -0,0 +1,119 @@
+---
+layout: bidder
+title: Akcelo
+description: Prebid Akcelo Bidder Adapter
+biddercode: akcelo
+pbjs: true
+pbs: false
+gvl_id: none
+tcfeu_supported: false
+usp_supported: false
+userIds: all
+media_types: banner, native, video
+coppa_supported: false
+schain_supported: true
+dchain_supported: false
+safeframes_ok: true
+deals_supported: false
+floors_supported: true
+fpd_supported: true
+ortb_blocking_supported: false
+multiformat_supported: will-bid-on-any
+privacy_sandbox: no
+sidebarType: 1
+---
+
+### Registration
+
+The Akcelo bidder adapter requires setup and approval from the Akcelo service team.
+Please reach out to your account manager or <[email protected]> for more information.
+
+### Bid params
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description                                                              | Example | Type      |
+|------------|----------|--------------------------------------------------------------------------|---------|-----------|
+| `siteId`   | required | The identifier of the site. Will be provided by your account manager.    | `763`   | `integer` |
+| `adUnitId` | required | The identifier of the ad unit. Will be provided by your account manager. | `7965`  | `integer` |
+| `test`     | optional | Whether to display test creatives or not. Default is 0.                  | `1`     | `integer` |
+
+### Configuration Example
+
+```html
+
+<script>
+  const adUnits = [
+    {
+      code: 'div-123',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600],
+          ],
+        },
+        video: {
+          context: "outstream",
+          playerSize: [[640, 480]],
+          mimes: ['video/mp4'],
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          playbackmethod: [1],
+          skip: 1,
+          api: [2],
+          minbitrate: 1000,
+          maxbitrate: 3000,
+          minduration: 3,
+          maxduration: 10,
+          startdelay: 2,
+          placement: 4,
+          linearity: 1
+        },
+      },
+      bids: [
+        {
+          bidder: 'akcelo',
+          params: {
+            siteId: 763, // required
+            adUnitId: 7965, // required
+            test: 1, // optional
+          },
+        },
+      ],
+    },
+  ];
+
+  pbjs.que.push(function () {
+    pbjs.addAdUnits(adUnits);
+  });
+</script>
+```
+
+### User Sync
+
+Akcelo strongly recommends enabling user syncing through iFrames. This functionality
+improves DSP user match rates and increases the bid rate and bid price.
+
+```js
+// https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-Configure-User-Syncing
+pbjs.setConfig({
+  userSync: {
+    filterSettings: {
+      iframe: {
+        bidders: ['akcelo'],
+        filter: 'include',
+      },
+    },
+  },
+});
+```
+
+### First Party Data
+
+Akcelo supports both `ortb2` and `ortb2Imp` methods to set [First Party Data](/features/firstPartyData.html).
+
+{: .table .table-bordered .table-striped }
+| Name              | Scope    | Description                                                                                     | Example           | Type           |
+|-------------------|----------|-------------------------------------------------------------------------------------------------|-------------------|----------------|
+| `ortb2.site`      | optional | Information about the publisher's website provided through an OpenRTB Site object.              | N/A               | `object`       |
+| `ortb2.user`      | optional | Information about the advertising device's human user, provided through an OpenRTB User object. | N/A               | `object`       |
+| `ortb2.device`    | optional | Information about the user's device provided through an OpenRTB device object.                  | N/A               | `object`       |

dev-docs/bidders/smartadserver.md

@@ -3,17 +3,29 @@ layout: bidder
 title: Smart AdServer
 description: Prebid Smart AdServer Bidder Adapter
 biddercode: smartadserver
-media_types: display, video, native
+media_types: display, video, native, audio
 tcfeu_supported: true
 gvl_id: 45
 tcfeu_supported: true
+multiformat_supported: will-bid-on-any
+coppa_supported: true
 gpp_supported: true
+gpp_sids: tcfca, tcfeu, usnat, usstate_all, usp
 schain_supported: true
+dchain_supported: false
 usp_supported: true
+fpd_supported: true
+dsa_supported: true
+deals_supported: true
+safeframes_ok: true
 userIds: all
 pbjs: true
 pbs: true
+pbs_app_supported: true
+prebid_member: false
 floors_supported: true
+ortb_blocking_supported: true
+privacy_sandbox: no
 sidebarType: 1
 ---
 
@@ -58,6 +70,7 @@ The Smart AdServer bidder adapter requires setup and approval from the Equativ (
 |---|---|
 | `banner` | Supported |
 | `video`  | Supported |
+| `audio`  | Supported |
 | `native` | Not currently supported |
 
 ### Supported Media Types (Prebid Server)
@@ -67,8 +80,12 @@ The Smart AdServer bidder adapter requires setup and approval from the Equativ (
 |------|-------|
 | `banner` | Supported |
 | `video`  | Supported |
+| `audio`  | Supported |
 | `native` | Supported |
 
+### Coppa support
+Coppa is supported by our prebid server adapter but not by our prebid.js adapter.
+
 ### Examples
 
 Without site/page/format:
@@ -109,10 +126,10 @@ With site/page/format:
     },
     "ext": {
       "smartadserver": {
-                            "networkId": 73
-                            "siteId": 1,
-                            "pageId": 2,
-                            "formatId": 3
+        "networkId": 73,
+        "siteId": 1,
+        "pageId": 2,
+        "formatId": 3
       }
     }
   }]

dev-docs/bidders/urekamedia.md

@@ -0,0 +1,36 @@
+---
+layout: bidder
+title: UrekaMedia
+description: UrekaMedia Bidder Adaptor
+biddercode: urekamedia
+pbjs: true
+pbs: false
+media_types: banner, native, video
+gvl_id: 14 (adkernel)
+tcfeu_supported: true
+usp_supported: true
+coppa_supported: true
+gpp_supported: true
+pbs_app_supported: true
+schain_supported: true
+userIds: all
+fpd_supported: true
+prebid_member: false
+ortb_blocking_supported: true
+multiformat_supported: will-bid-on-one
+floors_supported: true
+aliasCode: adkernel
+sidebarType: 1
+---
+
+### Note
+
+The UrekaMedia bidding adapter requires setup and approval before implementation. Please reach out to <[email protected]> for more details.
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name     | Scope    | Description           | Example                   | Type     |
+|----------|----------|-----------------------|---------------------------|----------|
+| `host`   | required | Host | `'cpm.upremium.asia'` | `string` |
+| `zoneId` | required | Zone Id           | `30164`                 | `integer` |

dev-docs/modules/1plusXRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # 1plusX RTD Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/51DegreesRtdProvider.md

@@ -18,7 +18,6 @@ This module loads a dynamically generated JavaScript from Cloud API hosted at cl
 The Cloud API is **free** to integrate and use. To increase limits please check [51Degrees pricing](https://51degrees.com/pricing).
 
 # 51Degrees RTD Submodule
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/aaxBlockmeterRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # AAX Blockmeter Realtime Data Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/adpod.md

@@ -10,7 +10,6 @@ sidebarType : 1
 ---
 
 # Adpod Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/airgridRtdProvider.md

@@ -12,15 +12,14 @@ sidebarType : 1
 ---
 
 # AirGrid RTD Provider
+{:.no_toc}
 
 AirGrid is a privacy-first, cookie-less audience platform. Designed to help publishers increase inventory yield,
 whilst providing audience signal to buyers in the bid request, without exposing raw user level data to any party.
 
 This real-time data module provides quality first-party data, contextual data, site-level data and more that is
 injected into bid request objects destined for different bidders in order to optimize targeting.
 
-{:.no_toc}
-
 * TOC
 {:toc}
 

dev-docs/modules/anPspParamsConverter.md

@@ -10,7 +10,6 @@ sidebarType : 1
 ---
 
 # anPspParamsConverter Module
-
 {:.no_toc}
 
 This module is a temporary measure for publishers running Prebid.js 9.0+ and using the AppNexus PSP endpoint through their Prebid.js setup. Please ensure to include this module in your builds of Prebid.js 9.0+, otherwise requests to PSP may not complete successfully.

dev-docs/modules/arcspanRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # ArcSpan RTD Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/bidViewable.md

@@ -11,7 +11,6 @@ sidebarType : 1
 ---
 
 # Bid Viewability - GAM
-
 {:.no_toc}
 
 - TOC

dev-docs/modules/bidViewableIO.md

@@ -10,7 +10,6 @@ sidebarType : 1
 ---
 
 # Bid Viewability - Ad Server Independent
-
 {:.no_toc}
 
 - TOC

dev-docs/modules/blueconicRtdProvider.md

@@ -13,7 +13,6 @@ sidebarType : 1
 ---
 
 # BlueConic Real-time Data Submodule
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/brandmetricsRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # brandmetrics Real Time Data Provider Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/browsiRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # Browsi Viewability Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/captifyRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # Captify RTD Module
-
 {:.no_toc}
 
 * TOC
@@ -73,4 +72,4 @@ pbjs.setConfig({
 | `params`         | Object        | |  | |
 | `params.pubId`   | Integer       | Partner ID, required to get results and provided by Captify         | yes      | Use `123456` for tests, speak to your Captify account manager to receive your pubId |
 | `params.bidders` | Array<String> | List of bidders for which you would like data to be set             | yes      | Currently only 'appnexus' supported |
-| `params.url`     | String        | Captify live-classification service url                             | no       | Defaults to `https://live-classification.cpx.to/prebid-segments`
+| `params.url`     | String        | Captify live-classification service url                             | no       | Defaults to `https://live-classification.cpx.to/prebid-segments` |

dev-docs/modules/categoryTranslation.md

@@ -10,7 +10,6 @@ sidebarType : 1
 ---
 
 # IAB Category Translation
-
 {:.no_toc}
 
 This module converts the IAB sub category to Ad server industry group identifiers. The identifiers ensure competitive separation of industries and products.

dev-docs/modules/currency.md

@@ -10,12 +10,12 @@ sidebarType : 1
 
 ---
 
-
-
 # Currency Module
-
 {:.no_toc}
 
+* TOC
+{:toc}
+
 This module supports the conversion of multiple bidder currencies into a single currency
 used by the publisher's ad server. In previous versions of Prebid, this was accomplished
 by using [BidderSettings.bidCpmAdjustment]({{site.baseurl}}/dev-docs/publisher-api-reference/bidderSettings.html), but that's a static value not changed except when

dev-docs/modules/dgkeywordRtdProvider.md

@@ -12,7 +12,6 @@ sidebarType : 1
 ---
 
 # Digital Garage Keyword Module
-
 {:.no_toc}
 
 * TOC

dev-docs/modules/dsaControl.md

@@ -13,7 +13,7 @@ sidebarType : 1
 {:.no_toc}
 
 * TOC
-  {:toc}
+{:toc}
 
 ## Overview
 

dev-docs/modules/freewheel.md

@@ -12,8 +12,6 @@ sidebarType : 1
 
 # Freewheel Module
 
-{:.no_toc}
-
 This module returns the targeting key value pairs for the FreeWheel ad server.
 
 ## How to use the module