From 35fc3c89b1e177ec800c5843defee51b5fb93e8f Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Tue, 19 Oct 2021 14:08:37 -0400
Subject: [PATCH] PBS modularity (#3354)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* initial control

* checkpoint

* checkpoint

* checkpoint

* working on atags

* atags and navbar

* added note about allowed-for-deals overrides

* Restructuring modules for download and modules index (#3265)

* restructure module lists

* changing pubcommon message to deprecated

* ucfunnel adapter docs add prebid-server params (#3263)

* Add instream video and native support for ucfunnel adapter

* [Dev Fix]add download.md && overview/analytics.md

* ucfunnel adapter  support schain, coppa, tcf2

* ucfunnel adapter docs add pbs_app_supported and gvl_id

* ucfunnel adapter docs add prebid-server params

Co-authored-by: Ryan Chou <ryanchou0210@gmail.com>
Co-authored-by: cliff_liu <cliff5345179@gmail.com>

* between adapter docs: add userIds (#3247)

* between adapter docs: add userIds

* update between.md and return destrictmdmx.md

Co-authored-by: khaylov <khaylov@betweenx.com>

* Additional Id providers support (#3262)

* Fluct Bid Adapter: update Prebid 5 compliance (#3233)

per pr -> https://github.com/prebid/Prebid.js/pull/7353

* TargetVideo adapter dev-docs (#3228)

* BLIINK Bidder adaptor docs (#3198)

* feat(bliink): Add new documentation for BLIINK bidder adaptor

* Update bliink.md

Co-authored-by: Jonathan <jonathan@bliink.io>

* Add new query parameter for httpinteraction endpoint (#3268)

* Fixed typo

* Added new query param

* add getfloor support for adyoulike (#3269)

* added ext.prebid.buyeruid extension (#3274)

* IQzone Bidder Adapter: add new bid param (#3250)

* add IQZone adapter doc

* add new bid param

* fix

* Update description of AFP adapter (#3205)

* update description of AFP adapter

* Revert "update description of AFP adapter"

This reverts commit 418f042ffff710e6ec6f7c53df4e8b32a1b8108e.

* add description of AFP adapter

* add new format "Just Banner"

* update examples

* IQzone Adapter: update doc (#3278)

* add IQZone adapter doc

* add new bid param

* fix

* updates

* Rise docs (#3276)

* Update Rise readme

* update docs

* Seeding Alliance Bid Adapter: update Prebid 5 comp (#3271)

per per -> https://github.com/prebid/Prebid.js/pull/7426

* Adf adapter: floors module support (#3270)

* AdHash bidder adaptor for 5.0 (#3264)

* AdHash Bidder Adapter: initial prebid.js integration

* AdHash Bidder Adapter: changing the example text

Changing the example text as it's one of our actual client's name

* AdHash bidder adaptor for 5.0 update

* Update guide.md (#3288)

* minor updates to guide (#3289)

* added environment section to guide (#3290)

* new adquery adapter  (#3275)

* new Adapter

* Removed prebid version note. We support version 5.x

Co-authored-by: m.czerwiak <marcin.czerwiak@azagroup.eu>

* fixed ortb2Imp (#3291)

* add weborama RTD doc (#3277)

Co-authored-by: Tiago Peczenyj <tpeczenyj@weborama.com>

* PBS-Go User Sync (#3220)

* Initial Commit

* Auction Endpoint JSON Formatting

* Added User Sync Config Doc

* Update Feature Comparison List

* Proof Read Pass

* Clarified part of the process

* Fixed a typo

* Edits for PBS docs

Co-authored-by: SSuranie <steve@martiantribe.com>

* Update firstPartyData.md with app.content.data example (#3299)

* Update firstPartyData.md

* Update firstPartyData.md

* fixing indentation

Co-authored-by: bretg <bgorsline@gmail.com>

* Update docs to match with pbj (#3280)

* Fixed typo

* Updated docs to match with current PBJ state.

* Added default configuration section

* Removed redundant space between parentheses

* tweaked default configs

* Updated default config documentation to match with pbj

* Update add-new-bidder-java.md

* Reverted invalid changes

* Synced with pbj

* Added information about unmodifiable defaults, cleaned up bidder alias example.

* Removed obsolete field pbs-enforces-gdpr

Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: MartianTribe <steve@martiantribe.com>

* Viewdeos page pbs separation (#3282)

* add Bidsxchange page

* Add openweb doc

* change params

* add ViewDeos pbs page

* Rebranding yssp adapter to yahoossp. (#3283)

Co-authored-by: oath-jac <dsp-supply-prebid@verizonmedia.com>

* update between doc (#3284)

Co-authored-by: khaylov <khaylov@betweenx.com>

* Download: fix akamai typo on download page (#3292)

* fix links on modules/index.html (#3296)

* Just Premium Bid Adapter: update schain support (#3301)

per pr https://github.com/prebid/Prebid.js/pull/7506

* change tagId to be required, and add note about test tagId value (#3303)

* yieldmo: multiple changes (#3246)

* multiple changes
* schain support for video ads
* device.ip support
* gpid support

* device.ip support cleaned up

* Add doc for timeout rtd module (#3266)

* Add doc for timeout rtd module

* Remove 'sets'

* fixing 404 for other module types (#3313)

* another batch of dead links (#3314)

* download page 404 for modules (#3316)

* Colossus Bid Adapter: Unified ID 2.0  (#3236)

* Updated docs Colossusssp Adapter

* Update colossusssp.md

Add media types

* Update colossusssp.md

add usp consent support

* adding schain flag

* gdpr and user ids

* id5id support

* Prebid server info

* Remove PBS params

* Add colossus PBS docs

* Add short note for pbs adapter parametres

* Add note for pbjs parametres

* Fix

* remove duplicate string

* Update colossusssp.md

Ad biddflorr parameter

* add uid2

* fix

* fix

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>

* Fix timeout rtd (#3317)

* download page 404 for modules

* fixed modulecode for timeout RTD

* Adkernel: documenting ergadx alias (#3324)

Documenting https://github.com/prebid/Prebid.js/pull/7544

* Update InterstitialAds.md (#3319)

* adds disclaimer (#3318)

* Nativo Bid Adapter: Bid Params Update (#3307)

* Added nativo markup documentation to dev-docs/bidders

* Added IAB Global Vendor List ID number.

* Adjusted placementId Type to be integer

* Changed pbjs value to true

* Added optional url parameter

* Updated placementId parameter to be optional

* PubLink adds params for site id and api key. (#3306)

* Slimcut: removing 5.x note (#3305)

* SpotX: add support for price floors module (#3293)

* Update NextRoll BidAdapter docs for v5 (#3286)

* Update NextRoll BidAdapter docs for v5

* Add comment to `floors` section in example

* Mytarget Bid Adapter: update Prebid 5 compliance (#3285)

Per pr -> https://github.com/prebid/Prebid.js/pull/7397

* Added video support (#3281)

* [sspbc-adapter] update dev-docs for adapter (native & video support) (#3279)

Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>

* Prebid Server Support (#3273)

Add the prebid server support

* Relaido Bid Adapter: add support imuid (#3272)

* add relaido adapter

* Add support for imuid

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>

* Impactify - Add UserID module (#3245)

Add UserID support in documentation

* Added First Party Data to feature list (#3325)

* added fpd_supported, renamed getFloor and deals

* removing stray file

* Updated bidder: Adnuntius (#3312)

* Adnuntius Bidder documentation added

* Fixed targeting text.

* Added documentation for passing segments in the bidder config.

* changed the way to send user segments to bidder.

* Moved string to type + examples.

* Adnuntius update for prebid server.

* Added info that custom price granularity is needed when using currrencies where the nominal CPM range is greatly differnt than USD (#3326)

* fix weborama conf example as in Prebid.js/modules/weboramaRtdProvider.md (#3330)

* fix weborama conf example as in Prebid.js/modules/weboramaRtdProvider.md

* fix closing parentesis

* fix ponctuation

* Ad Generation Bid Adapter: update prebid 5 complia (#3329)

per pr -> https://github.com/prebid/Prebid.js/pull/7150

(reference pr https://github.com/prebid/Prebid.js/pull/7533 as well)

* Update apacdex.md (#3332)

I was missing a newline in the apacdex.md file.
This causes it to display falsely on https://docs.prebid.org/dev-docs/bidders/apacdex#apacdex-bid-params

* fixing PBJS adapter example (#3339)

* added PBS config faq entries (#3340)

* PBS modularity

* timeout is milliseconds

Co-authored-by: jackhsiehucf <77815341+jackhsiehucf@users.noreply.github.com>
Co-authored-by: Ryan Chou <ryanchou0210@gmail.com>
Co-authored-by: cliff_liu <cliff5345179@gmail.com>
Co-authored-by: Ignat Khaylov <ignat@ignat.one>
Co-authored-by: khaylov <khaylov@betweenx.com>
Co-authored-by: Anand Venkatraman <avenkatraman@pulsepoint.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: Dejan Grbavcic <grajzer@users.noreply.github.com>
Co-authored-by: Jonathan <jonathan.ibor@gmail.com>
Co-authored-by: Jonathan <jonathan@bliink.io>
Co-authored-by: Alex Maltsev <and1sscsgo@gmail.com>
Co-authored-by: guiann <guillaume.andouard@adyoulike.com>
Co-authored-by: IQZoneAdx <88879712+IQZoneAdx@users.noreply.github.com>
Co-authored-by: andrey-ka-97 <42410701+andrey-ka-97@users.noreply.github.com>
Co-authored-by: Noam Tzuberi <noamtzu@users.noreply.github.com>
Co-authored-by: Jurij Sinickij <jurij.sinickij@adform.com>
Co-authored-by: Damyan <damyan.stanchev@gmail.com>
Co-authored-by: adquery <89853721+adquery@users.noreply.github.com>
Co-authored-by: m.czerwiak <marcin.czerwiak@azagroup.eu>
Co-authored-by: Tiago Peczenyj <tiago.peczenyj@gmail.com>
Co-authored-by: Tiago Peczenyj <tpeczenyj@weborama.com>
Co-authored-by: Scott Kay <noreply@syntaxnode.com>
Co-authored-by: SSuranie <steve@martiantribe.com>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
Co-authored-by: Gena <wertixvost@gmail.com>
Co-authored-by: oath-jac <45564796+oath-jac@users.noreply.github.com>
Co-authored-by: oath-jac <dsp-supply-prebid@verizonmedia.com>
Co-authored-by: jsut <adam.prime@wattpad.com>
Co-authored-by: Nick Jacob <nickbjacob@gmail.com>
Co-authored-by: ym-abaranov <78230460+ym-abaranov@users.noreply.github.com>
Co-authored-by: Luigi Sayson <48766825+luigi-sayson@users.noreply.github.com>
Co-authored-by: Bill Newman <huddled.masses1650@gmail.com>
Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Denis Logachov <denis@adkernel.com>
Co-authored-by: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Co-authored-by: jsfledd <jsfledd@users.noreply.github.com>
Co-authored-by: Paul Yang <pyang@conversantmedia.com>
Co-authored-by: Amanda Dillon <41923726+agdillon@users.noreply.github.com>
Co-authored-by: Abimael Martinez <abijr@users.noreply.github.com>
Co-authored-by: Jeremy Sadwith <jeremy@kargo.com>
Co-authored-by: wojciech-bialy-wpm <67895844+wojciech-bialy-wpm@users.noreply.github.com>
Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>
Co-authored-by: Thomas <thomas.dseao@gmail.com>
Co-authored-by: relaido <63339139+relaido@users.noreply.github.com>
Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: Mikael Lundin <mikael-lundin@users.noreply.github.com>
Co-authored-by: Mike Chowla <mike.chowla@pubmatic.com>
Co-authored-by: thuyhq <61451682+thuyhq@users.noreply.github.com>
---
 _layouts/bidder.html                          |   8 +-
 debugging/debugging.md                        |   2 +-
 dev-docs/adunit-reference.md                  |   2 +-
 dev-docs/bidder-adaptor.md                    |  16 +-
 dev-docs/bidder-data.csv                      |   4 +-
 dev-docs/bidders.md                           |  16 +-
 dev-docs/bidders/33across.md                  |   2 +-
 dev-docs/bidders/aceex.md                     |   2 +-
 dev-docs/bidders/acuityads.md                 |   2 +-
 dev-docs/bidders/adagio.md                    |   3 +-
 dev-docs/bidders/adf.md                       |   2 +
 dev-docs/bidders/adgeneration.md              |   1 -
 dev-docs/bidders/adhash.md                    |   2 +-
 dev-docs/bidders/admixer.md                   |   1 +
 dev-docs/bidders/adnuntius.md                 |  58 +-
 dev-docs/bidders/adpone.md                    |   2 +-
 dev-docs/bidders/adquery.md                   |  19 +
 dev-docs/bidders/adrelevantis.md              |   1 +
 dev-docs/bidders/adriver.md                   |   4 +-
 dev-docs/bidders/adxcg.md                     |   2 +-
 dev-docs/bidders/adyoulike.md                 |   1 +
 dev-docs/bidders/afp.md                       | 201 ++++++
 dev-docs/bidders/amx.md                       |   7 +-
 dev-docs/bidders/apacdex.md                   |   5 +-
 dev-docs/bidders/appnexus.md                  |   3 +-
 dev-docs/bidders/aso.md                       |   6 +-
 dev-docs/bidders/automatad.md                 |   1 +
 dev-docs/bidders/beachfront.md                |   2 +-
 dev-docs/bidders/beop.md                      |   1 +
 dev-docs/bidders/between.md                   |   5 +-
 dev-docs/bidders/bidmachine.md                |   2 +-
 dev-docs/bidders/bizzclick.md                 |   2 +-
 dev-docs/bidders/bliink.md                    |  25 +
 dev-docs/bidders/bmtm.md                      |   2 +-
 dev-docs/bidders/brave.md                     |   2 +-
 dev-docs/bidders/colossus.md                  |   2 +-
 dev-docs/bidders/colossusssp.md               |   3 +-
 dev-docs/bidders/connectad.md                 |   2 +-
 dev-docs/bidders/contentexchange.md           |   2 +-
 dev-docs/bidders/criteo.md                    |   3 +-
 dev-docs/bidders/datablocks.md                |   1 +
 dev-docs/bidders/districtmdmx.md              |  35 +
 dev-docs/bidders/epom.md                      |   2 +-
 dev-docs/bidders/ergadx.md                    |  27 +
 dev-docs/bidders/etarget.md                   |   1 +
 dev-docs/bidders/fluct.md                     |   1 -
 dev-docs/bidders/getintent.md                 |   2 +-
 dev-docs/bidders/gothamads.md                 |   2 +-
 dev-docs/bidders/grid.md                      |   3 +-
 dev-docs/bidders/gridNM.md                    |   1 +
 dev-docs/bidders/gumgum.md                    |   3 +-
 dev-docs/bidders/huaweiads.md                 |   2 +-
 dev-docs/bidders/impactify.md                 |   3 +-
 dev-docs/bidders/inmar.md                     |   3 +-
 dev-docs/bidders/integr8.md                   |   2 +-
 dev-docs/bidders/iqm.md                       |   2 +-
 dev-docs/bidders/iqzone.md                    |  24 +-
 dev-docs/bidders/ix.md                        |   3 +-
 dev-docs/bidders/jixie.md                     |   2 +-
 dev-docs/bidders/justpremium.md               |   1 +
 dev-docs/bidders/kargo.md                     |   1 +
 dev-docs/bidders/kobler.md                    |   4 +-
 dev-docs/bidders/logicad.md                   |   2 +-
 dev-docs/bidders/marsmedia.md                 |   2 +-
 dev-docs/bidders/mathildeads.md               |   2 +-
 dev-docs/bidders/mediakeys.md                 |   4 +-
 dev-docs/bidders/medianet.md                  |   3 +-
 dev-docs/bidders/mytarget.md                  |   1 -
 dev-docs/bidders/nativo.md                    |   2 +-
 dev-docs/bidders/nextroll.md                  |  14 +-
 dev-docs/bidders/nobid.md                     |   1 +
 dev-docs/bidders/ogury.md                     |   4 +-
 dev-docs/bidders/openx.md                     |   3 +-
 dev-docs/bidders/operaads.md                  |   4 +-
 dev-docs/bidders/optout.md                    |   1 +
 dev-docs/bidders/ozone.md                     |   3 +-
 dev-docs/bidders/pangle.md                    |   2 +-
 dev-docs/bidders/pixfuture.md                 |   1 +
 dev-docs/bidders/proxistore.md                |   1 +
 dev-docs/bidders/pubgenius.md                 |   2 +-
 dev-docs/bidders/pubmatic.md                  |   3 +-
 dev-docs/bidders/pulsepoint.md                |   2 +-
 dev-docs/bidders/pwbid.md                     |   2 +-
 dev-docs/bidders/quantumdex.md                |   4 +-
 dev-docs/bidders/relaido.md                   |   1 +
 dev-docs/bidders/rise.md                      |  23 +-
 dev-docs/bidders/roundel.md                   |   2 +-
 dev-docs/bidders/rubicon.md                   |   5 +-
 dev-docs/bidders/seedingAlliance.md           |   1 -
 dev-docs/bidders/sharethrough.md              |   1 +
 dev-docs/bidders/slimcut.md                   |   3 +-
 dev-docs/bidders/smaato.md                    |   3 +-
 dev-docs/bidders/smartadserver.md             |   2 +-
 dev-docs/bidders/smartyads.md                 |   2 +-
 dev-docs/bidders/sonobi.md                    |   1 +
 dev-docs/bidders/sortable.md                  |   2 +-
 dev-docs/bidders/sovrn.md                     |   3 +-
 dev-docs/bidders/spotx.md                     |   3 +-
 dev-docs/bidders/sspBC.md                     |   7 +-
 dev-docs/bidders/stroeerCore.md               |   2 +-
 dev-docs/bidders/targetvideo.md               |  46 ++
 dev-docs/bidders/teads.md                     |   2 +-
 dev-docs/bidders/triplelift.md                |  10 +-
 dev-docs/bidders/triplelift_native.md         |   4 +-
 dev-docs/bidders/trustx.md                    |   1 +
 dev-docs/bidders/ucfunnel.md                  |  17 +-
 dev-docs/bidders/unruly.md                    |   4 +-
 dev-docs/bidders/valueimpression.md           |   4 +-
 dev-docs/bidders/viewdeos.md                  |  39 ++
 dev-docs/bidders/viewdeosDX.md                |   8 +-
 dev-docs/bidders/visx.md                      |   2 +-
 dev-docs/bidders/winr.md                      |   3 +-
 dev-docs/bidders/yahoossp.md                  |  18 +
 dev-docs/bidders/yieldmo.md                   |  26 +-
 dev-docs/bidders/zeta_global.md               |   2 +-
 dev-docs/bidders/zeta_global_ssp.md           |   3 +-
 dev-docs/modules/gpt-pre-auction.md           |  18 +-
 dev-docs/modules/index.md                     |   6 +-
 dev-docs/modules/pubCommonId.md               |   2 +-
 dev-docs/modules/timeoutRtdProvider.md        | 152 +++++
 dev-docs/modules/userId.md                    |  14 +-
 dev-docs/modules/weboramaRtdProvider.md       |  81 +++
 dev-docs/pbs-bidders.md                       |   3 +-
 dev-docs/publisher-api-reference/setConfig.md |   2 +-
 download.md                                   |   8 +-
 faq/prebid-server-faq.md                      |  34 +
 features/InterstitialAds.md                   |   2 +-
 features/firstPartyData.md                    |  50 +-
 guide.md                                      |  47 +-
 prebid-server/developers/add-new-bidder-go.md | 505 +++++++-------
 .../developers/add-new-bidder-java.md         |  40 +-
 prebid-server/developers/pbs-cookie-sync.md   |  35 +-
 .../openrtb2/pbs-endpoint-auction.md          | 614 +++++++++---------
 prebid-server/endpoints/pbs-endpoint-admin.md |   1 +
 prebid-server/endpoints/pbs-endpoint-event.md |   2 +-
 .../endpoints/pbs-endpoint-overview.md        |   4 +-
 .../endpoints/pbs-endpoint-setuid.md          |  12 +-
 prebid-server/features/pbs-currency.md        |  20 +-
 prebid-server/features/pbs-default-request.md |   2 +-
 prebid-server/features/pbs-feature-idx.md     |  20 +-
 prebid-server/features/pbs-privacy.md         |   2 +-
 prebid-server/hosting/pbs-database.md         |   4 +-
 prebid-server/hosting/pbs-hosting.md          |   2 +-
 prebid-server/pbs-modules/index.md            |   8 +-
 prebid-server/versions/pbs-versions-go.md     |   2 +-
 prebid-server/versions/pbs-versions-java.md   |   2 +-
 prebid-video/video-getting-started.md         |   2 +-
 troubleshooting/troubleshooting-guide.md      |   2 +-
 148 files changed, 1666 insertions(+), 896 deletions(-)
 create mode 100644 dev-docs/bidders/adquery.md
 create mode 100644 dev-docs/bidders/afp.md
 create mode 100644 dev-docs/bidders/bliink.md
 create mode 100644 dev-docs/bidders/districtmdmx.md
 create mode 100644 dev-docs/bidders/ergadx.md
 create mode 100644 dev-docs/bidders/targetvideo.md
 create mode 100644 dev-docs/bidders/viewdeos.md
 create mode 100644 dev-docs/bidders/yahoossp.md
 create mode 100644 dev-docs/modules/timeoutRtdProvider.md
 create mode 100644 dev-docs/modules/weboramaRtdProvider.md

diff --git a/_layouts/bidder.html b/_layouts/bidder.html
index 35f39c9de1..ef9165c1cd 100644
--- a/_layouts/bidder.html
+++ b/_layouts/bidder.html
@@ -76,7 +76,7 @@ <h3>Features</h3>
                   </tr>
                   <tr>
                     <th class="pbTh">Supports Deals</th>
-                    <td class="pbTd">{% if page.bidder_supports_deals == false %}no{% elsif page.bidder_supports_deals == true %}yes{% else %}check with bidder{% endif %}</td>
+                    <td class="pbTd">{% if page.deals_supported == false %}no{% elsif page.deals_supported == true %}yes{% else %}check with bidder{% endif %}</td>
                     <th class="pbTh">Prebid.js Adapter</th>
                     <td class="pbTd">yes</td>
                   </tr>
@@ -88,9 +88,9 @@ <h3>Features</h3>
                   </tr>
                   <tr>
                     <th class="pbTh">Floors Module Support</th>
-                    <td class="pbTd">{% if page.getFloor  == true %}yes{% else %}no{% endif %}</td>
-                    <th class="pbTh"></th>
-                    <td class="pbTd"></td>
+                    <td class="pbTd">{% if page.floors_supported  == true %}yes{% else %}no{% endif %}</td>
+                    <th class="pbTh">First Party Data Support</th>
+                    <td class="pbTd">{% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %}</td>
                   </tr>
                 </table>
 
diff --git a/debugging/debugging.md b/debugging/debugging.md
index 5c88a7050b..906dba744c 100644
--- a/debugging/debugging.md
+++ b/debugging/debugging.md
@@ -20,4 +20,4 @@ benefit from implementation improvements.
 
 Further Reading
 
-+ [Prebid.js Troubleshooting Guide]({{site.github.url}}/dev-docs/prebid-troubleshooting-guide.html)
++ [Prebid.js Troubleshooting Guide](/dev-docs/prebid-troubleshooting-guide.html)
diff --git a/dev-docs/adunit-reference.md b/dev-docs/adunit-reference.md
index f8be5d59ad..ad7436892b 100644
--- a/dev-docs/adunit-reference.md
+++ b/dev-docs/adunit-reference.md
@@ -594,7 +594,7 @@ For more information on Interstitial ads, reference the [Interstitial feature pa
 
 ## Related Topics
 
-+ [Publisher API Reference]({{site.baseurl}}/dev-docs/publisher-api-reference/)
++ [Publisher API Reference]({{site.baseurl}}/dev-docs/publisher-api-reference)
 + [Conditional Ad Units][conditionalAds]
 + [Show Native Ads]({{site.baseurl}}/dev-docs/show-native-ads.html)
 + [Show Video Ads]({{site.baseurl}}/dev-docs/show-video-with-a-dfp-video-tag.html)
diff --git a/dev-docs/bidder-adaptor.md b/dev-docs/bidder-adaptor.md
index 6550c9f546..b7a355ebb8 100644
--- a/dev-docs/bidder-adaptor.md
+++ b/dev-docs/bidder-adaptor.md
@@ -993,8 +993,8 @@ export const spec = {
                 ad: CREATIVE_BODY
             };
             bidResponses.push(bidResponse);
+            return bidResponses;
         };
-        return bidResponses;
     },
 
     /**
@@ -1069,15 +1069,16 @@ registerBidder(spec);
     - Add `pbjs: true`. If you also have a [Prebid Server bid adapter](/prebid-server/developers/add-new-bidder-go.html), add `pbs: true`. Default is false for both.
     - If you're on the IAB Global Vendor List, add your ID number in `gvl_id`.
     - If you support the GDPR consentManagement module and have a GVL ID, you may add `gdpr_supported: true`. Default is false.
-    - If you have an IAB Global Vendor List ID, add `gvl_id: ID`. There's no default.
     - If you support the US Privacy consentManagementUsp module, add `usp_supported: true`. Default is false.
     - If you support one or more userId modules, add `userId: (list of supported vendors)`. No default value.
     - If you support video and/or native mediaTypes add `media_types: video, native`. Note that display is added by default. If you don't support display, add "no-display" as the first entry, e.g. `media_types: no-display, native`. No default value.
     - If you support COPPA, add `coppa_supported: true`. Default is false.
     - If you support the [supply chain](/dev-docs/modules/schain.html) feature, add `schain_supported: true`. Default is false.
-    - If you support passing a demadn chain on the response, add `dchain_supported: true`. Default is false.
+    - If you support passing a demand chain on the response, add `dchain_supported: true`. Default is false.
     - If your bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for your bidder. No default value.
-    - If you support deals, set `bidder_supports_deals: true`. No default value..
+    - If you support deals, set `deals_supported: true`. No default value..
+    - If you support floors, set `floors_supported: true`. No default value..
+    - If you support first party data, set `fpd_supported: true`. No default value..
     - If you're a member of Prebid.org, add `prebid_member: true`. Default is false.
 - Submit both the code and docs pull requests
 
@@ -1090,7 +1091,7 @@ description: Prebid example Bidder Adapter
 biddercode: example
 aliasCode: fileContainingPBJSAdapterCodeIfDifferentThenBidderCode
 gdpr_supported: true/false
-gvl_id: 111
+gvl_id: none
 usp_supported: true/false
 coppa_supported: true/false
 schain_supported: true/false
@@ -1098,11 +1099,12 @@ dchain_supported: true/false
 userId: (list of supported vendors)
 media_types: banner, video, native
 safeframes_ok: true/false
-bidder_supports_deals: true/false
+deals_supported: true/false
+floors_supported: true/false
+fpd_supported: true/false
 pbjs: true/false
 pbs: true/false
 prebid_member: true/false
-gvl_id: none
 ---
 ### Note:
 
diff --git a/dev-docs/bidder-data.csv b/dev-docs/bidder-data.csv
index 0cbf9761ab..b633024b54 100644
--- a/dev-docs/bidder-data.csv
+++ b/dev-docs/bidder-data.csv
@@ -2,6 +2,6 @@
 layout: none
 search: exclude
 ---
-bidder-code,bidder-name,banner,video,native,gdpr,schain,coppa,usp,safeframes,deals,client-adapter,server-adapter,user-ids,usp,mobile-apps,floors,prebid-member
-{% assign bidder_pages = site.pages | where: "layout", "bidder" %}{% for page in bidder_pages %}{{ page.biddercode }},{{ page.title }},{% if page.media_types contains 'banner' %}yes{% else %}no{% endif %},{% if page.media_types contains 'video' %}yes{% else %}no{% endif %},{% if page.media_types contains 'native' %}yes{% else %}no{% endif %},{% if page.gdpr_supported == true %}yes{% else %}no{% endif %},{% if page.schain_supported  == true %}yes{% else %}no{% endif %},{% if page.coppa_supported == true %}yes{% else %}no{% endif %},{% if page.usp_supported == true %}yes{% else %}no{% endif %},{% if page.safeframes_ok and page.safeframes_ok == false %}no{% elsif page.safeframes_ok and page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %},{% if page.bidder_supports_deals and page.bidder_supports_deals == false %}no{% else %}yes{% endif %},{% if page.pbjs == true %}yes{% else %}no{% endif %},{% if page.pbs == true %}yes{% else %}no{% endif %},{% if page.userIds and page.userIds != '' %}"{{page.userIds}}"{% else %}none{% endif %},{% if page.usp_supported == true %}yes{% else %}no{% endif %},{% if page.pbs_app_supported and page.pbs_app_supported == false %}no{% elsif page.pbs_app_supported and page.pbs_app_supported == true %}yes{% elsif page.pbs and page.pbs == false %}no{% elsif page.pbs==nil %}no{% else %}check with bidder{% endif %},{% if page.getFloor == true %}yes{% else %}no{% endif %},{% if page.prebid_member == true %}yes{% else %}no{% endif %}
+bidder-code,bidder-name,banner,video,native,gdpr,schain,coppa,usp,safeframes,deals,client-adapter,server-adapter,user-ids,usp,mobile-apps,floors,fpd,prebid-member
+{% assign bidder_pages = site.pages | where: "layout", "bidder" %}{% for page in bidder_pages %}{{ page.biddercode }},{{ page.title }},{% if page.media_types contains 'banner' %}yes{% else %}no{% endif %},{% if page.media_types contains 'video' %}yes{% else %}no{% endif %},{% if page.media_types contains 'native' %}yes{% else %}no{% endif %},{% if page.gdpr_supported == true %}yes{% else %}no{% endif %},{% if page.schain_supported  == true %}yes{% else %}no{% endif %},{% if page.coppa_supported == true %}yes{% else %}no{% endif %},{% if page.usp_supported == true %}yes{% else %}no{% endif %},{% if page.safeframes_ok and page.safeframes_ok == false %}no{% elsif page.safeframes_ok and page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %},{% if page.deals_supported and page.deals_supported == false %}no{% else %}yes{% endif %},{% if page.pbjs == true %}yes{% else %}no{% endif %},{% if page.pbs == true %}yes{% else %}no{% endif %},{% if page.userIds and page.userIds != '' %}"{{page.userIds}}"{% else %}none{% endif %},{% if page.usp_supported == true %}yes{% else %}no{% endif %},{% if page.pbs_app_supported and page.pbs_app_supported == false %}no{% elsif page.pbs_app_supported and page.pbs_app_supported == true %}yes{% elsif page.pbs and page.pbs == false %}no{% elsif page.pbs==nil %}no{% else %}check with bidder{% endif %},{% if page.floors_supported == true %}yes{% else %}no{% endif %},{% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %},{% if page.prebid_member == true %}yes{% else %}no{% endif %}
 {% endfor %}
diff --git a/dev-docs/bidders.md b/dev-docs/bidders.md
index 98cb8f9906..523c77f224 100644
--- a/dev-docs/bidders.md
+++ b/dev-docs/bidders.md
@@ -41,7 +41,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "0" or firstletter == "1" or firstletter == "2" or firstletter == "3" or firstletter == "4" or firstletter == "5" or firstletter == "6" or firstletter == "7" or firstletter == "8" or firstletter == "9" or firstletter == "a" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -52,7 +52,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "b" or firstletter == "c" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -63,7 +63,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "d" or firstletter == "e" or firstletter == "f" or firstletter == "g" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -74,7 +74,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "h" or firstletter == "i" or firstletter == "j" or firstletter == "k" or firstletter == "l" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -85,7 +85,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "m" or firstletter == "n" or firstletter == "o" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -96,7 +96,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "p" or firstletter == "q" or firstletter == "r" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -107,7 +107,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "s" or firstletter == "t" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
@@ -118,7 +118,7 @@ var AutocompleteList = [{% for page in bidder_pages %}{ label: '{{ page.title }}
   {% assign firstletter = page.title | slice:0 | downcase %}
   {% unless firstletter == "u" or firstletter == "v" or firstletter == "w" or firstletter == "x" or firstletter == "y" or firstletter == "z" %}{% continue %}{% endunless %}
   <li>
-  <a href="bidders/{{ page.biddercode }}">{{ page.title }}</a>
+  <a href="{{ page.url }}">{{ page.title }}</a>
   </li>
 {% endfor %}
 </ul>
diff --git a/dev-docs/bidders/33across.md b/dev-docs/bidders/33across.md
index 17d07de9f0..cc457b8713 100644
--- a/dev-docs/bidders/33across.md
+++ b/dev-docs/bidders/33across.md
@@ -7,7 +7,7 @@ pbs: true
 biddercode: 33across
 media_types: banner, video
 gdpr_supported: true
-getFloor: true
+floors_supported: true
 schain_supported: true
 usp_supported: true
 userIds: all
diff --git a/dev-docs/bidders/aceex.md b/dev-docs/bidders/aceex.md
index 23da889ad2..e380d3aa54 100644
--- a/dev-docs/bidders/aceex.md
+++ b/dev-docs/bidders/aceex.md
@@ -10,7 +10,7 @@ schain_supported: true
 userId: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: false
 pbs: true
 ---
diff --git a/dev-docs/bidders/acuityads.md b/dev-docs/bidders/acuityads.md
index a6f10c6e20..95d4784821 100644
--- a/dev-docs/bidders/acuityads.md
+++ b/dev-docs/bidders/acuityads.md
@@ -10,7 +10,7 @@ schain_supported: true
 userId: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: false
 pbs: true
 ---
diff --git a/dev-docs/bidders/adagio.md b/dev-docs/bidders/adagio.md
index 529051555c..8c311afc1a 100644
--- a/dev-docs/bidders/adagio.md
+++ b/dev-docs/bidders/adagio.md
@@ -6,7 +6,7 @@ pbjs: true
 biddercode: adagio
 media_types: banner, native, video
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, pubProvidedId, sharedId, unifiedId
-getFloor: true
+floors_supported: true
 gdpr_supported: true
 usp_supported: true
 coppa_supported: true
@@ -14,6 +14,7 @@ schain_supported: true
 gvl_id: 617
 prebid_member: true
 pbs: true
+fpd_supported: true
 ---
 
 ### Note
diff --git a/dev-docs/bidders/adf.md b/dev-docs/bidders/adf.md
index 674a46caa9..128386ea0a 100644
--- a/dev-docs/bidders/adf.md
+++ b/dev-docs/bidders/adf.md
@@ -13,6 +13,8 @@ schain_supported: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, sharedId, unifiedId
 gvl_id: 50
 prevBiddercode: adformOpenRTB
+floors_supported: true
+fpd_supported: true
 ---
 
 ### Bid params
diff --git a/dev-docs/bidders/adgeneration.md b/dev-docs/bidders/adgeneration.md
index 812cfbecd7..8ff03a0902 100644
--- a/dev-docs/bidders/adgeneration.md
+++ b/dev-docs/bidders/adgeneration.md
@@ -6,7 +6,6 @@ pbjs: true
 pbs: true
 biddercode: adgeneration
 media_types: native
-pbjs_version_notes: not in 5.x
 ---
 
 
diff --git a/dev-docs/bidders/adhash.md b/dev-docs/bidders/adhash.md
index 93b4dd61bc..f341d3e6de 100644
--- a/dev-docs/bidders/adhash.md
+++ b/dev-docs/bidders/adhash.md
@@ -5,7 +5,7 @@ description: Prebid AdHash Bidder Adapter
 pbjs: true
 biddercode: adhash
 safeframes_ok: false
-pbjs_version_notes: not in 5.x
+gdpr_supported: true
 ---
 
 ### Note
diff --git a/dev-docs/bidders/admixer.md b/dev-docs/bidders/admixer.md
index 564b39711d..67ebf06294 100644
--- a/dev-docs/bidders/admixer.md
+++ b/dev-docs/bidders/admixer.md
@@ -9,6 +9,7 @@ media_types: video
 gdpr_supported: true
 usp_supported: true
 schain_supported: true
+fpd_supported: true
 gvl_id: 511
 ---
 
diff --git a/dev-docs/bidders/adnuntius.md b/dev-docs/bidders/adnuntius.md
index cdb2766ccd..08603cfcbe 100644
--- a/dev-docs/bidders/adnuntius.md
+++ b/dev-docs/bidders/adnuntius.md
@@ -3,9 +3,12 @@ layout: bidder
 title: Adnuntius
 description: Prebid Adnuntius Bidder Adaptor
 pbjs: true
+pbs: true
 biddercode: adnuntius
 media_types: banner
 gdpr_supported: true
+fpd_supported: true
+gvl_id: 855
 ---
 
 ### Bid Params
@@ -53,23 +56,44 @@ Here's an example of sending targeting information about categories to adnuntius
 There's an option to send segment id in the bidder config that will be picked up and sent to the ad server. Below is an example on how to do this:
 
 ```
+pbjs.setBidderConfig({
+    bidders: ['adnuntius', 'bidderB'],
+    config: {
+        ortb2: {
+            user: {
+                data: [{
+                    name: "adnuntius",
+                    segment: [
+                        { id: "1" },
+                        { id: "2" }
+                    ]
+                }]
+            }
+        }
+    }
+});
+```
+
+### Prebid Server Test Request
 
-			pbjs.setBidderConfig({
-				bidders: ['adnuntius', 'bidderB'],
-				config: {
-					ortb2: {
-						user: {
-							data: [{
-								name: "adnuntius",
-								segment: [
-									{ id: "1" },
-									{ id: "2" }
-								]
-							}]
-						}
-					}
-				}
-			});
+The following test parameters can be used to verify that Prebid Server is working properly with the server-side Adnuntius adapter. the `auId` below will not return a creative. Please substitute it with your own.
 
-´´´
+```
+"imp": [{
+    "id": "impression-id",
+    "banner": {
+        "format": [{
+            "w": 980,
+            "h": 240
+        }, {
+            "w": 980,
+            "h": 360
+        }]
+    },
+    "ext": {
+        "adnuntius": {
+            "auId": "abc123"
+        }
+    }
+}]
 ```
diff --git a/dev-docs/bidders/adpone.md b/dev-docs/bidders/adpone.md
index 608b228ff1..c2da708ebd 100644
--- a/dev-docs/bidders/adpone.md
+++ b/dev-docs/bidders/adpone.md
@@ -5,7 +5,7 @@ description: Prebid Adpone Bidder Adaptor
 pbjs: true
 pbs: true
 biddercode: adpone
-bidder_supports_deals: false
+deals_supported: false
 media_types: banner
 gvl_id: 799
 ---
diff --git a/dev-docs/bidders/adquery.md b/dev-docs/bidders/adquery.md
new file mode 100644
index 0000000000..8ab327d42b
--- /dev/null
+++ b/dev-docs/bidders/adquery.md
@@ -0,0 +1,19 @@
+---
+layout: bidder
+title: Adquery
+description: Prebid Adquery Bidder Adaptor
+pbjs: true
+biddercode: adquery
+gdpr_supported: true
+usp_supported: true
+schain_supported: true
+gvl_id: 902
+---
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name          | Scope    | Description   | Example                                   | Type      |
+|---------------|----------|---------------|-------------------------------------------|-----------|
+| `placementId` | required | Placement ID  | `6d93f2a0e5f0fe2cc3a6e9e3ade964b43b07f897`| `string`  |
+| `type`        | required | Ad Type       | `banner300x250`                           | `string`  |
diff --git a/dev-docs/bidders/adrelevantis.md b/dev-docs/bidders/adrelevantis.md
index 97ceab7c8a..1d132f2b03 100644
--- a/dev-docs/bidders/adrelevantis.md
+++ b/dev-docs/bidders/adrelevantis.md
@@ -4,6 +4,7 @@ title: Adrelevantis
 description: Prebid Adrelevantis (adrelevantis.xyz) Bidder Adaptor
 biddercode: adrelevantis
 media_types: banner, video, native
+fpd_supported: true
 pbjs: true
 ---
 
diff --git a/dev-docs/bidders/adriver.md b/dev-docs/bidders/adriver.md
index 3461aceb2c..1a69fb4108 100644
--- a/dev-docs/bidders/adriver.md
+++ b/dev-docs/bidders/adriver.md
@@ -4,9 +4,9 @@ title: adriver
 description: Adriver adapter
 biddercode: adriver
 pbjs: true
-bidder_supports_deals: true
+deals_supported: true
 userIds: sharedId, id5Id, uid2Id
-getFloor: true
+floors_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/adxcg.md b/dev-docs/bidders/adxcg.md
index 9f85e7170e..f7803f0ac5 100644
--- a/dev-docs/bidders/adxcg.md
+++ b/dev-docs/bidders/adxcg.md
@@ -2,7 +2,7 @@
 layout: bidder
 title: adxcg
 description: Prebid adxcg bidder adaptor
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/adyoulike.md b/dev-docs/bidders/adyoulike.md
index cdfc18ccca..a8f6b5a454 100644
--- a/dev-docs/bidders/adyoulike.md
+++ b/dev-docs/bidders/adyoulike.md
@@ -8,6 +8,7 @@ media_types: banner, video, native
 biddercode: adyoulike
 gdpr_supported: true
 usp_supported: true
+floors_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/afp.md b/dev-docs/bidders/afp.md
new file mode 100644
index 0000000000..07e3d197ea
--- /dev/null
+++ b/dev-docs/bidders/afp.md
@@ -0,0 +1,201 @@
+---
+layout: bidder
+title: AFP
+description: Prebid AFP Bidder Adapter
+pbjs: true
+media_types: banner, video
+biddercode: afp
+safeframes_ok: false
+---
+
+### Note
+
+You can use this adapter to get a bid from AFP.
+Please reach out to your AFP account team before using this plugin to get placeId.
+The code below returns a demo ad.
+
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name                | Scope                                                   | Description                                                                                               | Example                                                                                                                                                                       | Type      |
+|---------------------|---------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|
+| `placeId`           | required                                                | Place id.                                                                                                 | '5af45ad34d506ee7acad0c26'                                                                                                                                                    | `string`  |
+| `placeType`         | required                                                | Place type.                                                                                               | 'In-image', 'In-image Max', 'In-content Banner', 'In-content Video', 'Out-content Video', 'In-content Stories', 'Action Scroller', 'Action Scroller Light', 'Just Banner'     | `string`  |
+| `placeContainer`    | required (if the frame is not safe)                     | The container of the place where the ad will be displayed. The css selector is specified as the value.    | '#container'                                                                                                                                                                  | `string`  |
+| `imageUrl`          | required (for 'In-image', 'In-image Max' placeType)     | URL of the image on which the banner will be displayed.                                                   | 'https://creative.astraone.io/files/default_image-1-600x400.jpg'                                                                                                              | `string`  |
+| `imageWidth`        | required (for 'In-image', 'In-image Max' placeType)     | Image width.                                                                                              | 600                                                                                                                                                                           | `integer` |
+| `imageHeight`       | required (for 'In-image', 'In-image Max' placeType)     | Image height.                                                                                             | 400                                                                                                                                                                           | `integer` |
+
+
+### InImage Example page
+
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js In-image Example</title>
+	<script async src="prebid.js"></script>
+	<script>
+		var adUnits = [{
+			code: 'iib-target',
+			mediaTypes: {
+				banner: {
+					sizes: [0, 0],
+				}
+			},
+			bids: [{
+				bidder: "afp",
+				params: {
+					placeType: "In-image",
+					placeId: "613221112871613d1517d181",
+					placeContainer: '#iib-container',
+					imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+					imageWidth: 1000,
+					imageHeight: 524,
+				}
+			}]
+		},{
+			code: 'jb-target',
+			mediaTypes: {
+				banner: {
+					sizes: [[300, 250]],
+				}
+			},
+			bids: [{
+				bidder: "afp",
+				params: {
+					placeType: "Just Banner",
+					placeId: "6139ae832871613d1517dee9", // id from personal account
+					placeContainer: '#jb-container',
+				}
+			}]
+		}];
+		
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+		
+		pbjs.que.push(function() {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({
+				bidsBackHandler: function (e) {
+					if (pbjs.adserverRequestSent) return;
+					pbjs.adserverRequestSent = true;
+					var params = pbjs.getAdserverTargetingForAdUnitCode("iib-target");
+					var iframe = document.getElementById("iib-target");
+					
+					if (params && params['hb_adid']) {
+						pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+					}
+					
+					params = pbjs.getAdserverTargetingForAdUnitCode("jb-target");
+					iframe = document.getElementById("jb-target");
+					
+					if (params && params['hb_adid']) {
+						pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<h2>In-image</h2>
+<div class="container-wrapper">
+	<div id="iib-container" style="max-width: 600px;">
+		<img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+	</div>
+	<iframe id="iib-target" style="display: none;"></iframe>
+</div>
+
+<h2>Just Banner</h2>
+<div class="container-wrapper">
+	<div id="jb-container"></div>
+	<iframe id="jb-target" style="display: none;"></iframe>
+</div>
+</body>
+</html>
+```
+### InImage Example page with GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js In-image Example</title>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<script async src="prebid.js"></script>
+	<script>
+		var adUnits = [{
+			code: 'div-gpt-ad-1574864639578-0',
+			mediaTypes: {
+				banner: {
+					sizes: [0, 0],
+				}
+			},
+			bids: [{
+				bidder: "afp",
+				params: {
+					placeType: "In-image",
+					placeId: "613221112871613d1517d181",
+					placeContainer: '#iib-container',
+					imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+					imageWidth: 600,
+					imageHeight: 400,
+				}
+			}]
+		}];
+		
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+		
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+		
+		googletag.cmd.push(() => {
+			googletag.pubads().disableInitialLoad();
+		});
+		
+		pbjs.que.push(() => {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		});
+		
+		function sendAdServerRequest() {
+			googletag.cmd.push(() => {
+				pbjs.que.push(() => {
+					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+					googletag.pubads().refresh();
+				});
+			});
+		}
+		
+		googletag.cmd.push(() => {
+			googletag
+				.defineSlot('/19968336/header-bid-tag-0', [300, 250], 'div-gpt-ad-1574864639578-0')
+				.addService(googletag.pubads());
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+<body>
+<h2>In-image</h2>
+<div class="container-wrapper">
+	<div id="iib-container" style="width: 600px;">
+		<img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+	</div>
+	<div id="div-gpt-ad-1574864639578-0">
+		<script type="text/javascript">
+			googletag.cmd.push(function() {
+				googletag.display('div-gpt-ad-1574864639578-0');
+			});
+		</script>
+	</div>
+</div>
+</body>
+</html>                   
+```
diff --git a/dev-docs/bidders/amx.md b/dev-docs/bidders/amx.md
index bddf72a938..f8f3ff6574 100644
--- a/dev-docs/bidders/amx.md
+++ b/dev-docs/bidders/amx.md
@@ -14,6 +14,7 @@ media_types: banner, video
 pbjs: true
 pbs: true
 pbs_app_supported: true
+fpd_supported: true
 gvl_id: 737
 ---
 
@@ -22,8 +23,8 @@ gvl_id: 737
 {: .table .table-bordered .table-striped }
 | Name        | Scope    | Description                                                     | Example                         | Type     |
 |-------------|----------|-----------------------------------------------------------------|---------------------------------|----------|
+| `tagId`     | required | Tag ID                                                          | `'cHJlYmlkLm9yZw'`              | `string` |
 | `testMode`  | optional | Activate 100% fill ads                                          | `true`                          | `boolean`|
-| `tagId`     | optional | Tag ID                                                          | `'cHJlYmlkLm9yZw'`              | `string` |
 | `adUnitId`  | optional | Ad Unit ID used in reporting. Will default to `bid.adUnitCode`  | `'sticky_banner'`               | `string` |
 
 ### Test Parameters
@@ -37,4 +38,6 @@ To enable 100% fill test ads, you can use the following `params`:
 }
 ```
 
-Note that the `tagId` is case-sensitive. This will produce a bid at $10 with a test creative.
+This will produce a bid at $10 with a test creative.
+
+Note that the `tagId` is case-sensitive. Do not use `cHJlYmlkLm9yZw` in production environments: this ID is for testing only.
diff --git a/dev-docs/bidders/apacdex.md b/dev-docs/bidders/apacdex.md
index 73af7e1fab..a7a7da140b 100644
--- a/dev-docs/bidders/apacdex.md
+++ b/dev-docs/bidders/apacdex.md
@@ -9,7 +9,7 @@ gdpr_supported: true
 schain_supported: true
 usp_supported: true
 userIds: all
-getFloor: true
+floors_supported: true
 ---
 
 ### Table of Contents
@@ -32,6 +32,7 @@ getFloor: true
 | `siteId`*     | required | Publisher site ID from Apacdex                                                      | `'apacdex1234'`                                   | `string` |
 | `floorPrice`  | optional | CPM bidfloor in USD                                                                 | `0.03`                                            | `float`  |
 | `geo`         | optional | GEO data of device. See [Geo Object](#apacdex-geo-object) for details.              | `{"lat":17.98928,"lon":99.7741712,"accuracy":20}` | `object` |
+
 (*) Please do not use `placementId` and `siteId` at the same time.
 
 <a name="apacdex-geo-object" />
@@ -171,4 +172,4 @@ var outstreamAdUnit = {
 };
 ```
 mediaTypes.video object reference to section 3.2.7 Object: Video in the OpenRTB 2.5 document
-You must review all video parameters to ensure validity for your player and DSPs
\ No newline at end of file
+You must review all video parameters to ensure validity for your player and DSPs
diff --git a/dev-docs/bidders/appnexus.md b/dev-docs/bidders/appnexus.md
index 6e848d7215..0d9360bb28 100644
--- a/dev-docs/bidders/appnexus.md
+++ b/dev-docs/bidders/appnexus.md
@@ -10,7 +10,8 @@ userIds: criteo, unifiedId, netId, identityLink, flocId, uid2
 schain_supported: true
 coppa_supported: true
 usp_supported: true
-getFloor: true
+floors_supported: true
+fpd_supported: true
 pbjs: true
 pbs: true
 gvl_id: 32
diff --git a/dev-docs/bidders/aso.md b/dev-docs/bidders/aso.md
index c1e59bccab..8e4fae6934 100644
--- a/dev-docs/bidders/aso.md
+++ b/dev-docs/bidders/aso.md
@@ -7,10 +7,10 @@ gdpr_supported: true
 usp_supported: true
 media_types: video
 safeframes_ok: true
-bidder_supports_deals: false
+deals_supported: false
 pbjs: true
 pbs: false
-getFloor: true
+floors_supported: true
 ---
 ### Note:
 
@@ -55,4 +55,4 @@ pbjs.setConfig({
         url: 'https://prebid.adnxs.com/pbc/v1/cache'
     }
 });
-```
\ No newline at end of file
+```
diff --git a/dev-docs/bidders/automatad.md b/dev-docs/bidders/automatad.md
index cd1c2045b4..27714c6d15 100644
--- a/dev-docs/bidders/automatad.md
+++ b/dev-docs/bidders/automatad.md
@@ -5,6 +5,7 @@ description: Automatad OpenRTB Bid Adapter
 biddercode: automatad 
 pbjs: true
 media_types: banner
+fpd_supported: true
 ---
 
 #### Bid Params
diff --git a/dev-docs/bidders/beachfront.md b/dev-docs/bidders/beachfront.md
index 439bd85d1e..aa28971a92 100644
--- a/dev-docs/bidders/beachfront.md
+++ b/dev-docs/bidders/beachfront.md
@@ -4,7 +4,7 @@ title: Beachfront
 description: Prebid Beachfront Bidder Adapter
 biddercode: beachfront
 media_types: video
-getFloor: true
+floors_supported: true
 gdpr_supported: true
 usp_supported: true
 userIds: unifiedId, identityLink, uid2, haloId
diff --git a/dev-docs/bidders/beop.md b/dev-docs/bidders/beop.md
index f1728716d5..3f7786d8b7 100644
--- a/dev-docs/bidders/beop.md
+++ b/dev-docs/bidders/beop.md
@@ -4,6 +4,7 @@ title: BeOp
 description: BeOp Bidder Adaptor
 pbjs: true
 biddercode: beop
+fpd_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/between.md b/dev-docs/bidders/between.md
index 59eac200bd..b37304b1b5 100644
--- a/dev-docs/bidders/between.md
+++ b/dev-docs/bidders/between.md
@@ -8,9 +8,10 @@ biddercode: between
 schain_supported: true
 gdpr_supported: true
 pbs_app_supported: true
-userIds: sharedId
+userIds: all
 gvl_id: 724
 usp_supported: true
+safeframes_ok: false
 ---
 
 ### Prebid.js Bid Params
@@ -19,8 +20,6 @@ usp_supported: true
 | Name          | Scope    | Description | Example | Type     |
 |---------------|----------|-------------|---------|----------|
 | `s` | required |  Section ID from Between SSP control panel | 999999 | `integer` |
-| `w`        | required | width of placement(Number)                | 240       |
-| `h`        | required | height of placement(Number)               | 400       |
 
 ### Prebid-Server Bid Params
 
diff --git a/dev-docs/bidders/bidmachine.md b/dev-docs/bidders/bidmachine.md
index c314667874..82f1dd997e 100644
--- a/dev-docs/bidders/bidmachine.md
+++ b/dev-docs/bidders/bidmachine.md
@@ -11,7 +11,7 @@ schain_supported: true
 dchain_supported: false
 media_types: banner, video
 safeframes_ok: true
-bidder_supports_deals: false
+deals_supported: false
 pbjs: false
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/bizzclick.md b/dev-docs/bidders/bizzclick.md
index ca37393154..57846d529e 100644
--- a/dev-docs/bidders/bizzclick.md
+++ b/dev-docs/bidders/bizzclick.md
@@ -9,7 +9,7 @@ coppa_supported: true
 schain_supported: true
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 ---
 
diff --git a/dev-docs/bidders/bliink.md b/dev-docs/bidders/bliink.md
new file mode 100644
index 0000000000..a75f4c10eb
--- /dev/null
+++ b/dev-docs/bidders/bliink.md
@@ -0,0 +1,25 @@
+---
+layout: bidder
+title: BLIINK
+description: Prebid BLIINK Bidder Adaptor
+pbjs: true
+pbs: false
+media_types: video
+biddercode: bliink
+gdpr_supported: true
+usp_supported: false
+---
+
+### Note:
+The BLIINK Header Bidding adaptor requires setup and approval from the BLIINK team. Please reach out to your account manager for more informations.
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name        | Scope    | Description                      | Example                              | Type     |
+|-------------|----------|----------------------------------|--------------------------------------|----------|
+| `tagId` | required | The TagID from BLIINK. | `'32'` | `string` |
+| `placement` | required | The placement from BLIINK. | `'video'` | `string` |
+
+
+Same 'placement' parameter can be used from either prebid JS or prebid server.
diff --git a/dev-docs/bidders/bmtm.md b/dev-docs/bidders/bmtm.md
index df49410149..3d99a82779 100644
--- a/dev-docs/bidders/bmtm.md
+++ b/dev-docs/bidders/bmtm.md
@@ -4,7 +4,7 @@ title: Bright Mountain Media
 description: Prebid Bright Mountain Media Bidder Adapter
 biddercode: bmtm
 media_types: banner, video
-getFloor: true
+floors_supported: true
 schain_supported: true
 pbjs: true
 pbs: true
diff --git a/dev-docs/bidders/brave.md b/dev-docs/bidders/brave.md
index b9d9213a0b..e26f0f7249 100644
--- a/dev-docs/bidders/brave.md
+++ b/dev-docs/bidders/brave.md
@@ -9,7 +9,7 @@ coppa_supported: true
 schain_supported: true
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: false
 ---
diff --git a/dev-docs/bidders/colossus.md b/dev-docs/bidders/colossus.md
index a01899d0af..e7b322df75 100644
--- a/dev-docs/bidders/colossus.md
+++ b/dev-docs/bidders/colossus.md
@@ -6,7 +6,7 @@ biddercode: colossus
 usp_supported: true
 schain_supported: true
 media_types: banner, video, native
-userIds: britepoolid, identityLink, unifiedId, id5Id
+userIds: britepoolid, identityLink, unifiedId, id5Id, uid2
 gdpr: true
 pbjs: false
 pbs: true
diff --git a/dev-docs/bidders/colossusssp.md b/dev-docs/bidders/colossusssp.md
index e64677b05d..50931a7c99 100644
--- a/dev-docs/bidders/colossusssp.md
+++ b/dev-docs/bidders/colossusssp.md
@@ -6,8 +6,9 @@ biddercode: colossusssp
 usp_supported: true
 schain_supported: true
 media_types: banner, video, native
-userIds: britepoolid, identityLink, unifiedId, id5Id
+userIds: britepoolid, identityLink, unifiedId, id5Id, uid2
 gdpr: true
+fpd_supported: true
 pbjs: true
 pbs: false
 ---
diff --git a/dev-docs/bidders/connectad.md b/dev-docs/bidders/connectad.md
index 2a8c0e1558..b5f67acab3 100644
--- a/dev-docs/bidders/connectad.md
+++ b/dev-docs/bidders/connectad.md
@@ -11,7 +11,7 @@ schain_supported: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 prebid_member: true
 safeframes_ok: true
-getFloor: true
+floors_supported: true
 pbjs: true
 pbs: true
 gvl_id: 138
diff --git a/dev-docs/bidders/contentexchange.md b/dev-docs/bidders/contentexchange.md
index 10ea1669c4..364ee93d6f 100644
--- a/dev-docs/bidders/contentexchange.md
+++ b/dev-docs/bidders/contentexchange.md
@@ -18,4 +18,4 @@ pbs_app_supported: false
 | Name           | Scope    | Description                                              | Example    | Type      |
 |----------------|----------|----------------------------------------------------------|------------|-----------|
 | `placementId` | required | Placement Id will be generated on ContentExchange Platform. | `'1234'`        | `string` |
-| `adFormat` | required | `[banner, video, native]` | `'banner'`        | `string` |
\ No newline at end of file
+| `adFormat` | required | `[banner, video, native]` | `'banner'`        | `string` |
diff --git a/dev-docs/bidders/criteo.md b/dev-docs/bidders/criteo.md
index fe5d109427..25221baaae 100644
--- a/dev-docs/bidders/criteo.md
+++ b/dev-docs/bidders/criteo.md
@@ -10,7 +10,8 @@ gdpr_supported: true
 usp_supported: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, pubProvidedId, sharedId, unifiedId
 prebid_member: true
-getFloor: false*
+floors_supported: false
+fpd_supported: true
 gvl_id: 91
 ---
 ### Notes
diff --git a/dev-docs/bidders/datablocks.md b/dev-docs/bidders/datablocks.md
index 761405f240..58aea81085 100644
--- a/dev-docs/bidders/datablocks.md
+++ b/dev-docs/bidders/datablocks.md
@@ -12,6 +12,7 @@ pbs_app_supported: true
 schain_supported: true
 usp_supported: true
 userIds: criteo,unifiedId,netId,pubcid
+fpd_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/districtmdmx.md b/dev-docs/bidders/districtmdmx.md
new file mode 100644
index 0000000000..fef2443cc5
--- /dev/null
+++ b/dev-docs/bidders/districtmdmx.md
@@ -0,0 +1,35 @@
+---
+layout: bidder
+title: DistrictmDMX
+description: Prebid DistrictmDMX Bidder Adaptor
+pbjs: true
+biddercode: districtmDMX
+gdpr_supported: true
+schain_supported: true
+floors_supported: true
+usp_supported: true
+coppa_supported: true
+userIds: britepoolId, criteo, id5Id, identityLink, intentiq, liveIntentId, netId, parrableId, pubCommonId, unifiedId
+---
+
+
+
+### Bid Params
+
+##### Prebid version 1.0 and above.
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description         | Example          |    Type   |
+|------------|----------|---------------------|------------------|-----------|
+| `dmxid`    | required | Placement Id        |  `100001`          | `integer` |
+| `memberid` | required | Account id          |  `100003`          | `integer` |
+
+##### Prebid 0.34~ legacy
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description             | Example          | Type      |
+|------------|----------|-------------------------|------------------|-----------|
+| `id`       | required | Placement ID            | `123456789`        | `integer` |
+| `floor`    | optional | Bid floor price         | `"1.00"`           | `string`  |
+| `revShare` | optional | Publisher Revenue Share | `"0.85"`           | `string`  |
+| `currency` | optional | Currency code           | `"usd"`            | `string`  |
diff --git a/dev-docs/bidders/epom.md b/dev-docs/bidders/epom.md
index 228670bceb..d1d5897a28 100644
--- a/dev-docs/bidders/epom.md
+++ b/dev-docs/bidders/epom.md
@@ -10,7 +10,7 @@ coppa_supported: true
 schain_supported: false
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: false
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/ergadx.md b/dev-docs/bidders/ergadx.md
new file mode 100644
index 0000000000..2aedf405a1
--- /dev/null
+++ b/dev-docs/bidders/ergadx.md
@@ -0,0 +1,27 @@
+---
+layout: bidder
+title: eRGADX
+description: eRGADX Bidder Adaptor
+pbjs: true
+pbs: true
+biddercode: ergadx
+aliasCode : adkernel
+media_types: banner, native, video
+gdpr_supported: true
+usp_supported: true
+coppa_supported: true
+pbs_app_supported: true
+schain_supported: true
+---
+
+### Note:
+
+The eRGADX bidding adapter requires setup and approval before implementation. Please reach out to <prashant.musale@erelego.com> for more details.
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name     | Scope    | Description           | Example                   | Type     |
+|----------|----------|-----------------------|---------------------------|----------|
+| `host`   | required | RTB host | `'cpm.ergadx.com'` | `string` |
+| `zoneId` | required | Zone Id           | 30164                 | `integer` |
diff --git a/dev-docs/bidders/etarget.md b/dev-docs/bidders/etarget.md
index 251697a776..41c3198529 100644
--- a/dev-docs/bidders/etarget.md
+++ b/dev-docs/bidders/etarget.md
@@ -6,6 +6,7 @@ pbjs: true
 biddercode: etarget
 media_types: banner, video
 gdpr_supported: true
+fpd_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/fluct.md b/dev-docs/bidders/fluct.md
index 9360ed72d2..5403970b0d 100644
--- a/dev-docs/bidders/fluct.md
+++ b/dev-docs/bidders/fluct.md
@@ -9,7 +9,6 @@ coppa_supported: false
 usp_supported: false
 schain_supported: true
 pbjs: true
-pbjs_version_notes: not in 5.x
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/getintent.md b/dev-docs/bidders/getintent.md
index 30fffcabfd..671ec6fe1f 100644
--- a/dev-docs/bidders/getintent.md
+++ b/dev-docs/bidders/getintent.md
@@ -5,7 +5,7 @@ description: Prebid GetIntent Bidder Adaptor
 pbjs: true
 biddercode: getintent
 media_types: video, banner
-getFloor: true
+floors_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/gothamads.md b/dev-docs/bidders/gothamads.md
index e3fabc29e7..d41aa86cbd 100644
--- a/dev-docs/bidders/gothamads.md
+++ b/dev-docs/bidders/gothamads.md
@@ -10,7 +10,7 @@ ccpa_supported: true
 schain_supported: true
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 ---
 
diff --git a/dev-docs/bidders/grid.md b/dev-docs/bidders/grid.md
index c6a619cc28..8ca173f0fd 100644
--- a/dev-docs/bidders/grid.md
+++ b/dev-docs/bidders/grid.md
@@ -9,10 +9,11 @@ media_types: banner, video
 gdpr_supported: true
 usp_supported: true
 schain_supported: true
-getFloor: true
+floors_supported: true
 userIds: all
 tcf2_supported: true
 coppa_supported: true
+fpd_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/gridNM.md b/dev-docs/bidders/gridNM.md
index 3524b8df87..fc92e91a17 100644
--- a/dev-docs/bidders/gridNM.md
+++ b/dev-docs/bidders/gridNM.md
@@ -7,6 +7,7 @@ biddercode: gridNM
 media_types: video
 gdpr_supported: true
 usp_supported: true
+fpd_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/gumgum.md b/dev-docs/bidders/gumgum.md
index b3427cf8b4..c655f75fd9 100644
--- a/dev-docs/bidders/gumgum.md
+++ b/dev-docs/bidders/gumgum.md
@@ -8,10 +8,11 @@ pbs_app_supported: true
 biddercode: gumgum
 media_types: banner, video
 schain_supported: true
-getFloor: true
+floors_supported: true
 userIds: unifiedId, identityLink
 gdpr_supported: true
 usp_supported: true
+fpd_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/huaweiads.md b/dev-docs/bidders/huaweiads.md
index 913f164f37..1211990c2b 100644
--- a/dev-docs/bidders/huaweiads.md
+++ b/dev-docs/bidders/huaweiads.md
@@ -6,7 +6,7 @@ biddercode: huaweiads
 gvl_id: 856
 media_types: banner, video, native
 safeframes_ok: false
-bidder_supports_deals: true
+deals_supported: true
 pbjs: false
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/impactify.md b/dev-docs/bidders/impactify.md
index 4cb59868c8..20c55f326b 100644
--- a/dev-docs/bidders/impactify.md
+++ b/dev-docs/bidders/impactify.md
@@ -3,7 +3,7 @@ layout: bidder
 title: Impactify
 description: Prebid Impactify Bidder Adapter
 pbjs: true
-pbs: false
+pbs: true
 biddercode: impactify
 gdpr_supported: true
 tcf2_supported: true
@@ -11,6 +11,7 @@ usp_supported: true
 schain_supported: true
 coppa_supported: true
 media_types: video
+userIds: criteo, id5Id, pubCommonId, unifiedId, uid2, netId
 gvl_id: 606
 ---
 
diff --git a/dev-docs/bidders/inmar.md b/dev-docs/bidders/inmar.md
index 23f028e296..f00dc47243 100644
--- a/dev-docs/bidders/inmar.md
+++ b/dev-docs/bidders/inmar.md
@@ -8,7 +8,8 @@ usp_supported: true
 userIds: identityLink, liveIntentId, unifiedId, pubCommonId, pubProvidedId, sharedId
 media_types: banner, video
 safeframes_ok: false
-bidder_supports_deals: true
+deals_supported: true
+fpd_supported: true
 pbjs: true
 ---
 ### Note:
diff --git a/dev-docs/bidders/integr8.md b/dev-docs/bidders/integr8.md
index 6f1e4a71ab..27662ef942 100644
--- a/dev-docs/bidders/integr8.md
+++ b/dev-docs/bidders/integr8.md
@@ -14,4 +14,4 @@ media_types: banner, video
 |---------------|----------|------------------------------------------------------------------------|--------------------|-----------|
 | `propertyId`  | required |Property id                                                             | `"12345"`          | `string`  |
 | `placementId` | required |Placement id                                                            | `"54321"`          | `string`  |
-| `data`        | optional |Catalog data (contents) and/or inventory data (custom key/value pairs)  | `{catalogs: [{ catalogId: "699229", items: ["193", "4", "1"] }], inventory: { category: ["tech"], query: ["iphone 12"] }}` | `object` |
\ No newline at end of file
+| `data`        | optional |Catalog data (contents) and/or inventory data (custom key/value pairs)  | `{catalogs: [{ catalogId: "699229", items: ["193", "4", "1"] }], inventory: { category: ["tech"], query: ["iphone 12"] }}` | `object` |
diff --git a/dev-docs/bidders/iqm.md b/dev-docs/bidders/iqm.md
index f4159f0ec0..a3251a5a72 100644
--- a/dev-docs/bidders/iqm.md
+++ b/dev-docs/bidders/iqm.md
@@ -80,4 +80,4 @@ var adUnits = [{
       }]
       };
 
-```
\ No newline at end of file
+```
diff --git a/dev-docs/bidders/iqzone.md b/dev-docs/bidders/iqzone.md
index d91e74b1f0..099cde3ba5 100644
--- a/dev-docs/bidders/iqzone.md
+++ b/dev-docs/bidders/iqzone.md
@@ -1,7 +1,7 @@
 ---
 layout: bidder
-title: IQZone
-description: Prebid IQZone Bidder Adapter
+title: IQzone
+description: Prebid IQzone Bidder Adapter
 biddercode: iqzone
 usp_supported: true
 gdpr_supported: true
@@ -12,9 +12,21 @@ pbs: true
 pbs_app_supported: true
 ---
 
-### Bid Params
+### Prebid.js Bid Params
 
 {: .table .table-bordered .table-striped }
-| Name           | Scope    | Description                                              | Example    | Type      |
-|----------------|----------|----------------------------------------------------------|------------|-----------|
-| `placementId` | required | Placement Id | `'0'`        | `string` |
+| Name          | Scope    | Description           | Example   | Type      |
+|---------------|----------|-----------------------|-----------|-----------|
+| `placementId`      | required | Placement Id         | `'0'`    | `'string'` |
+
+### Prebid server Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name          | Scope    | Description           | Example   | Type      |
+|---------------|----------|-----------------------|-----------|-----------|
+| `placementId`      | optional | Placement Id         | `'0'`    | `'string'` |
+| `endpointId`      | optional | Endpoint Id         | `'0'`    | `'string'` |
+
+### Note
+
+For the prebid server, you only need to use one parameter, placementId or endpointId
diff --git a/dev-docs/bidders/ix.md b/dev-docs/bidders/ix.md
index 006fac2fc4..c19447d1ee 100644
--- a/dev-docs/bidders/ix.md
+++ b/dev-docs/bidders/ix.md
@@ -10,9 +10,10 @@ pbs_app_supported: true
 schain_supported: true
 coppa_supported: true
 gdpr_supported: true
-getFloor: true
+floors_supported: true
 usp_supported: true
 media_types: banner, video
+fpd_supported: true
 gvl_id: 10
 prebid_member: yes
 ---
diff --git a/dev-docs/bidders/jixie.md b/dev-docs/bidders/jixie.md
index b9241665de..e2945d6bc5 100644
--- a/dev-docs/bidders/jixie.md
+++ b/dev-docs/bidders/jixie.md
@@ -5,7 +5,7 @@ description: Prebid Jixie Bidder Adaptor
 pbjs: true
 pbs: true
 biddercode: jixie
-bidder_supports_deals: false
+deals_supported: false
 media_types: banner, video
 gdpr_supported: false
 ---
diff --git a/dev-docs/bidders/justpremium.md b/dev-docs/bidders/justpremium.md
index 20732ff502..f5eebddc3c 100644
--- a/dev-docs/bidders/justpremium.md
+++ b/dev-docs/bidders/justpremium.md
@@ -6,6 +6,7 @@ pbjs: true
 biddercode: justpremium
 gdpr_supported: true
 usp_supported: true
+schain_supported: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 ---
 
diff --git a/dev-docs/bidders/kargo.md b/dev-docs/bidders/kargo.md
index 926a62f1a1..562d797b4d 100644
--- a/dev-docs/bidders/kargo.md
+++ b/dev-docs/bidders/kargo.md
@@ -4,6 +4,7 @@ title: Kargo
 description: Prebid Kargo Bidder Adaptor
 pbjs: true
 biddercode: kargo
+media_types: banner, video
 gdpr_supported: true
 userIds: unifiedId
 usp_supported: true
diff --git a/dev-docs/bidders/kobler.md b/dev-docs/bidders/kobler.md
index a93b1032b3..3a2951ce6d 100644
--- a/dev-docs/bidders/kobler.md
+++ b/dev-docs/bidders/kobler.md
@@ -5,8 +5,8 @@ description: Kobler Bidder Adapter
 biddercode: kobler
 pbjs: true
 media_types: banner
-getFloor: true
-bidder_supports_deals: true
+floors_supported: true
+deals_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/logicad.md b/dev-docs/bidders/logicad.md
index 57b554c012..f0c28c3825 100644
--- a/dev-docs/bidders/logicad.md
+++ b/dev-docs/bidders/logicad.md
@@ -6,7 +6,7 @@ pbjs: true
 pbs: true
 pbs_app_supported: true
 biddercode: logicad
-bidder_supports_deals: false
+deals_supported: false
 media_types: banner, native
 userIds: all
 gdpr_supported: false
diff --git a/dev-docs/bidders/marsmedia.md b/dev-docs/bidders/marsmedia.md
index a38b704088..8281cb732f 100644
--- a/dev-docs/bidders/marsmedia.md
+++ b/dev-docs/bidders/marsmedia.md
@@ -7,7 +7,7 @@ pbs: true
 biddercode: marsmedia
 media_types: video, banner
 gdpr_supported: true
-getFloor: true
+floors_supported: true
 schain_supported: true
 usp_supported: true
 coppa_supported: true
diff --git a/dev-docs/bidders/mathildeads.md b/dev-docs/bidders/mathildeads.md
index f4e21f84af..c7dbe99b03 100644
--- a/dev-docs/bidders/mathildeads.md
+++ b/dev-docs/bidders/mathildeads.md
@@ -17,4 +17,4 @@ pbs_app_supported: false
 {: .table .table-bordered .table-striped }
 | Name           | Scope    | Description                                              | Example    | Type      |
 |----------------|----------|----------------------------------------------------------|------------|-----------|
-| `placementId` | required | Placement Id will be generated on MathildeAds Platform. | `'1234'`        | `string` |
\ No newline at end of file
+| `placementId` | required | Placement Id will be generated on MathildeAds Platform. | `'1234'`        | `string` |
diff --git a/dev-docs/bidders/mediakeys.md b/dev-docs/bidders/mediakeys.md
index 931809f02a..8c9a8d5c81 100644
--- a/dev-docs/bidders/mediakeys.md
+++ b/dev-docs/bidders/mediakeys.md
@@ -6,14 +6,14 @@ biddercode: mediakeys
 media_types: banner
 gvl_id: 498
 pbjs: true
-getFloor: true
+floors_supported: true
 gdpr_supported: true
 usp_supported: true
 coppa_supported: true
 schain_supported: true
 safeframes_ok: true
 userIds: all
-
+fpd_supported: true
 ---
 ### Note:
 
diff --git a/dev-docs/bidders/medianet.md b/dev-docs/bidders/medianet.md
index 73de20eb45..594e349bc7 100644
--- a/dev-docs/bidders/medianet.md
+++ b/dev-docs/bidders/medianet.md
@@ -11,7 +11,8 @@ prebid_member: true
 pbjs: true
 gvl_id: 142
 schain_supported: true
-getFloor: true
+floors_supported: true
+fpd_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/mytarget.md b/dev-docs/bidders/mytarget.md
index cf96c21dff..d53cbca13a 100644
--- a/dev-docs/bidders/mytarget.md
+++ b/dev-docs/bidders/mytarget.md
@@ -4,7 +4,6 @@ title: myTarget
 description: Prebid myTarget Bidder Adapter
 pbjs: true
 biddercode: mytarget
-pbjs_version_notes: not in 5.x
 ---
 
 
diff --git a/dev-docs/bidders/nativo.md b/dev-docs/bidders/nativo.md
index 67d7921d18..9c72c55f07 100644
--- a/dev-docs/bidders/nativo.md
+++ b/dev-docs/bidders/nativo.md
@@ -18,5 +18,5 @@ The Nativo Bidder adapter requires setup before beginning. Please contact us at
 {: .table .table-bordered .table-striped }
 | Name          | Scope    | Description                                                                     | Example      | Type      |
 |---------------|----------|---------------------------------------------------------------------------------|--------------|-----------|
-| `placementId` | required | Publication placement ID value from the Nativo Platform                         |  `13144370`  | `integer` |
+| `placementId` | optional | Publication placement ID value from the Nativo Platform                         |  `13144370`  | `integer` |
 | `url`         | optional | Publication url value associated with placement ID value in the Nativo Platform |  `https://test-sites.internal.nativo.net/testing/prebid_adpater.html`  | `string` |
diff --git a/dev-docs/bidders/nextroll.md b/dev-docs/bidders/nextroll.md
index accca4ab35..c99e92a4b3 100644
--- a/dev-docs/bidders/nextroll.md
+++ b/dev-docs/bidders/nextroll.md
@@ -8,7 +8,6 @@ media_types: display, native
 gdpr_supported: false
 usp_supported: true
 prebid_member: true
-pbjs_version_notes: not in 5.x
 ---
 
 ### Bid Params
@@ -19,7 +18,7 @@ pbjs_version_notes: not in 5.x
 | `sellerId`     | required | The seller ID from NextRoll.Please reach out your NextRoll representative for more details.       | `'541459'`                  | `string` |
 | `publisherId`  | optional | The publisher ID from NextRoll.Please reach out your NextRoll representative for more details.    | `'956812'`                  | `string` |
 | `zoneId`       | optional | Descriptive or unique identifier for the ad position                                              | `'main-banner-505/600x160'` | `string` |
-| `bidfloor`     | optional | Per ad-unit bid floor                                                                             | `2.3`                       | `number` |
+| `bidfloor`     | optional | Per ad-unit bid floor, used if the floor module is not available                                  | `2.3`                       | `number` |
 
 #### Example of Banner Ad-unit
 ```
@@ -29,6 +28,17 @@ var adUnits = [
         mediaTypes: {
             banner: {sizes: [[300, 250], [160, 600]]}
         },
+        // If floors module is enabled
+        floors: {
+            currency: "USD",
+            schema: {
+                delimiter: "|",
+                fields: ["mediaType", "size"]
+            },
+            values: {
+                "*|*": 2.0
+            }
+        },
         bids: [{
             bidder: 'nextroll',
             params: {
diff --git a/dev-docs/bidders/nobid.md b/dev-docs/bidders/nobid.md
index 7f8cfd41dd..02d54e53c0 100644
--- a/dev-docs/bidders/nobid.md
+++ b/dev-docs/bidders/nobid.md
@@ -13,6 +13,7 @@ schain_supported: true
 coppa_supported: true
 userId: criteo, unifiedId, id5Id
 safeframes_ok: true
+fpd_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/ogury.md b/dev-docs/bidders/ogury.md
index 8b9865d7ab..a1ae8c5f42 100644
--- a/dev-docs/bidders/ogury.md
+++ b/dev-docs/bidders/ogury.md
@@ -8,11 +8,11 @@ gvl_id: 31
 usp_supported: false
 coppa_supported: false
 schain_supported: false
-getFloor: true
+floors_supported: true
 dchain_supported: false
 media_types: banner
 safeframes_ok: false
-bidder_supports_deals: false
+deals_supported: false
 pbjs: true
 pbs: false
 prebid_member: false
diff --git a/dev-docs/bidders/openx.md b/dev-docs/bidders/openx.md
index 318a44406b..3adddca5d9 100644
--- a/dev-docs/bidders/openx.md
+++ b/dev-docs/bidders/openx.md
@@ -10,9 +10,10 @@ schain_supported: true
 gdpr_supported: true
 usp_supported: true
 coppa_supported: true
-getFloor: true
+floors_supported: true
 userIds: admixerId, amxId, britepoolId, criteo, dapId, deepintentId, dmdId, fabrickId, flocId, haloId, id5Id, identityLink, idxId, intentIqId, liveIntentId, lotamePanoramaId, merkleId, mwOpenLinkId, netId, nextrollId, novatiq, parrableId, pubCommonId, quantcastId, sharedId, tapadId, uid2, unifiedId, verizonMediaId, zeotapIdPlus
 prebid_member: true
+fpd_supported: true
 gvl_id: 69
 ---
 
diff --git a/dev-docs/bidders/operaads.md b/dev-docs/bidders/operaads.md
index b10965607c..49393966e3 100644
--- a/dev-docs/bidders/operaads.md
+++ b/dev-docs/bidders/operaads.md
@@ -11,7 +11,7 @@ schain_supported: true
 dchain_supported: false
 media_types: banner, video, native
 safeframes_ok: false
-bidder_supports_deals: false
+deals_supported: false
 pbjs: true
 pbs: true
 prebid_member: false
@@ -28,4 +28,4 @@ If you have any questions regarding set up, please reach out to your account man
 |-------------|----------|------------------------|------------------|----------|
 | `placementId`| required | Placement Id          | `s12345678`      | `string` |
 | `endpointId`| required | Endpoint ID            | `ep1234566`      | `string` |
-| `publisherId`| required | Publisher ID          | `pub123456`      | `string` |
\ No newline at end of file
+| `publisherId`| required | Publisher ID          | `pub123456`      | `string` |
diff --git a/dev-docs/bidders/optout.md b/dev-docs/bidders/optout.md
index dc558f411a..a4a0ebb62c 100644
--- a/dev-docs/bidders/optout.md
+++ b/dev-docs/bidders/optout.md
@@ -6,6 +6,7 @@ pbjs: true
 pbs: true
 biddercode: optout
 gdpr_supported: true
+fpd_supported: true
 gvl_id: 227
 ---
 
diff --git a/dev-docs/bidders/ozone.md b/dev-docs/bidders/ozone.md
index 8b59183e35..d576a29689 100644
--- a/dev-docs/bidders/ozone.md
+++ b/dev-docs/bidders/ozone.md
@@ -8,7 +8,8 @@ media_types: banner
 gdpr_supported: true
 userIds: criteo, id5Id, tdid, identityLink, liveIntentId, parrableId, pubCommonId, lotamePanoramaId, sharedId, fabrickId
 gvl_id: 524
-bidder_supports_deals: true
+deals_supported: true
+fpd_supported: true
 
 ---
 
diff --git a/dev-docs/bidders/pangle.md b/dev-docs/bidders/pangle.md
index b7168ad589..6d4da22aea 100644
--- a/dev-docs/bidders/pangle.md
+++ b/dev-docs/bidders/pangle.md
@@ -8,7 +8,7 @@ coppa_supported: true
 schain_supported: false
 media_types: banner, video, native
 safeframes_ok: false
-bidder_supports_deals: false
+deals_supported: false
 pbjs: false
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/pixfuture.md b/dev-docs/bidders/pixfuture.md
index c718b385dc..58159bb843 100644
--- a/dev-docs/bidders/pixfuture.md
+++ b/dev-docs/bidders/pixfuture.md
@@ -8,6 +8,7 @@ gdpr_supported: true
 prebid_member: false
 coppa_supported: true
 usp_supported: true
+fpd_supported: true
 userIds: flocId, criteoId, unifiedId, id5Id, sharedId, identityLink, liveIntentId, fabrickId
 pbs: false
 pbjs: true
diff --git a/dev-docs/bidders/proxistore.md b/dev-docs/bidders/proxistore.md
index 172c18cc8b..1b111d30da 100644
--- a/dev-docs/bidders/proxistore.md
+++ b/dev-docs/bidders/proxistore.md
@@ -5,6 +5,7 @@ description: Prebid Proxistore Bidder Adapter
 pbjs: true
 biddercode: proxistore
 gdpr_supported: true
+fpd_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/pubgenius.md b/dev-docs/bidders/pubgenius.md
index 23cb4e5fab..3085968a32 100644
--- a/dev-docs/bidders/pubgenius.md
+++ b/dev-docs/bidders/pubgenius.md
@@ -5,7 +5,7 @@ description: Prebid pubGENIUS Bidder Adaptor
 pbjs: true
 biddercode: pubgenius
 media_types: banner
-getFloor: true
+floors_supported: true
 gdpr_supported: true
 usp_supported: true
 schain_supported: true
diff --git a/dev-docs/bidders/pubmatic.md b/dev-docs/bidders/pubmatic.md
index 0265738a9f..f8cbcd0a12 100644
--- a/dev-docs/bidders/pubmatic.md
+++ b/dev-docs/bidders/pubmatic.md
@@ -8,13 +8,14 @@ gdpr_supported: true
 usp_supported: true
 coppa_supported: true
 schain_supported: true
-getFloor: true
+floors_supported: true
 userIds: all
 prebid_member: true
 safeframes_ok: true
 pbjs: true
 pbs: true
 pbs_app_supported: true
+fpd_supported: true
 gvl_id: 76
 ---
 
diff --git a/dev-docs/bidders/pulsepoint.md b/dev-docs/bidders/pulsepoint.md
index c394d717f7..0c575f9994 100644
--- a/dev-docs/bidders/pulsepoint.md
+++ b/dev-docs/bidders/pulsepoint.md
@@ -7,7 +7,7 @@ gdpr_supported: true
 usp_supported: true
 schain_supported: true
 media_types: banner, video, native
-userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, parrableId, pubCommonId, unifiedId
+userIds: britepoolId, criteo, fabrickId, haloId, id5Id, identityLink, liveIntentId, lotamePanoramaId, merkleId, parrableId, pubCommonId, sharedId, unifiedId, verizonMediaId
 pbjs: true
 pbs: true
 gvl_id: 81
diff --git a/dev-docs/bidders/pwbid.md b/dev-docs/bidders/pwbid.md
index 48c08c33b4..26715707a2 100644
--- a/dev-docs/bidders/pwbid.md
+++ b/dev-docs/bidders/pwbid.md
@@ -12,7 +12,7 @@ schain_supported: true
 prebid_member: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, pubProvidedId, sharedId, unifiedId
 tcf1_supported: true
-getFloor: false
+floors_supported: false
 gvl_id: 842
 ---
 
diff --git a/dev-docs/bidders/quantumdex.md b/dev-docs/bidders/quantumdex.md
index 1119a035c4..bc03315282 100644
--- a/dev-docs/bidders/quantumdex.md
+++ b/dev-docs/bidders/quantumdex.md
@@ -10,8 +10,8 @@ gdpr_supported: true
 schain_supported: true
 usp_supported: true
 userIds: all
-getFloor: true
+floors_supported: true
 ---
 
 # Description
-Quantumdex is an aliased bidder of Apacdex bid adapter. Please refer to [Apacdex documentation](https://docs.prebid.org/dev-docs/bidders/apacdex) for bid parameters and implementation guide.
\ No newline at end of file
+Quantumdex is an aliased bidder of Apacdex bid adapter. Please refer to [Apacdex documentation](https://docs.prebid.org/dev-docs/bidders/apacdex) for bid parameters and implementation guide.
diff --git a/dev-docs/bidders/relaido.md b/dev-docs/bidders/relaido.md
index 451554d9d4..08ef84f34f 100644
--- a/dev-docs/bidders/relaido.md
+++ b/dev-docs/bidders/relaido.md
@@ -3,6 +3,7 @@ layout: bidder
 title: Relaido
 description: Prebid Relaido Bidder Adapter
 biddercode: relaido
+userIds: imuid
 pbjs: true
 media_types: banner, video
 ---
diff --git a/dev-docs/bidders/rise.md b/dev-docs/bidders/rise.md
index 0d2af523a2..01585fbb75 100644
--- a/dev-docs/bidders/rise.md
+++ b/dev-docs/bidders/rise.md
@@ -1,14 +1,16 @@
 ---
 layout: bidder
 title: Rise
-description: Prebid  Bidder Adaptor
+description: Prebid Bidder Adaptor
 pbjs: true
 biddercode: rise
-media_types: no-display, video
+media_types: video
 schain_supported: true
 gdpr_supported: true
 usp_supported: true
+floors_supported: true
 userIds: all
+fpd_supported: true
 gvl_id: 1043
 ---
 
@@ -25,7 +27,7 @@ The Rise adapter requires setup and approval. Please reach out to prebid-rise-en
 | ---- | ----- | ---- | ----------- | -------
 | `org` | required | String |  Rise publisher Id provided by your Rise representative  | "56f91cd4d3e3660002000033"
 | `floorPrice` | optional | Number |  Minimum price in USD. <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue | 2.00
-| `ifa` | optional | String |  The ID for advertisers (also referred to as "IDFA")  | "XXX-XXX"
+| `placementId` | optional | String |  A unique placement identifier  | "12345678"
 | `testMode` | optional | Boolean |  This activates the test mode  | false
 
 ## Example
@@ -45,7 +47,7 @@ var adUnits = [
           params: {
             org: '56f91cd4d3e3660002000033', // Required
             floorPrice: 5.00, // Optional
-            ifa: 'XXX-XXX', // Optional
+            placementId: '12345678', // Optional
             testMode: false // Optional
           }
         }]
@@ -56,18 +58,5 @@ var adUnits = [
 ### Configuration
 Rise recommends setting UserSync by iframe for monetization.
 
-For Prebid.js v1.15.0 and later:
-
-pbjs.setConfig({
-  userSync: {
-    filterSettings: {
-      iframe: {
-        bidders: '*',      // '*' represents all bidders
-        filter: 'include'
-      }
-    }
-  }
-});
-
 ### Versions
 Prebid versions 5.0-5.3 are not supported
diff --git a/dev-docs/bidders/roundel.md b/dev-docs/bidders/roundel.md
index 61fa4d03b5..fed8e9a1f5 100644
--- a/dev-docs/bidders/roundel.md
+++ b/dev-docs/bidders/roundel.md
@@ -22,4 +22,4 @@ Roundel is an aliased bidder for Index Exchange and must be configured alongside
 
 ## Bid Params
 Bidder params for roundel follow the same structure as the Index Exchange bidder. Please reference configuration examples [here](/dev-docs/bidders/ix).
- 
\ No newline at end of file
+ 
diff --git a/dev-docs/bidders/rubicon.md b/dev-docs/bidders/rubicon.md
index bacf84b2f8..aa23cbfb44 100644
--- a/dev-docs/bidders/rubicon.md
+++ b/dev-docs/bidders/rubicon.md
@@ -7,15 +7,16 @@ gdpr_supported: true
 usp_supported: true
 coppa_supported: true
 schain_supported: true
-getFloor: true
+floors_supported: true
 media_types: video
 userIds: all
 prebid_member: true
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 pbs_app_supported: true
+fpd_supported: true
 gvl_id: 52
 ---
 
diff --git a/dev-docs/bidders/seedingAlliance.md b/dev-docs/bidders/seedingAlliance.md
index bba20fe71b..0683e3a3d8 100644
--- a/dev-docs/bidders/seedingAlliance.md
+++ b/dev-docs/bidders/seedingAlliance.md
@@ -6,7 +6,6 @@ pbjs: true
 biddercode: seedingAlliance
 media_types: native
 gdpr_supported: true
-pbjs_version_notes: not in 5.x
 ---
 
 ### Bid params
diff --git a/dev-docs/bidders/sharethrough.md b/dev-docs/bidders/sharethrough.md
index f3f12448a7..9054f5e354 100644
--- a/dev-docs/bidders/sharethrough.md
+++ b/dev-docs/bidders/sharethrough.md
@@ -9,6 +9,7 @@ media_types: native
 schain_supported: true
 userIds: pubCommonId, unifiedId, identityLink, id5Id, sharedId, liveIntentId
 usp_supported: true
+fpd_supported: true
 pbjs: true
 pbs: true
 ---
diff --git a/dev-docs/bidders/slimcut.md b/dev-docs/bidders/slimcut.md
index c308a7322a..598794aeac 100644
--- a/dev-docs/bidders/slimcut.md
+++ b/dev-docs/bidders/slimcut.md
@@ -1,12 +1,11 @@
 ---
 layout: bidder
 title: Slimcut
-description: SlimCut Bidder Adaptor
+description: SlimCut Bidder Adapter
 pbjs: true
 biddercode: slimcut
 media_types: video, banner
 gdpr_supported: true
-pbjs_version_notes: not in 5.x
 ---
 
 ### Overview
diff --git a/dev-docs/bidders/smaato.md b/dev-docs/bidders/smaato.md
index 1959707e16..e8eab58473 100644
--- a/dev-docs/bidders/smaato.md
+++ b/dev-docs/bidders/smaato.md
@@ -13,7 +13,8 @@ pbjs: true
 pbs: true
 pbs_app_supported: true
 prebid_member: true
-getFloor: true
+floors_supported: true
+fpd_supported: true
 ---
 
 ### Table of Contents
diff --git a/dev-docs/bidders/smartadserver.md b/dev-docs/bidders/smartadserver.md
index 94b852f4f0..12db35618c 100644
--- a/dev-docs/bidders/smartadserver.md
+++ b/dev-docs/bidders/smartadserver.md
@@ -10,7 +10,7 @@ usp_supported: true
 userIds: britepoolId, criteo, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 pbjs: true
 pbs: true
-getFloor: true
+floors_supported: true
 ---
 
 ### Registration
diff --git a/dev-docs/bidders/smartyads.md b/dev-docs/bidders/smartyads.md
index 3b0738bee3..671cf75ef0 100644
--- a/dev-docs/bidders/smartyads.md
+++ b/dev-docs/bidders/smartyads.md
@@ -9,7 +9,7 @@ coppa_supported: true
 schain_supported: true
 media_types: banner, video, native
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 ---
diff --git a/dev-docs/bidders/sonobi.md b/dev-docs/bidders/sonobi.md
index a484ffb450..73d3b538ff 100644
--- a/dev-docs/bidders/sonobi.md
+++ b/dev-docs/bidders/sonobi.md
@@ -12,6 +12,7 @@ usp_supported: true
 coppa_supported: true
 schain_supported: true
 pbs_app_supported: true
+fpd_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/sortable.md b/dev-docs/bidders/sortable.md
index 95621f2f67..2ac98e8707 100644
--- a/dev-docs/bidders/sortable.md
+++ b/dev-docs/bidders/sortable.md
@@ -10,7 +10,7 @@ usp_supported: true
 schain_supported: true
 prebid_member: true
 gvl_id: 145
-getFloor: true
+floors_supported: true
 userIds: all
 ---
 
diff --git a/dev-docs/bidders/sovrn.md b/dev-docs/bidders/sovrn.md
index 3905d8c32e..98c383cbeb 100644
--- a/dev-docs/bidders/sovrn.md
+++ b/dev-docs/bidders/sovrn.md
@@ -11,7 +11,8 @@ userIds: all
 prebid_member: true
 schain_supported: true
 gvl_id: 13
-getFloor: true
+floors_supported: true
+fpd_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/spotx.md b/dev-docs/bidders/spotx.md
index 9a63dfb00d..db387ff88f 100644
--- a/dev-docs/bidders/spotx.md
+++ b/dev-docs/bidders/spotx.md
@@ -12,6 +12,7 @@ usp_supported: true
 safeframes_ok: false
 pbjs: true
 gvl_id: 165
+floors_supported: true
 pbjs_version_notes: avoid 4.31-4.35
 ---
 
@@ -32,7 +33,7 @@ Publishers using SpotX that haven't yet updated their ad server line items and t
 | `secure`             | optional | Boolean identifying whether the requests should be https or not (used to override the protocol if the page isn't secure).                                      | `true`                                                                                                                                                                                               | `boolean`   |
 | `mimes`              | optional | List of MIME types to allow in ad.                                                                                                                             | `['application/javascript', 'video/mp4', 'video/webm']`                                                                                                                                               | `array`     |
 | `ad_volume`          | optional | Value between 0 and 1 to denote the volume the ad should start at                                                                                             |    `0.7`                                                                                                                                                                                                  | `float`     |
-| `price_floor`        | optional | Set the current channel price floor in real time.                                                                                                             | `10`                                                                                                                                                                                                   | `integer`   |
+| `price_floor`        | optional | Set the current channel price floor in real time.                                                                                                             | `10`                                                                                                                                                                                                   | `float`   |
 | `hide_skin`          | optional | Set to true to hide the SpotX skin                                                                                                                            |                                                                                                                                                                                                      | `boolean`   |
 | `custom`             | optional | An object containing key-value pairs for reporting. See SpotX documentation [here](https://developer.spotxchange.com/content/local/docs/sdkDocs/DirectSdk/dsdk-custom-configs.md#custom-key-value-pair-reporting) |                                                                                                                                                                                                      | `object`    |
 | `min_duration`       | optional | Minimum video ad duration in seconds                                                                                                                            |                                                                                                                                                                                                      | `integer`   |
diff --git a/dev-docs/bidders/sspBC.md b/dev-docs/bidders/sspBC.md
index 41a319747a..18889255a4 100644
--- a/dev-docs/bidders/sspBC.md
+++ b/dev-docs/bidders/sspBC.md
@@ -4,9 +4,10 @@ title: sspBC
 description: Prebid sspBC Bidder Adaptor
 pbjs: true
 biddercode: sspBC
-media_types: banner
-getFloor: true
+media_types: banner, video, native
+floors_supported: true
 gdpr_supported: true
+fpd_supported: true
 gvl_id: 676
 ---
 
@@ -21,4 +22,4 @@ gvl_id: 676
 | `publisherId` | optional | publisher id               | `'728'`                     | `string`  |
 | `domain`      | optional | site domain                | `'somesite.com'`            | `string`  |
 | `page`        | optional | page url                   | `'somesite.com/index.html'` | `string`  |
-| `tmax`        | optional | tmax for server connection | `400`                       | `integer` |
\ No newline at end of file
+| `tmax`        | optional | tmax for server connection | `400`                       | `integer` |
diff --git a/dev-docs/bidders/stroeerCore.md b/dev-docs/bidders/stroeerCore.md
index 9c0bae38c6..307ccd4b25 100644
--- a/dev-docs/bidders/stroeerCore.md
+++ b/dev-docs/bidders/stroeerCore.md
@@ -13,7 +13,7 @@ prebid_member: false
 pbjs: true
 pbs: false
 gvl_id: 136
-bidder_supports_deals: true
+deals_supported: true
 ---
 
 ### Bid Params
diff --git a/dev-docs/bidders/targetvideo.md b/dev-docs/bidders/targetvideo.md
new file mode 100644
index 0000000000..945d941235
--- /dev/null
+++ b/dev-docs/bidders/targetvideo.md
@@ -0,0 +1,46 @@
+---
+layout: bidder
+title: TargetVideo
+description: Prebid TargetVideo Bidder Adaptor
+biddercode: targetVideo
+media_types: video
+gdpr_supported: true
+prebid_member: true
+userIds: criteo, unifiedId, netId, identityLink, flocId, uid2
+schain_supported: true
+coppa_supported: true
+usp_supported: true
+floors_supported: true
+pbjs: true
+pbs: true
+gvl_id: 32
+---
+
+### Table of Contents
+
+- [Bid Params](#targetvideo-bid-params)
+- [Video Object](#targetvideo-video-object)
+
+<a name="targetvideo-bid-params" />
+
+#### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name                | Scope    | Description                                                                                                                                                                   | Example                                               | Type             |
+|---------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------|------------------|
+| `placementId`       | required | The placement ID from TargetVideo.  You may identify a placement using the `invCode` and `member` instead of a placement ID. The `placementID` parameter can be either a `string` or `integer` for Prebid.js, however `integer` is preferred. Legacy code can retain the `string` value. **Prebid Server requires an integer value.**                                                    | `234234`                                            | `integer`         |
+
+<a name="targetvideo-video-object" />
+
+#### Video Object
+
+{: .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` |
+| `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` |
+| `frameworks` | Array of integers listing API frameworks supported by the publisher.  Allowed values: None: `0`; VPAID 1.0: `1`; VPAID 2.0: `2`; MRAID 1.0: `3`; MRAID 2.0: `4`; ORMMA: `5`; OMID 1.0 `6`. | `Array<integer>` |
diff --git a/dev-docs/bidders/teads.md b/dev-docs/bidders/teads.md
index ffa3ca3629..905567f301 100644
--- a/dev-docs/bidders/teads.md
+++ b/dev-docs/bidders/teads.md
@@ -10,7 +10,7 @@ schain_supported: true
 userIds: flocId, uid2Id
 media_types: banner, video
 gvl_id: 132
-bidder_supports_deals: true
+deals_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/triplelift.md b/dev-docs/bidders/triplelift.md
index 9406329245..24f4b522f3 100644
--- a/dev-docs/bidders/triplelift.md
+++ b/dev-docs/bidders/triplelift.md
@@ -7,18 +7,24 @@ gdpr_supported: true
 usp_supported: true
 coppa_supported: true
 schain_supported: true
-getFloor: true
+floors_supported: true
 media_types: banner, video
 userIds: criteo, identityLink, unifiedId, pubCommonId
 prebid_member: true
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 pbs_app_supported: true
+fpd_supported: true
 gvl_id: 28
 ---
 
+{% capture version2 %}
+The Triplelift Prebid Server bidding adapter and user sync endpoint require setup before beginning. Please contact us at prebid@triplelift.com.
+{% endcapture %}
+{% include alerts/alert_important.html content=version2 %}
+
 ### Bid Params
 
 {: .table .table-bordered .table-striped }
diff --git a/dev-docs/bidders/triplelift_native.md b/dev-docs/bidders/triplelift_native.md
index 09829e00cf..8a8c2e00af 100644
--- a/dev-docs/bidders/triplelift_native.md
+++ b/dev-docs/bidders/triplelift_native.md
@@ -8,12 +8,12 @@ tcf2_supported: true
 usp_supported: true
 coppa_supported: true
 schain_supported: true
-getFloor: true
+floors_supported: true
 media_types: banner, video, native
 userIds: criteo, identityLink, unifiedId
 prebid_member: true
 safeframes_ok: true
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/trustx.md b/dev-docs/bidders/trustx.md
index 7f530c9f1a..d0d938c60d 100644
--- a/dev-docs/bidders/trustx.md
+++ b/dev-docs/bidders/trustx.md
@@ -8,6 +8,7 @@ biddercode: trustx
 media_types: banner, video
 gdpr_supported: true
 usp_supported: true
+fpd_supported: true
 ---
 
 
diff --git a/dev-docs/bidders/ucfunnel.md b/dev-docs/bidders/ucfunnel.md
index 5d102e23c1..a825957ad8 100644
--- a/dev-docs/bidders/ucfunnel.md
+++ b/dev-docs/bidders/ucfunnel.md
@@ -15,7 +15,9 @@ gvl_id: 607
 pbs_app_supported: true
 ---
 
-### Bid params
+### Prebid JS
+
+#### Bid params
 
 {: .table .table-bordered .table-striped }
 | Name   | Scope    | Description                                     | Example | Type     |
@@ -46,3 +48,16 @@ Sizes set in the `adUnit` object will also apply to the ucfunnel bid requests.
   - [Banner Ads](https://cdn.aralego.net/ucfad/test/ucfunnel/compliance/pbjs_banner.html)
   - [Instream Video Ads](https://cdn.aralego.net/ucfad/test/ucfunnel/compliance/pbjs_video.html)
   - [Native Ads](https://cdn.aralego.net/ucfad/test/ucfunnel/compliance/pbjs_native.html)
+
+
+### Prebid server
+
+#### Bid params
+
+{: .table .table-bordered .table-striped }
+| Name   | Scope    | Description                                     | Example | Type     |
+|--------|----------|-------------------------------------------------|---------|----------|
+| `adunitid` | required | ID for ad unit |         | `string` |
+| `partnerid` | required | ID for partner |         | `string` |
+
+```
diff --git a/dev-docs/bidders/unruly.md b/dev-docs/bidders/unruly.md
index 855719bd4c..89bdd181cd 100644
--- a/dev-docs/bidders/unruly.md
+++ b/dev-docs/bidders/unruly.md
@@ -7,12 +7,12 @@ gdpr_supported: true
 usp_supported: true
 coppa_supported: false
 schain_supported: true
-getFloor: true
+floors_supported: true
 media_types: banner, video
 userIds: all
 prebid_member: false
 safeframes_ok: check with bidder
-bidder_supports_deals: check with bidder
+deals_supported: check with bidder
 pbjs: true
 pbs: true
 pbs_app_supported: true
diff --git a/dev-docs/bidders/valueimpression.md b/dev-docs/bidders/valueimpression.md
index 75e9352402..38b86c78ca 100644
--- a/dev-docs/bidders/valueimpression.md
+++ b/dev-docs/bidders/valueimpression.md
@@ -10,9 +10,9 @@ gdpr_supported: true
 schain_supported: true
 usp_supported: true
 userIds: all
-getFloor: true
+floors_supported: true
 pbs: true
 ---
 
 # Description
-Valueimpression is an aliased bidder of Apacdex bid adapter. Please refer to [Apacdex documentation](https://docs.prebid.org/dev-docs/bidders/apacdex) for bid parameters and implementation guide.
\ No newline at end of file
+Valueimpression is an aliased bidder of Apacdex bid adapter. Please refer to [Apacdex documentation](https://docs.prebid.org/dev-docs/bidders/apacdex) for bid parameters and implementation guide.
diff --git a/dev-docs/bidders/viewdeos.md b/dev-docs/bidders/viewdeos.md
new file mode 100644
index 0000000000..aacb4a2a6d
--- /dev/null
+++ b/dev-docs/bidders/viewdeos.md
@@ -0,0 +1,39 @@
+---
+layout: bidder
+title: Viewdeos Server
+description: Prebid Server ViewDeos Adapter
+pbjs: false
+pbs: true
+biddercode: viewdeos
+media_types: banner,video
+gdpr_supported: true
+gvl_id: 924
+---
+
+### Bid params
+
+{: .table .table-bordered .table-striped }
+| Name  | Scope    | Description                     | Example  | Type      |
+|-------|----------|---------------------------------|----------|-----------|
+| `aid` | required | The source ID from member zone | `350975` | `integer` |
+
+### Test Parameters
+```
+    var adUnits = [
+      // Banner adUnit
+      {
+        code: 'div-test-div',
+        mediaTypes: {
+          banner: {
+            sizes:[[300, 250]]
+          }
+        },
+        bids: [{
+          bidder: 'viewdeos',
+          params: {
+            aid: 672854
+          }
+        }]
+      }
+    ];
+```
diff --git a/dev-docs/bidders/viewdeosDX.md b/dev-docs/bidders/viewdeosDX.md
index 2756611309..3c8ee83b72 100644
--- a/dev-docs/bidders/viewdeosDX.md
+++ b/dev-docs/bidders/viewdeosDX.md
@@ -1,16 +1,16 @@
 ---
 layout: bidder
-title: Viewdeos
-description: Prebid ViewDeos Bidder Adaptor
+title: ViewdeosDX Client
+description: Prebid.js ViewDeos Bidder Adapter
 pbjs: true
-pbs: true
+pbs: false
 biddercode: viewdeosDX
 media_types: banner,video
 gdpr_supported: true
 gvl_id: 924
 ---
 
-Note that for Prebid Server, viewdeosDX is an alias of the Adtelligent server-side bid adapter. It has its own Prebid.js adapter.
+Note that for Prebid Server, use "viewdeos" bidder code.
 
 ### Bid params
 
diff --git a/dev-docs/bidders/visx.md b/dev-docs/bidders/visx.md
index 9fdb7cb190..f39b0db05d 100644
--- a/dev-docs/bidders/visx.md
+++ b/dev-docs/bidders/visx.md
@@ -9,7 +9,7 @@ gvl_id: 154
 schain_supported: true
 userIds: id5Id, unifiedId
 media_types: banner, video
-bidder_supports_deals: true
+deals_supported: true
 pbjs: true
 pbs: true
 ---
diff --git a/dev-docs/bidders/winr.md b/dev-docs/bidders/winr.md
index ba15ca619d..38a0bc7a59 100644
--- a/dev-docs/bidders/winr.md
+++ b/dev-docs/bidders/winr.md
@@ -9,9 +9,10 @@ userIds: criteo, unifiedId, netId, identityLink, flocId, uid2
 schain_supported: true
 coppa_supported: true
 usp_supported: true
-getFloor: true
+floors_supported: true
 pbjs: true
 safeframes_ok: false
+fpd_supported: true
 ---
 
 ### Note:
diff --git a/dev-docs/bidders/yahoossp.md b/dev-docs/bidders/yahoossp.md
new file mode 100644
index 0000000000..3b3fd3805e
--- /dev/null
+++ b/dev-docs/bidders/yahoossp.md
@@ -0,0 +1,18 @@
+---
+layout: bidder
+title: YahooSSP
+pbs: true
+media_types: banner
+biddercode: yahoossp
+prebid_member: true
+gdpr_supported: true
+gvl_id: 25
+---
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description            | Example | Type     |
+|------------|----------|------------------------|---------|----------|
+| dcn | required | Site ID provided by One Mobile | 'site1' | string |
+| pos | required | Placement ID | 'placement1' | string |
diff --git a/dev-docs/bidders/yieldmo.md b/dev-docs/bidders/yieldmo.md
index 18a5a691bb..9ec5b17793 100644
--- a/dev-docs/bidders/yieldmo.md
+++ b/dev-docs/bidders/yieldmo.md
@@ -4,17 +4,18 @@ title: Yieldmo
 description: Prebid Yieldmo Bidder Adaptor
 biddercode: yieldmo
 media_types: banner, video
-userIds: pubCommonId, unifiedId, criteo
+userIds: pubCommonId, unifiedId, criteo, sharedId
 gdpr_supported: true
 usp_supported: true
 schain_supported: true
 prebid_member: true
+fpd_supported: true
 pbjs: true
 pbs: true
 ---
 
 # Registration
-## In order to use Yieldmo adapter please reach out to your Yieldmo account's person or support@yieldmo.com for more information.
+### Note: In order to use Yieldmo adapter please reach out to your Yieldmo account's person or support@yieldmo.com for more information.
 <br/>
 ### Bid Params
 
@@ -52,7 +53,6 @@ In addition, Yieldmo adapter relies on parameters specified in the `mediaTypes.v
 |-------------------|----------|--------------------------------------------------------|-----------------|------------------|
 | `playerSize`      | required | Width and height of the player                         | `[640, 480]`    | `Array<integer>` |
 | `context`         | required | `instream` or `outstream ` are only supported                           | `instream`      | `string`         |
-
 ### Example of in-stream Video Ad-unit
 ```javascript
 var videoAdUnits = [{
@@ -77,7 +77,7 @@ var videoAdUnits = [{
   bids: [{
     bidder: 'yieldmo',
     params: {
-      placementId: '1524592390382976659' // required
+      placementId: '1524592390382976659',// required,
     }
   }]
 }];
@@ -88,23 +88,23 @@ var videoAdUnit = [{
   code: 'div-video-ad-1234567890',
   mediaTypes: {
       video: {
-          playerSize: [640, 480],   // required
+          playerSize: [640, 480],        // required
           context: 'outstream',
-          mimes: ['video/mp4'],      // required, array of strings
-          placement: 3,                      // required, integer ( 3,4,5 )
-          maxduration: 30,                   // required, integer
-          protocols: [2, 3],                 // required, array of integers
-          api: [2, 3],                       // required, array of integers
-          playbackmethod: [1,2]              // required, array of integers
+          mimes: ['video/mp4'],          // required, array of strings
+          placement: 3,                  // required, integer ( 3,4,5 )
+          maxduration: 30,               // required, integer
+          protocols: [2, 3],             // required, array of integers
+          api: [2, 3],                   // required, array of integers
+          playbackmethod: [1,2]          // required, array of integers
       }
   },
   bids: [{
     bidder: 'yieldmo',
     params: {
-      placementId: '1524592390382976659'  // required
+      placementId: '1524592390382976659',  // required
     }
   }]
 }];
 ```
 
-> Prebid out-stream demo - https://prebid-outstream-qa.yieldmo.com/prebid-outstream.html
+> [Prebid out-stream demo](https://prebid-outstream-qa.yieldmo.com/prebid-outstream.html)
diff --git a/dev-docs/bidders/zeta_global.md b/dev-docs/bidders/zeta_global.md
index 1167b31a9c..08a51def28 100644
--- a/dev-docs/bidders/zeta_global.md
+++ b/dev-docs/bidders/zeta_global.md
@@ -4,7 +4,7 @@ title: Zeta Global
 description: Zeta Global Prebid Bidder Adapter
 pbjs: true
 biddercode: zeta_global
-bidder_supports_deals: false
+deals_supported: false
 media_types: banner
 gdpr_supported: true
 tcf2_supported: true
diff --git a/dev-docs/bidders/zeta_global_ssp.md b/dev-docs/bidders/zeta_global_ssp.md
index 74c092c0fb..1a375294cc 100644
--- a/dev-docs/bidders/zeta_global_ssp.md
+++ b/dev-docs/bidders/zeta_global_ssp.md
@@ -4,13 +4,14 @@ title: Zeta Global Ssp
 description: Zeta Global Ssp Prebid Bidder Adapter
 pbjs: true
 biddercode: zeta_global_ssp
-bidder_supports_deals: false
+deals_supported: false
 media_types: banner
 gdpr_supported: true
 usp_supported: true
 coppa_supported: true
 userIds: all
 prebid_member: true
+fpd_supported: true
 gvl_id: 833
 ---
 
diff --git a/dev-docs/modules/gpt-pre-auction.md b/dev-docs/modules/gpt-pre-auction.md
index 6beebdd1ca..504b648e59 100644
--- a/dev-docs/modules/gpt-pre-auction.md
+++ b/dev-docs/modules/gpt-pre-auction.md
@@ -24,9 +24,9 @@ This module enables targeting and tracking at the ad server adunit level.
 Enabled by default if compiled into your package, this module will add the [Prebid Ad Slot](/features/pbAdSlot.html) and matching GAM ad unit name to each ad unit's first-party data before bid requests are sent to the adapters.
 
 * **Prebid.js Adapters** - will be able to utilize these values as:
-    * AdUnit.ortb2imp.ext.data.adserver.name="gam"
-    * AdUnit.ortb2imp.ext.data.adserver.adslot="/1111/home"
-    * AdUnit.ortb2imp.ext.data.pbadslot="/1111/home-left"
+    * AdUnit.ortb2Imp.ext.data.adserver.name="gam"
+    * AdUnit.ortb2Imp.ext.data.adserver.adslot="/1111/home"
+    * AdUnit.ortb2Imp.ext.data.pbadslot="/1111/home-left"
 * **Prebid Server Adapters** - will see the OpenRTB as:
     * imp[].ext.data.adserver.name
     * imp[].ext.data.adserver.adslot
@@ -43,7 +43,7 @@ Optional initialization parameters:
 {: .table .table-bordered .table-striped }
 | Param | Required? | Type | Description | Example |
 | enabled | no | boolean | allows turning off of module. Default value is true | true |
-| customGptSlotMatching | no | function | GPT slot matching function should match the customSlotMatching function sent to [setTargetingForGptAsync](/publisher-api-reference/setTargetingForGPTAsync.html) | |
+| customGptSlotMatching | no | function | GPT slot matching function should match the customSlotMatching function sent to [setTargetingForGptAsync](/dev-docs/publisher-api-reference/setTargetingForGPTAsync.html) | |
 | customPbAdSlot | no | function | Custom PB AdSlot function | |
 | mcmEnabled | no | boolean | Removes extra network IDs when Multiple Customer Management is active. Default is false. | true |
 
@@ -74,13 +74,13 @@ When this module is on, it uses the BEFORE_REQUEST_BIDS event to insert function
 
 If GPT slot matching succeeds:
 
-- it sets the Adunit ortb2imp.ext.data.adserver.name to 'gam'
-- it copies the resulting GPT slot name to ortb2imp.ext.data.adserver.adslot
+- it sets the Adunit ortb2Imp.ext.data.adserver.name to 'gam'
+- it copies the resulting GPT slot name to ortb2Imp.ext.data.adserver.adslot
 
-The customPbAdSlot function is called if it was specified, writing the results to ortb2imp.ext.data.pbadslot.
-If there's no customPbAdSlot, a default algorithm is used to determine ortb2imp.ext.data.pbadslot:
+The customPbAdSlot function is called if it was specified, writing the results to ortb2Imp.ext.data.pbadslot.
+If there's no customPbAdSlot, a default algorithm is used to determine ortb2Imp.ext.data.pbadslot:
 
-- first use the AdUnit's ortb2imp.ext.data.pbadslot if defined
+- first use the AdUnit's ortb2Imp.ext.data.pbadslot if defined
 - else, see if the AdUnit.code corresponds to a div and if so, try to retrieve a data element from the div called data-adslotid.
 - else if the GPT slot matching succeeded, use the GPT slot name
 - else, just use the AdUnit.code, assuming that that's the ad unit slot
diff --git a/dev-docs/modules/index.md b/dev-docs/modules/index.md
index c20609fb67..eebb751803 100644
--- a/dev-docs/modules/index.md
+++ b/dev-docs/modules/index.md
@@ -33,7 +33,7 @@ Prebid.org highly recommends that publishers utilize the following modules:
   <tbody>
 {% for page in module_pages %}{% if page.recommended == true %}
     <tr>
-      <td><a href="/dev-docs/modules/{{page.module_code}}.html"><strong>{{page.display_name}}</strong></a></td>
+      <td><a href="{{page.url}}"><strong>{{page.display_name}}</strong></a></td>
       <td>{{page.description}}</td>
     </tr>
 {% endif %}{% endfor %}
@@ -59,7 +59,7 @@ than others. See [the realTimeData setConfig](/dev-docs/publisher-api-reference/
   <tbody>
 {% for page in module_pages %}{% if page.recommended == true or page.vendor_specific == true %}{% continue %}{% endif %}
     <tr>
-      <td><a href="/dev-docs/modules/{{page.module_code}}.html"><strong>{{page.display_name}}</strong></a></td>
+      <td><a href="{{page.url}}"><strong>{{page.display_name}}</strong></a></td>
       <td>{{page.description}}</td>
       {% if page.module_type == "rtd" %}<td>yes</td>{% else %}<td>no</td>{% endif %}
     </tr>
@@ -80,7 +80,7 @@ These modules may require accounts with a service provider.
   <tbody>
 {% for page in module_pages %}{% if page.recommended == true %}{% continue %}{% endif %}{% if page.vendor_specific == true %}
     <tr>
-      <td><a href="/dev-docs/modules/{{page.module_code}}.html"><strong>{{page.display_name}}</strong></a></td>
+      <td><a href="{{page.url}}"><strong>{{page.display_name}}</strong></a></td>
       <td>{{page.description}}</td>
       {% if page.module_type == "rtd" %}<td>yes</td>{% else %}<td>no</td>{% endif %}
     </tr>
diff --git a/dev-docs/modules/pubCommonId.md b/dev-docs/modules/pubCommonId.md
index ca08fdb39c..455e89bb38 100644
--- a/dev-docs/modules/pubCommonId.md
+++ b/dev-docs/modules/pubCommonId.md
@@ -4,7 +4,7 @@ page_type: module
 title: Module - Publisher Common ID
 description: User ID persisted in first party domain
 module_code : pubCommonId
-display_name : Publisher Common ID (not in 5.x)
+display_name : Publisher Common ID (deprecated)
 enable_download : true
 sidebarType : 1
 ---
diff --git a/dev-docs/modules/timeoutRtdProvider.md b/dev-docs/modules/timeoutRtdProvider.md
new file mode 100644
index 0000000000..969b9311aa
--- /dev/null
+++ b/dev-docs/modules/timeoutRtdProvider.md
@@ -0,0 +1,152 @@
+---
+layout: page_v2
+title: Timeout Rtd Module
+description: Module for managing timeouts in real time
+page_type: module
+module_type: rtd
+module_code : timeoutRtdProvider
+enable_download : true
+sidebarType : 1
+---
+
+## Overview
+The timeout RTD module enables publishers to set rules that determine the timeout based on 
+certain features. It supports rules dynamically retrieved from a timeout provider as well as rules 
+set directly via configuration.
+Build the timeout RTD module into the Prebid.js package with: 
+```
+gulp build --modules=timeoutRtdProvider,rtdModule...
+```
+
+## Configuration
+The module is configured in the realTimeData.dataProviders object. The module will override 
+`bidderTimeout` in the pbjs config. 
+
+### Timeout Data Provider interface
+The timeout RTD module provides an interface of dynamically fetching timeout rules from 
+a data provider just before the auction begins. The endpoint url is set in the config just as in 
+the example below, and the timeout data will be used when making bid requests.
+ 
+```
+pbjs.setConfig({
+    ...
+    "realTimeData": {
+        "dataProviders": [{
+            "name": 'timeout',
+            "params": {
+                "endpoint": {
+                    "url": "http://{cdn-link}.json"
+                }
+            }
+        }
+    ]},
+    
+    // This value below will be modified by the timeout RTD module if it successfully 
+    // fetches the timeout data.  
+    "bidderTimeout": 1500, 
+    ...
+});
+```
+
+Sample Endpoint Response: 
+```
+{
+    "rules": {
+        "includesVideo": {
+            "true": 200,
+            "false": 50
+          },
+        "numAdUnits" : {
+            "1-5": 100,
+            "6-10": 200,
+            "11-15": 300
+        },
+        "deviceType": {
+            "2": 50,
+            "4": 100,
+            "5": 200
+        },
+        "connectionSpeed": {
+            "slow": 200,
+            "medium": 100,
+            "fast": 50,
+            "unknown": 10
+        },
+}
+```
+
+### Rule Handling:
+The rules retrieved from the endpoint will be used to add time to the `bidderTimeout` based on certain features such as 
+the user's deviceType, connection speed, etc. These rules can also be configured statically on page via a `rules` object.
+Note that the timeout Module will ignore the static rules if an endpoint url is provided. The timeout rules follow the 
+format:
+```
+{
+  '<feature>': {
+    '<key>': <milliseconds to be added to timeout>
+  }
+}
+```
+See bottom of page for examples.
+
+Currently supported features:
+
+|Name |Description | Keys | Example
+| :------------ | :------------ | :------------ |:------------ |
+| includesVideo | Adds time to the timeout based on whether there is a video ad unit in the auction or not | 'true'/'false'| { "true": 200, "false": 50 } | 
+| numAdUnits | Adds time based on the number of ad units. Ranges in the format `'lowerbound-upperbound` are accepted. This range is inclusive | numbers or number ranges | {"1": 50, "2-5": 100, "6-10": 200} |  
+| deviceType | Adds time based on device type| 2, 4, or 5| {"2": 50, "4": 100} |
+| connectionSpeed | Adds time based on connection speed. `connectionSpeed` defaults to 'unknown' if connection speed cannot be determined | slow, medium, fast, or unknown | { "slow": 200} |
+
+If there are multiple rules set, all of them would be used and any that apply will be added to the base timeout. For example, if the rules object contains:
+```
+{
+  "includesVideo": {
+      "true": 200,
+      "false": 50
+    },
+  "numAdUnits" : {
+      "1-3": 100,
+      "4-5": 200
+  }
+}
+```
+and there are 3 ad units in the auction, all of which are banner, then the timeout to be added will be 150 milliseconds (50 for `includesVideo[false]` + 100 for `numAdUnits['1-3']`).
+
+Full example:  
+```
+pbjs.setConfig({
+    ...
+    "realTimeData": {
+        "dataProviders": [{
+            "name": 'timeout',
+            "params": {
+                "rules": {
+                    "includesVideo": {
+                        "true": 200,
+                        "false": 50
+                      },
+                    "numAdUnits" : {
+                        "1-5": 100,
+                        "6-10": 200,
+                        "11-15": 300
+                    },
+                    "deviceType": {
+                        "2": 50,
+                        "4": 100,
+                        "5": 200
+                    },
+                    "connectionSpeed": {
+                        "slow": 200,
+                        "medium": 100,
+                        "fast": 50,
+                        "unknown": 10
+                    }
+                }
+            }
+        ]}
+    }
+    ...
+    // The timeout RTD module will add time to `bidderTimeout` based on the rules set above.  
+    "bidderTimeout": 1500, 
+```
diff --git a/dev-docs/modules/userId.md b/dev-docs/modules/userId.md
index ac7d756f47..5c321ac786 100644
--- a/dev-docs/modules/userId.md
+++ b/dev-docs/modules/userId.md
@@ -1411,11 +1411,11 @@ traffic.  Publisher first-party authenticated data and a user's unique encrypted
 Epsilon CORE ID.  By utilizing Publisher Link, publishers are able to reap the benefits of Epsilon's CORE ID.
 
 #### Publisher Link  Registration
-There is no registration needed.
+Please contact [Epsilon](mailto:PublisherSupport@Epsilon.com) to sign up.
 
 The Epsilon privacy is covered in the [Epsilon Privacy Policy](https://www.epsilon.com/us/privacy-policy).
 
-The Publisher Link opt-out is include [here](https://www.epsilon.com/privacy/dms/opt-out/email)
+The Publisher Link opt-out is included [here](https://www.epsilon.com/privacy/dms/opt-out/email)
 
 #### Publisher Link Configuration
 
@@ -1425,8 +1425,10 @@ In addition to the parameters documented above in the Basic Configuration sectio
 | Param under userSync.userIds[] | Scope | Type | Description | Example |
 | --- | --- | --- | --- | --- |
 | name | Required | String | The name of this module. | `'publinkId'` |
-| params | Required | Object | Customized parameters | |
-| params.e | Required | String | Hashed email address of the user | `e80b5017098950fc58aad83c8c14978e` |
+| params | Required | Object | Customized parameters. | |
+| params.e | Required | String | Hashed email address of the user.  Supports MD5 and SHA256. | `'7D320454942620664D96EF78ED4E3A2A'` |
+| params.site_id | Required | String | Site ID provided by Epsilon. | `'123456'` |
+| params.api_key | Required | String | API key provided by Epsilon. | `'7ab62359-bdc0-4095-b573-ef474fb55d2'`
 
 #### Publisher Link Examples
 ```javascript
@@ -1440,7 +1442,9 @@ In addition to the parameters documented above in the Basic Configuration sectio
                    expires: 30
                },
                params: {
-                   e: "e80b5017098950fc58aad83c8c14978e", // example hashed email (md5)
+                   e: "7D320454942620664D96EF78ED4E3A2A", // example hashed email (md5)
+                   site_id: "123456",
+                   api_key: "7ab62359-bdc0-4095-b573-ef474fb55d2"
                }
            }]
        }
diff --git a/dev-docs/modules/weboramaRtdProvider.md b/dev-docs/modules/weboramaRtdProvider.md
new file mode 100644
index 0000000000..8a686b1708
--- /dev/null
+++ b/dev-docs/modules/weboramaRtdProvider.md
@@ -0,0 +1,81 @@
+---
+layout: page_v2
+title: Weborama Real Time Data Provider
+display_name: Weborama Real-time Segmentation Module
+description: Weborama Real-time Segmentation Module
+page_type: module
+module_type: rtd
+module_code : weboramaRtdProvider
+enable_download : true
+vendor_specific: true
+sidebarType : 1
+---
+
+# Weborama RTD Segmentation Module
+{:.no_toc}
+
+* TOC
+{:toc}
+
+Weborama provides a Semantic AI Contextual API that classifies in Real-time a web page seen by a web user within generic and custom topics. It enables publishers to better monetize their inventory and unlock it to programmatic.
+
+ORTB2 compliant and FPD support for Prebid versions < 4.29
+
+Please contact prebid-support@weborama.com for more information.
+
+## Publisher Usage
+
+### Configure Prebid.js
+
+Compile the Weborama RTD module into your Prebid build:
+
+`gulp build --modules=rtdModule,weboramaRtdProvider`
+
+Add the Weborama RTD provider to your Prebid config.
+
+
+#### Minimal configuration
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "weborama",
+                waitForIt: true,
+                params: {
+			token: "<token-provided-by-weborama>"
+                }
+            }
+        ]
+    }
+    ...
+);
+```
+
+### Parameter Descriptions for the Weborama Configuration Section
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Mandatory. Always 'Weborama' |
+| waitForIt | Boolean | Mandatory. Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false but recommended to true |
+| params | Object | | Optional |
+| params.weboCtxConf | Object | Weborama Contextual Configuration | Optional |
+| params.weboCtxConf.token | String | Security Token provided by Weborama, unique per client | Mandatory |
+| params.weboCtxConf.targetURL | String | Url to be profiled in the contextual api | Optional. Defaults to `document.URL` |
+| params.weboCtxConf.defaultProfile | Object | default value of the profile to be used when there are no response from contextual api (such as timeout)| Optional. Default is `{}` |
+| params.weboCtxConf.setTargeting|Boolean|If true, will use the contextual profile to set the gam targeting of all adunits managed by prebid.js| Optional. Default is *true*.|
+| params.weboCtxConf.setOrtb2|Boolean|If true, will use the contextual profile to set the ortb2 configuration on `site.ext.data`| Optional. Default is *false*.|
+
+
+### Testing
+
+To view an example of available segments returned by Weborama's backends:
+
+`gulp serve --modules=rtdModule,weboramaRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/weboramaRtdProvider_example.html`
diff --git a/dev-docs/pbs-bidders.md b/dev-docs/pbs-bidders.md
index 491c6d70a2..d9b5ccee80 100644
--- a/dev-docs/pbs-bidders.md
+++ b/dev-docs/pbs-bidders.md
@@ -49,8 +49,9 @@ You can also download the full <a href="/dev-docs/bidder-data.csv" download>CSV
 | **User IDs** | {% if page.userIds and page.userIds != '' %}{{page.userIds}}{% else %}none{% endif %} | **USP/CCPA Support** | {% if page.usp_supported == true %}yes{% else %}no{% endif %} |
 | **Supply Chain Support** | {% if page.schain_supported  == true %}yes{% else %}no{% endif %} | **COPPA Support** | {% if page.coppa_supported == true %}yes{% else %}no{% endif %} |
 | **Demand Chain Support** | {% if page.dchain_supported  == true %}yes{% else %}no{% endif %} | **Safeframes OK** | {% if page.safeframes_ok and page.safeframes_ok == false %}no{% elsif page.safeframes_ok and page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %} |
-| **Supports Deals** | {% if page.bidder_supports_deals and page.bidder_supports_deals == false %}no{% else %}yes{% endif %} | **Prebid.js Adapter** | {% if page.pbjs == true %}yes{% else %}no{% endif %} |
+| **Supports Deals** | {% if page.deals_supported and page.deals_supported == false %}no{% else %}yes{% endif %} | **Prebid.js Adapter** | {% if page.pbjs == true %}yes{% else %}no{% endif %} |
 | **Mobile App Support** | {% if page.pbs_app_supported and page.pbs_app_supported == false %}no{% elsif page.pbs_app_supported and page.pbs_app_supported == true %}yes{% else %}check with bidder{% endif %} | **Prebid Server Adapter** | yes |
+| **Floors Support** | {% if page.floors_supported == false %}no{% elsif page.floors_supported == true %}yes{% else %}check with bidder{% endif %} | **First Party Data Support** | {% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %} |
 
 
 <h3>"Send All Bids" Ad Server Keys</h3>
diff --git a/dev-docs/publisher-api-reference/setConfig.md b/dev-docs/publisher-api-reference/setConfig.md
index e9c0a4ee33..1d2904bc70 100644
--- a/dev-docs/publisher-api-reference/setConfig.md
+++ b/dev-docs/publisher-api-reference/setConfig.md
@@ -472,7 +472,7 @@ The `s2sConfig` properties:
 | `endpoint` | Required | URL or Object | Defines the auction endpoint for the Prebid Server cluster.  See table below for object config properties. |
 | `syncEndpoint` | Required | URL or Object | Defines the cookie_sync endpoint for the Prebid Server cluster. See table below for object config properties. |
 | `userSyncLimit` | Optional | Integer | Max number of userSync URLs that can be executed by Prebid Server cookie_sync per request.  If not defined, PBS will execute all userSync URLs included in the request. |
-| `coopSync` | Optional | Boolean | Whether or not PBS is allowed to perform "cooperative syncing" for bidders not on this page. Publishers help each other improve match rates by allowing this. Default is true. Supported in PBS-Java only. |
+| `coopSync` | Optional | Boolean | Whether or not PBS is allowed to perform "cooperative syncing" for bidders not on this page. Publishers help each other improve match rates by allowing this. Default is true. |
 | `defaultTtl` | Optional | Integer | Configures the default TTL in the Prebid Server adapter to use when Prebid Server does not return a bid TTL - 60 if not set |
 | `adapterOptions` | Optional | Object | Arguments will be added to resulting OpenRTB payload to Prebid Server in every impression object at request.imp[].ext.BIDDER. See the example above. |
 | `extPrebid` | Optional | Object | Arguments will be added to resulting OpenRTB payload to Prebid Server in request.ext.prebid. See the examples below. |
diff --git a/download.md b/download.md
index 6d4c3be385..c648268a4d 100644
--- a/download.md
+++ b/download.md
@@ -227,19 +227,19 @@ Prebid.js is open source software that is offered for free as a convenience. Whi
 <h4>Recommended Modules</h4>
 Prebid.org highly recommends that publishers utilize the following modules:
 <br/>
-{% for page in module_pages %}{% if page.recommended == true %}<div class="row"><div class="checkbox" style="background-color: #e1fce2;"><label> <input type="checkbox" CHECKED moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="/dev-docs/modules/{{page.module_code}}.html"><strong>{{ page.display_name }}</strong></a> - {{page.description}}</label></div></div>{% endif %}{% endfor %}
+{% for page in module_pages %}{% if page.recommended == true %}<div class="row"><div class="checkbox" style="background-color: #e1fce2;"><label> <input type="checkbox" CHECKED moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="{{page.url}}"><strong>{{ page.display_name }}</strong></a> - {{page.description}}</label></div></div>{% endif %}{% endfor %}
 <br/>
 <h4>General Modules</h4>
 <div class="row">
  {% for page in module_pages %}{% if page.enable_download == false or page.recommended == true or page.vendor_specific == true %}{% continue %}{% endif %}<div class="col-md-4"><div class="checkbox">
-  <label> <input type="checkbox" moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="/dev-docs/modules/{{page.module_code}}.html" class="tip">{{ page.display_name }}<span>{{page.description}}</span></a></label>
+  <label> <input type="checkbox" moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="{{page.url}}" class="tip">{{ page.display_name }}<span>{{page.description}}</span></a></label>
 </div></div>{% endfor %}
 </div>
 
 <h4>Vendor-Specific Modules</h4>
 These modules may require accounts with a service provider.<br/>
 <div class="row">
- {% for page in module_pages %}{% if page.enable_download == false or page.recommended == true %}{% continue %}{% endif %}{% if page.vendor_specific == true %}<div class="col-md-4"><div class="checkbox"><label> <input type="checkbox" moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="/dev-docs/modules/{{page.module_code}}.html" class="tip">{{ page.display_name }}<span>{{page.description}}</span></a></label>
+ {% for page in module_pages %}{% if page.enable_download == false or page.recommended == true %}{% continue %}{% endif %}{% if page.vendor_specific == true %}<div class="col-md-4"><div class="checkbox"><label> <input type="checkbox" moduleCode="{{ page.module_code }}" class="bidder-check-box"> <a href="{{page.url}}" class="tip">{{ page.display_name }}<span>{{page.description}}</span></a></label>
 </div></div>{% endif %}{% endfor %}
 </div>
 
@@ -252,7 +252,7 @@ These modules may require accounts with a service provider.<br/>
   <label><input type="checkbox" moduleCode="amxIdSystem" class="bidder-check-box"> AMX RTB ID</label>
   </div></div>
   <div class="col-md-4"><div class="checkbox">
-  <label><input type="checkbox" moduleCode="akamaiDAPIdSystem" class="bidder-check-box"> Akamap DAP ID</label>
+  <label><input type="checkbox" moduleCode="akamaiDAPIdSystem" class="bidder-check-box"> Akamai DAP ID</label>
   </div></div>
   <div class="col-md-4"><div class="checkbox">
   <label><input type="checkbox" moduleCode="britepoolIdSystem" class="bidder-check-box"> BritePool ID</label>
diff --git a/faq/prebid-server-faq.md b/faq/prebid-server-faq.md
index 897921131b..8ae4ce15de 100644
--- a/faq/prebid-server-faq.md
+++ b/faq/prebid-server-faq.md
@@ -168,3 +168,37 @@ Another way is to [register for our host company mailing list](/prebid-server/ho
 Prebid Server is not a full-fledged SSP. Any DSP bid adapters should keep this in mind when it comes to assuming SSP functionality like resolving OpenRTB macros. We debated building this functionality into PBS, but realized it would take precious milliseconds away from the overall header bidding auction to scan kilobytes of bidder creatives for the 9 different OpenRTB macros. Since so few bidders require this functionality, it makes sense to have those adapters do it themselves.
 
 If an adapter doesn't resolve its own macros, AUCTION_PRICE will eventually get resolved by the [Prebid Universal Creative](https://github.com/prebid/prebid-universal-creative), but by then the bid price will be in the ad server currency and quantized by the price granularity. This will likely cause reporting discrepancies.
+
+## Does Prebid Server support region-specific endpoints for bidders?
+
+Yes. This is handled by the PBS host company in their datacenter config.
+Bidders that want to make use of region-specific endpoints will need to work
+with each PBS host company:
+
+- determine which regions the host company supports
+- map the regions to the bidder's endpoints
+- the host company overrides the bidder's default auction endpoint when they deploy the configuration for each region.
+
+We recognize that it's inconvenient for bidders to be required to have this
+conversation with each host company, but there's really not a better way
+in an open source project. Any number of companies may choose to host
+PBS and we cannot constrain them into a defined set of regions.
+
+## Can bidder endpoints differ by publisher?
+
+You may not use an endpoint domain as a bidder parameter. Prebid Server is not
+an open proxy. If absolutely necessary, you may specify a portion of the
+domain as a parameter to support geo regions or account specific servers.
+However, this is discouraged and may degrade the performance of your adapter
+since the server needs to maintain more outgoing connections. Host companies
+may choose to disable your adapter if it uses a dynamically configured domain.
+
+e.g. this config is not allowed because the entire domain name is a variable:
+
+```
+endpoint: "https://{host}/path"
+```
+but this would be ok:
+```
+endpoint: "https://{host}.example.com/path"
+```
diff --git a/features/InterstitialAds.md b/features/InterstitialAds.md
index 3eda2187fa..e034212528 100644
--- a/features/InterstitialAds.md
+++ b/features/InterstitialAds.md
@@ -54,7 +54,7 @@ pbjs.addAdUnits({
         }
     },
     ortb2Imp: {
-        intl:1
+        instl:1
     },
     ...
 });
diff --git a/features/firstPartyData.md b/features/firstPartyData.md
index cceb41322d..1d8f94ca29 100644
--- a/features/firstPartyData.md
+++ b/features/firstPartyData.md
@@ -63,7 +63,7 @@ pbjs.setConfig({
 		userrating: "4",
 		data: [{
           	    name: "www.dataprovider1.com",
-          	    ext: { "segtax": 1 },
+          	    ext: { segtax: 4 },
 		    segment: [
             		{ id: "687" },
             		{ id: "123" }
@@ -177,6 +177,54 @@ pbjs.setBidderConfig({ // different bidders can receive different data
 });
 {% endhighlight %}
 
+### Supplying App Content Data
+
+Occasionally, an app which embeds a webview might run Prebid.js. In this case, the app object is often specified for OpenRTB, and the site object would be invalid. When this happens, one should specify app.content.data in place of site.content.data.
+
+{% highlight js %}
+pbjs.setConfig({
+  ortb2: {
+    app: {
+      name: "myappname",
+      keywords: "power tools, drills",
+      content: {
+        data: [
+          {
+            name: "www.dataprovider1.com",
+            ext: {
+              segtax: 6
+            },
+            segment: [
+              {
+                id: "687"
+              },
+              {
+                id: "123"
+              }
+            ]
+          },
+          {
+            name: "www.dataprovider1.com",
+            ext: {
+              segtax: 7
+            },
+            segment: [
+              {
+                id: "456"
+              },
+              {
+                id: "789"
+              }
+            ]
+          }
+        ]
+     }
+    }
+  }
+)
+
+{% endhighlight %}
+
 ## Segments and Taxonomy
 
 The [IAB](https://iab.com) offers standard content and audience taxonomies for categorizing sites and users. Prebid supports defining these values as first party data in `site.content.data` or `user.data` as shown in the examples above.
diff --git a/guide.md b/guide.md
index f397c5a8d5..434d04a776 100644
--- a/guide.md
+++ b/guide.md
@@ -9,14 +9,32 @@ sidebarType: 0
 
 # Prebid Website Maintenance Guide
 
-v 1.1  
-Sept 7, 2019
+v 1.2  
+Sept 24, 2021
 
 ***
 
+## Reviewing Pull Requests and Issues
+
+Being a reviewer means you're in weekly rotation where you keep an eye on pull requests (PRs) and issues opened in this repo.
+
+### PR Review Guidelines
+
+1. Make sure no inappropriate changes are made. This covers obvious things like bad language and content, but we also don't allow overt marketing language on the site. Phrases like "we're the best BLAH" or "number one FOOZIT" need to be toned down.
+2. Make sure competitors aren't messing with each other's docs. This can be hard to tell because we don't know which github handles belong to which companies, but in general, if a destructive or suspicious change is being made to a doc, check on the Prebid Slack channel to confirm that the affected company approves the change.
+3. Make sure the change doesn't break formatting. It's not always necessary to preview locally, but for large changes, it's worthwhile verifying visually because markdown can be cranky.
+4. Help the author with basic readability - if you as a reviewer don't understand a sentence, probably others will have trouble too. Push back and ask questions about what they're really trying to say.
+5. We don't generally merge a docs PR until the related code is released. Prebid.js releases happen on Weds or Thurs, and people really like to have their docs PRs merged shortly after the code is released. For Prebid Server, it's ok to merge the docs after the code is merged.
+6. Fix broken or out-of-date things you run across. At least flag it in the team slack channel so we can fix it someday.
+7. Bid Adapter Guidelines
+    1. Check the front-matter: required fields are title and either pbjs or pbs.
+    2. Every adapter needs a parameters table that contains exactly 5 columns in this order: Name, Scope, Description, Example, Type.
+    3. Discourage full-page HTML examples. Better to have just the bidder-specific logic and a pointer to a standard Prebid.js example.
+    4. All headers must be level 3, 4, or 5.
+
 ## Core Technologies
 
-The Prebid website is developed using [Jekyll](https://jekyllrb.com/), a static site generator which uses the following technology to create and style HTML pages.
+The Prebid website is developed using [GitHub pages](https://pages.github.com/) and [Jekyll](https://jekyllrb.com/), a static site generator which uses the following technology to create and style HTML pages. See the [main README file](https://github.com/prebid/prebid.github.io/blob/master/README.md) for instructions on how to set this up.
 
 **Markdown**: The majority of the content is written in Markdown language. Jekyll transform this into raw HTML.
 
@@ -34,11 +52,18 @@ Learn more about [Liquid](https://help.shopify.com/en/themes/liquid/basics)
 
 **CSS**: The site builds on the base Bootstrap template with custom CSS stored in the style.css file.
 
-***
+### Environment
+
+- prebid.org is built with Wordpress. We call it "the marketing site". We generally use a contracting company to make major updates there so it's pretty. But if you know Wordpress, we may give you permissions to do minor updates there.
+- docs.prebid.org is the Github pages site. We call it "the docs site".
+- dev.prebid.org is served through Netlify from the 'dev' branch of the repo. It's often out of date and only used for major projects or for sharing major docs for external review.
+- stage.prebid.org is also served through Netlify, but from the 'staging' branch. You should assume it's out of date.
+
+On the rare occasions where we need to use the 'dev' or 'stage' sites, we just check with each other to make sure it's not already being used for something.
 
 ## Site Config
 
-The _config.yml file (note underscore prefix) sets the base configuration for the site. Refer to [Jekyll](https://jekyllrb.com/docs/configuration/) documentation on which properties can be set in the _congig.yml file.
+The _config.yml file (note underscore prefix) sets the base configuration for the site. Refer to [Jekyll](https://jekyllrb.com/docs/configuration/) documentation on which properties can be set in the _config.yml file.
 
 ***
 
@@ -236,18 +261,14 @@ The attributes in the Jekyll 'front matter' drive various behaviors and dynamic
 | ----- | ------ | ------ | ------ |
 | layout | yes | bidder | Links this file to the bidder.html layout |
 | title | yes | company name | For display |
+| pbjs | sorta | true or false | defines whether this is a Prebid.js bidder |
+| pbs | sorta | true or false | defines whether this is a Prebid Server bidder |
 | description | no | - | Not used |
-| hide | no | - | Not used |
 | biddercode | yes | preferred bidder code | Used as the default ad server targeting suffix and the default download filename |
 | aliasCode | no | download filename | Overrides the filename used to build the PBJS package on the download page |
 | prevBiddercode | no | secondary bidder code | Adds a note about an alternate code that may have been used. |
-| bidder_supports_deals | no | true or false, whether the adapter supports deals | For display. Defaults to 'true'. |
-| s2s_only | no | true or false, whether the adapter is server-to-server only | Adds a note to the display. Defaults to 'false'. |
-| gdpr_supported | no | true or false, whether the adapter supports GDPR | For display. Defaults to 'false'. |
-| coppa_supported | no | true or false, whether the adapter supports COPPA | For display. Defaults to 'false'. |
-| media_types | no | comma-separated list of: banner, video, native | For display. |
-| userIds | no | comma-separated list of supported user id modules | For display. |
-| prebid_member | no | true or false, whether this company is a prebid.org member | For display. |
+| pbjs_version_notes | no | string | Displays on the download page |
+| ANYTHING ELSE | no | string | There are many pieces of metadata (e.g. GDPR support, user IDs supported) that bid adapters can disclose. They're displayed on the bidder's parameter page. |
 
 The bidderCode, aliasCode, and prevBiddercode parameters bear some description.
 Some adapters have a longer bidderCode and a shorter bidderCode -- their adapter supports both (with the `alias` feature) but
diff --git a/prebid-server/developers/add-new-bidder-go.md b/prebid-server/developers/add-new-bidder-go.md
index b710431d91..83e4e47a06 100644
--- a/prebid-server/developers/add-new-bidder-go.md
+++ b/prebid-server/developers/add-new-bidder-go.md
@@ -13,7 +13,7 @@ Thank you for contributing a bid adapter to the open source Prebid Server projec
 This document guides you through the process of developing a new bid adapter for your bidding server. We encourage you to look at [existing bid adapters](https://github.com/prebid/prebid-server/tree/master/adapters) for working examples and practical guidance. You can also ask us questions by [submitting a GitHub issue](https://github.com/prebid/prebid-server/issues/new).
 
 {: .alert.alert-info :}
-**NOTE:** There are two implementations of Prebid Server, [PBS-Go](https://github.com/prebid/prebid-server) and [PBS-Java](https://github.com/prebid/prebid-server-java). We recommend you build new adapters for PBS-Go and allow us to port it to PBS-Java within a couple of months. If you'd like to build both yourself, please also follow these [instructions for building an adapter in PBS-Java](/prebid-server/developers/add-new-bidder-java.html).
+There are two implementations of Prebid Server, [PBS-Go](https://github.com/prebid/prebid-server) and [PBS-Java](https://github.com/prebid/prebid-server-java). We recommend you build new adapters for PBS-Go and allow us to port it to PBS-Java within a couple of months. If you'd like to build both yourself, please also follow these [instructions for building an adapter in PBS-Java](/prebid-server/developers/add-new-bidder-java.html).
 
 
 * TOC
@@ -31,7 +31,7 @@ An OpenRTB 2.5 Bid Request contains one or more Impressions, each representing a
 
 You will need to choose a unique name for your bid adapter. Names should be written in lower case and may not contain special characters or emoji. If you already have a Prebid.js bid adapter, we encourage you to use the same name with the same bidder parameters. You may not name your adapter `all`, `context`, `data`, `general`, `prebid`, or `skadn` as those have special meaning in various contexts. Existing bid adapter names are [maintained here](https://github.com/prebid/prebid-server/blob/master/openrtb_ext/bidders.go#L37).
 
-We ask that the first 6 letters of the name you choose be unique among the existing bid adapters. This consideration helps with generating targeting keys for use by some ad exchanges, such as Google Ad Manager. There's no need to manually check, as this constraint is enforced by the [`TestBidderUniquenessGatekeeping`](https://github.com/prebid/prebid-server/blob/master/openrtb_ext/bidders_test.go#L61) test. 
+We ask that the first 6 letters of the name you choose be unique among the existing bid adapters. This consideration helps with generating targeting keys for use by some ad exchanges, such as Google Ad Manager. There's no need to manually check, as this constraint is enforced by the [`TestBidderUniquenessGatekeeping`](https://github.com/prebid/prebid-server/blob/master/openrtb_ext/bidders_validate_test.go#L45) test.
 
 Throughout the rest of this document, substitute `{bidder}` with the name you've chosen.
 
@@ -48,9 +48,9 @@ We are proud to run the Prebid Server project as a transparent and trustworthy h
   - Adapters must annotate the bid response with the proper media type, ideally based on the response from the bidding server.
 
 {: .alert.alert-warning :}
-Failure to follow the rules will lead to delays in approving your adapter for inclusion in Prebid Server. If you'd like to discuss an exception to a rule, please make your request by [submitting a GitHub issue](https://github.com/prebid/prebid-server/issues/new).
+Failure to follow the rules will lead to delays in approving your adapter. If you'd like to discuss an exception to a rule, please make your request by [submitting a GitHub issue](https://github.com/prebid/prebid-server/issues/new).
 
-### Ongoing Support and Maintenance
+### Support and Maintenance
 
 You are expected to provide support and maintenance for the code you contribute to Prebid Server as part of your bid adapter. We ask that you proactively update your adapter when your bidding server introduces new features or breaking changes.
 
@@ -60,18 +60,18 @@ Please be attentive in reading and responding to emails and [GitHub issues](http
 
 ## Create Your Adapter
 
-Prebid Server bid adapters consist of several components: bidder info, bidder parameters, adapter code, user sync code, registration with the core framework, and default configuration values. This chapter will guide you though each component.
+Prebid Server bid adapters consist of several components: bidder info, bidder parameters, adapter code, registration with the core framework, and default configuration values. This document will guide you though each component.
 
-Please refer to [existing bid adapters](https://github.com/prebid/prebid-server/tree/master/adapters) for working examples and practical guidance, but understand that our adapter interfaces and coding style evolve over time. Please refer to the examples in this document over differences you may find in an existing bid adapter.
+Please refer to [existing bid adapters](https://github.com/prebid/prebid-server/tree/master/adapters) for working examples and practical guidance, but understand that our adapter interfaces and coding style evolve over time. The examples in this document have precedence over differences you may find in an existing bid adapter.
 
 Our project is written in the [Go programming language](https://golang.org/). We understand not everyone has prior experience writing Go code. Please try your best and we'll respectfully steer you in the right direction during the review process.
 
 {: .alert.alert-info :}
-Please do not ignore errors from method calls made in your bid adapter code. Even if it's seemingly impossible for an error to occur, such as from `json.Marshal`, it's still possible under the high throughput multi-threaded nature of Prebid Server.
+**Please do not ignore errors from method calls made in your bid adapter code.** Even if it's seemingly impossible for an error to occur, such as from `json.Marshal`, it's still possible under the high throughput multi-threaded nature of Prebid Server.
 
 ### Bidder Info
 
-Let's begin with your adapter's bidder information YAML file. This file is required and contains your maintainer email address, your [GDPR Global Vendor List (GVL) id](https://iabeurope.eu/vendor-list-tcf-v2-0/), specifies the ad formats your adapter will accept, and allows you to opt-out of video impression tracking.
+Let's begin with your adapter's bidder information YAML file. This file is required and contains your bid adapter's maintainer email address, [GDPR Global Vendor List (GVL) ID](https://iabeurope.eu/vendor-list-tcf-v2-0/), supported ad formats, user sync endpoints, and allows you to opt-out of video impression tracking.
 
 Create a file with the path `static/bidder-info/{bidder}.yaml` and begin with the following template:
 
@@ -93,6 +93,10 @@ capabilities:
       - video
       - audio
       - native
+userSync:
+  redirect:
+    url: https://foo.com/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
 ```
 
 Modify this template for your bid adapter:
@@ -100,6 +104,7 @@ Modify this template for your bid adapter:
 - Change the `gvlVendorID` from the sample value of `42` to the id of your bidding server as registered with the [GDPR Global Vendor List (GVL)](https://iabeurope.eu/vendor-list-tcf-v2-0/), or remove this line entirely if your bidding server is not registered with IAB Europe.
 - Change the `modifyingVastXmlAllowed` value to `false` if you'd like to opt-out of [video impression tracking](https://github.com/prebid/prebid-server/issues/1015), or remove this line entirely if your adapter doesn't support VAST video ads.
 - Remove the `capabilities` (app/site) and `mediaTypes` (banner/video/audio/native) combinations which your adapter does not support.
+- Follow the [User Sync Configuration](#user-sync-configuration) documentation below to configure the endpoints for your bid adapter, or remove the `userSync` section if not supported.
 
 <details markdown="1">
   <summary>Example: Website with banner ads only.</summary>
@@ -112,6 +117,10 @@ capabilities:
   site:
     mediaTypes:
       - banner
+userSync:
+  redirect:
+    url: https://foo.com/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
 ```
 </details>
 
@@ -125,6 +134,10 @@ capabilities:
   site:
     mediaTypes:
       - banner
+userSync:
+  redirect:
+    url: https://foo.com/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
 ```
 </details>
 
@@ -145,22 +158,72 @@ capabilities:
     mediaTypes:
       - banner
       - video
+userSync:
+  redirect:
+    url: https://foo.com/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
 ```
 </details>
 <p></p>
 
+#### User Sync Configuration
+
+Prebid Server offers a federated [user sync](https://docs.prebid.org/prebid-server/developers/pbs-cookie-sync.html) process to store user ids from multiple bidders in a single cookie under the host's domain. You may add support for your bid adapter by configuring iframe and/or redirect endpoints.
+
+The Bidder Info template above demonstrates configuration of a `redirect` user sync. The `url` points to an endpoint on your bidding server which will honor the privacy policies, replace the `userMacro` in the redirect url with the user's tracking id, and respond with an HTTP 302 redirect to that url. You may also specify an `iframe` endpoint which will return an HTML document to be rendered in an `iframe` on the user's device and use JavaScript to perform the redirect. You may omit the `{%raw%}{{.GDPR}}{%endraw%}`, `{%raw%}{{.GDPRConsent}}{%endraw%}`, and/or `{%raw%}{{.USPrivacy}}{%endraw%}` macros if they are not applicable to your legal situation.
+
+If both `iframe` and `redirect` endpoints are provided, you must specify a `default` field with a value of either `iframe` or `redirect`, based on your preference.
+
+```yaml
+userSync:
+  default: iframe
+  iframe:
+    url: https://foo.com/iframe/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
+  redirect:
+    url: https://foo.com/redirect/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
+```
+
+If your bid adapter supports user sync and doesn't have a good default, you may optionally specify a `supports` array with the items `iframe` and/or `redirect` to inform Prebid Server hosts. Hosts will receive a warning on startup if a bid adapter supports user sync and isn't configured. Expect hosts to contact you at the maintainer email address in this file for instructions.
+
+```yaml
+userSync:
+  # foo supports user syncing, but requires configuration by the host. contact this
+  # bidder directly at the email address in this file to ask about enabling user sync.
+  supports:
+    - iframe
+    - redirect
+```
+
+Each user sync is assigned a case-sensitive `key`, defaulting to your bidder name. You may use a different `key` value, but we discourage doing so except for when multiple bidders share the same bidding server. You might encounter this use case for built-in aliases or for multiple bidders implementing different protocols for the same bidding server. Only one bid adapter may specify endpoints when using a shared key, or Prebid Server will fail to startup due to the ambiguity.
+
+```yaml
+foo.yaml
+--------
+userSync:
+  redirect:
+    url: https://foo.com/sync?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: $UID
+
+bar.yaml
+--------
+userSync:
+  key: foo
+```
+
 ### Bidder Parameters
 
-Your bid adapter might require extra information from the publisher to form a request to your bidding server. The bidder parameters JSON Schema codifies this information to allow Prebid Server to verify requests and to provide an API for third party configuration systems.
+Your bid adapter might require extra information from the publisher to form a request to your bidding server. The bidder parameters JSON Schema codifies this information to allow Prebid Server to verify requests and to provide an API for configuration systems.
 
 Publishers will provide extra information using an OpenRTB 2.5 Bid Request Extension, preferably at `request.imp[].ext.prebid.bidder.{bidder}` but also supported at `request.imp[].ext.{bidder}`. Prebid Server will validate the publisher information based on your schema and relocate the data to `request.imp[].ext.bidder`, regardless of your bidder name or the publisher's chosen location.
 
-We request that you do not duplicate information that is already present in the [OpenRTB 2.5 Bid Request specification](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf#page=13) or is already part of an established Prebid convention. For example, your bidder parameters should not include first party data, bid floors, schain, video parameters, referrer information, or privacy consent including COPPA, CCPA, and GDPR TCF. For video parameters in particular, you must prefer the OpenRTB 2.5 Bid Request standard of `request.imp[].video`.
+We request you do not duplicate information already present in the [OpenRTB 2.5 Bid Request specification](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf#page=13) or already part of an established Prebid convention. For example, your bidder parameters should not include first party data, bid floors, schain, video parameters, referrer information, or privacy consent including COPPA, CCPA, and GDPR TCF. For video parameters in particular, you must prefer the OpenRTB 2.5 Bid Request standard of `request.imp[].video`.
 
 {: .alert.alert-warning :}
-**ENDPOINT NOTE:** You may not use an endpoint domain as a bidder parameter. Prebid Server is not an open proxy. If absolutely necessary, you may specify a portion of the domain as a parameter to support geo regions or account specific servers. However, this is discouraged and may degrade the performance of your adapter since the server needs to maintain more outgoing connections. Host companies may choose to disable your adapter if it uses a dynamically configured domain.
+You may not use an endpoint domain as a bidder parameter. Prebid Server is not an open proxy. If absolutely necessary, you may specify a portion of the domain as a parameter to support geo regions or account specific servers. However, this is discouraged and may degrade the performance of your adapter since the server needs to maintain more outgoing connections. Host companies may choose to disable your adapter if it uses a dynamically configured domain.
 
-Create a file with the path `static/bidder-params/{bidder}.json` using [JSON Schema](https://spacetelescope.github.io/understanding-json-schema/) to define your bidder parameters. Prebid Server requires this file for every adapter, even if yours doesn't require bidder parameters (see the 'no parameters' example at the end of this section).
+Create a file with the path `static/bidder-params/{bidder}.json` and use [JSON Schema](https://spacetelescope.github.io/understanding-json-schema/) to define your bidder parameters. Prebid Server requires this file for every adapter, even if yours doesn't require bidder parameters (see the 'no parameters' example at the end of this section).
 
 Let's start with this example which defines one required `placementId` string parameter:
 
@@ -183,7 +246,9 @@ Let's start with this example which defines one required `placementId` string pa
 ```
 We encourage you to utilize the full features of [JSON Schema](https://spacetelescope.github.io/understanding-json-schema/) to narrowly define your bidder parameter data types. If you copy and paste these examples, please remember to change the  `title` and `description` to refer to your bidder name instead of our fictional Foo example.
 
-When choosing your parameter names, please consider aligning with the OpenRTB 2.5 standard by using lower case letters without camel casing or special characters. 
+When choosing your parameter names, please consider aligning with the OpenRTB 2.5 standard by using lower case letters without camel casing or special characters.
+
+Properties in [JSON Schema](https://spacetelescope.github.io/understanding-json-schema/) are case sensitive. If you choose to specify multiple properties differing only by case for compatibility, we ask that you include the word 'preferred' in one of the descriptions to give a hint to third party configuration systems.
 
 In addition to the examples listed below, please refer to [existing bidder parameter files](https://github.com/prebid/prebid-server/tree/master/static/bidder-params) for guidance.
 
@@ -234,7 +299,7 @@ In addition to the examples listed below, please refer to [existing bidder param
   "title": "Foo Adapter Params",
   "description": "A schema which validates params accepted by the Foo adapter",
   "type": "object",
-  
+
   "properties": {
     "token": {
       "type": "string",
@@ -280,18 +345,47 @@ In addition to the examples listed below, please refer to [existing bidder param
 }
 ```
 </details>
+
+<details markdown="1">
+  <summary>Example: Multiple properties differing only by case.</summary>
+
+```json
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Foo Adapter Params",
+  "description": "A schema which validates params accepted by the Foo adapter",
+  "type": "object",
+
+  "properties": {
+    "partnerid": {
+      "type": "string",
+      "description": "Partner ID, preferred."
+    },
+    "partnerID": {
+      "secret": "string",
+      "description": "Partner ID"
+    }
+  },
+
+  "oneOf": [
+    { "required": ["partnerid"] },
+    { "required": ["partnerID"] }
+  ]
+}
+```
+</details>
 <p></p>
 
 ### Bidder Parameters Code
 
 {: .alert.alert-info :}
-You can skip this step if your adapter has no bidder parameters.
+You can skip this section if your adapter has no bidder parameters.
 
-If you've defined bidder parameters for your adapter, you also need to represent your bidder parameters in code. The core framework uses the JSON Schema file for validation, but your adapter code needs a data structure to support JSON unmarshalling / deserialization. These data structures are organized in a shared path using a standard naming convention, which also serves as documentation of all adapter parameters.
+If you defined bidder parameters for your adapter, you also need to represent your bidder parameters in code. The core framework uses the JSON Schema file for validation, but your adapter code needs a data structure to support JSON unmarshalling / deserialization. These data structures are organized in a shared path using a standard naming convention, which also serves as documentation of all adapter parameters.
 
 Create a file with the path `openrtb_ext/imp_{bidder}.go` containing an exported (must start with an upper case letter) data structure named `ImpExt{Bidder}`. All required and optional bidder parameters from the JSON Schema should be represented as fields.
 
-For example, this is what the bidder parameter code looks like for the example we used in the previous section:
+For example, this is what the bidder parameter code looks like for the Foo example we used in the previous section:
 
 ```go
 package openrtb_ext
@@ -301,7 +395,7 @@ type ImpExtFoo struct {
 }
 ```
 
-Please follow [Go's standard naming convention](https://golang.org/doc/effective_go.html) for the field names (particularly for acronyms) and use `` `json:...` `` attributes to specify the JSON name, matching exactly what you defined in the bidder parameters JSON Schema. Please keep in mind that JSON is case sensitive.
+Please follow [Go's standard naming convention](https://golang.org/doc/effective_go.html) for the field names (particularly for acronyms) and use `` `json:...` `` attributes to specify the JSON name, matching exactly what you defined in the bidder parameters JSON Schema.
 
 ### Adapter Code
 
@@ -326,7 +420,7 @@ import (
   "fmt"
   "net/http"
 
-  "github.com/mxmCherry/openrtb"
+  "github.com/mxmCherry/openrtb/v15/openrtb2"
   "github.com/prebid/prebid-server/adapters"
   "github.com/prebid/prebid-server/config"
   "github.com/prebid/prebid-server/errortypes"
@@ -345,7 +439,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
   return bidder, nil
 }
 
-func (a *adapter) MakeRequests(request *openrtb.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
+func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
   requestJSON, err := json.Marshal(request)
   if err != nil {
     return nil, []error{err}
@@ -356,15 +450,15 @@ func (a *adapter) MakeRequests(request *openrtb.BidRequest, requestInfo *adapter
     Uri:     a.endpoint,
     Body:    requestJSON,
   }
-  
+
   return []*adapters.RequestData{requestData}, nil
 }
 
-func (a *adapter) MakeBids(request *openrtb.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
   if responseData.StatusCode == http.StatusNoContent {
     return nil, nil
   }
-  
+
   if responseData.StatusCode == http.StatusBadRequest {
     err := &errortypes.BadInput{
       Message: "Unexpected status code: 400. Bad request from publisher. Run with request.debug = 1 for more info.",
@@ -379,18 +473,17 @@ func (a *adapter) MakeBids(request *openrtb.BidRequest, requestData *adapters.Re
     return nil, []error{err}
   }
 
-  var response openrtb.BidResponse
+  var response openrtb2.BidResponse
   if err := json.Unmarshal(responseData.Body, &response); err != nil {
     return nil, []error{err}
   }
-  
+
   bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp))
   bidResponse.Currency = response.Cur
   for _, seatBid := range response.SeatBid {
-    for _, bid := range seatBid.Bid {
-      bid := bid // pin https://github.com/kyoh86/scopelint#whats-this
+    for i, bid := range seatBid.Bid {
       b := &adapters.TypedBid{
-        Bid:     &bid,
+        Bid:     &seatBid.Bid[i],
         BidType: getMediaTypeForBid(bid),
       }
       bidResponse.Bids = append(bidResponse.Bids, b)
@@ -409,16 +502,16 @@ The first argument, `bidderName`, is the name of the bidder being built. This ma
 
 The second argument, `config`, is all the configuration values set for your adapter. However, not all of this information is intended for use by the `Builder` method. The only two fields relevant here are `config.Endpoint` and `config.ExtraAdapterInfo`:
 - `config.Endpoint` is the base url of your bidding server and may be interpreted as either a literal address or as a templated macro to support dynamic domains or dynamic paths.
-- `config.ExtraAdapterInfo` may be used for any other values your adapter may need, such as an application token or publisher allow/deny list. You may interpret this string however you like, although JSON is a common choice.
+- `config.ExtraAdapterInfo` is an optional setting may be used for any other values your adapter may need, such as an application token or publisher allow/deny list. You may interpret this string however you like, although JSON is a common choice.
 
-The `Builder` method is expected to return an error if either the `config.Endpoint` or the `config.ExtraAdapterInfo` values are invalid or cannot be parsed. Errors will be surfaced to the host during application startup as a fatal error. 
+The `Builder` method is expected to return an error if either the `config.Endpoint` or the `config.ExtraAdapterInfo` values are invalid or cannot be parsed. Errors will be surfaced to the host during application startup as a fatal error.
 
 <details markdown="1">
   <summary>Example: Builder using endpoint macros.</summary>
 
 ```go
 type adapter struct {
-  endpointTemplate template.Template
+  endpointTemplate *template.Template
 }
 
 // Builder builds a new instance of the Foo adapter for the given bidder with the given config.
@@ -427,9 +520,9 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
   if err != nil {
     return nil, fmt.Errorf("unable to parse endpoint url template: %v", err)
   }
-  
+
   bidder := &adapter{
-    endpointTemplate: *template,
+    endpointTemplate: template,
   }
   return bidder, nil
 }
@@ -450,7 +543,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
   if err != nil {
     return nil, err
   }
-  
+
   bidder := &adapter{
     endpoint: config.Endpoint,
     token:    info.token,
@@ -484,9 +577,9 @@ func buildDefaultExtraInfo() extraInfo {
 
 The `MakeRequests` method is responsible for returning none, one, or many HTTP requests to be sent to your bidding server. Bid adapters are forbidden from directly initiating any form of network communication and must entirely rely upon the core framework. This allows the core framework to optimize outgoing connections using a managed pool and record networking metrics. The return type `adapters.RequestData` allows your adapter to specify the HTTP method, url, body, and headers.
 
-This method is called once by the core framework for bid requests which have at least one valid Impression for your adapter. Impressions not configured for your adapter will be removed and are not accessible. 
+This method is called once by the core framework for bid requests which have at least one valid Impression for your adapter. Impressions not configured for your adapter are not accessible.
 
-The first argument, `request`, is the OpenRTB 2.5 Bid Request object. Extension information is stored as `json.RawMessage` byte arrays and must be unmarshalled and/or marshalled to be read and/or mutated. It is *critical* to understand that the `request` object contains pointers to shared memory. If your adapter needs to alter any data referenced by a pointer then you *must* first make a shallow copy. The only exception is for `request.Imp` and its elements, as these are already shallow copies. The exact same instance of the `request` object is also passed to the `MakeBids` method, so please be careful when mutating. It's safe to assume that `request.Imp[]` always contains at least one element and that the `request.Imp[].ext.bidder` was successfully validated by your bidder parameter JSON Schema.
+The first argument, `request`, is the OpenRTB 2.5 Bid Request object. Extension information is stored as `json.RawMessage` byte arrays and must be unmarshalled and/or marshalled to be read and/or mutated. It is *critical* to understand that the `request` object contains pointers to shared memory. If your adapter needs to alter any data referenced by a pointer then you *must* first make a shallow copy. The only exception is for `request.Imp` and its elements, as these are already shallow copies. The exact same instance of the `request` object is also passed to the `MakeBids` method, so please be careful when mutating. It's safe to assume that `request.Imp[]` always contains at least one element and that the `request.Imp[].ext.bidder` was successfully validated per your bidder parameter JSON Schema.
 
 <details markdown="1">
   <summary>Example: Mutating banner shared memory (make a copy).</summary>
@@ -506,36 +599,35 @@ if request.Imp[i].W == nil && request.Imp[i].H == nil && len(request.Imp[i].Form
 
 The second argument, `requestInfo`, is for extra information and helper methods provided by the core framework. This includes:
 
-- `requestInfo.PbsEntryPoint` to access the entry point of the bid request, commonly used to determine if the request is for AMP or for a Long Form Video Ad Pod.
-- `requestInfo.GlobalPrivacyControlHeader` to read the value of the Sec-GPC Global Privacy Control (GPC) header of the bid request.
+- `requestInfo.PbsEntryPoint` to access the entry point of the bid request, commonly used to determine if the request is for AMP or for a [Long Form Video Ad Pod](/dev-docs/modules/adpod.html).
+- `requestInfo.GlobalPrivacyControlHeader` to read the value of the `Sec-GPC` Global Privacy Control (GPC) header of the bid request.
 - `requestInfo.ConvertCurrency` a method to perform currency conversions.
 
 
-The `MakeRequests` method is expected to return a slice (similar to a C# `List` or a Java `ArrayList`) of `adapters.RequestData` objects representing the HTTP calls to be sent to your bidding server and a slice of type `error` for any issues encountered creating them. If there are no HTTP calls or if there are no errors, please return `nil` for both return values. Neither slices may contain `nil` elements.
+The `MakeRequests` method is expected to return a slice (similar to a C# `List` or a Java `ArrayList`) of `adapters.RequestData` objects representing the HTTP calls to be sent to your bidding server and a slice of type `error` for any issues encountered creating them. If there are no HTTP calls or if there are no errors, please return `nil` for both return values. Please do not add `nil` items in the slices.
 
 {: .alert.alert-info :}
 HTTP calls to your bidding server will automatically prefer GZIP compression. You should not specify it yourself using headers. You don't have to worry about decompressing the response in `MakeBids` either, as that will be taken care of automatically.
 
-An Impression may define multiple sizes and/or multiple ad formats. If your bidding server limits requests to a single ad placement, size, or format, then your adapter will need to split the Impression into multiple calls and merge the responses.
+##### Impression Splitting
 
-<details markdown="1">
-  <summary>Example: Impression splitting.</summary>
+An Impression may define multiple sizes and/or multiple ad formats. If your bidding server limits requests to a single ad placement, size, or format, then your adapter will need to split the Impression into multiple calls and merge the responses.
 
 ```go
-func (a *adapter) MakeRequests(request *openrtb.BidRequest, requestInfo *adapters.ExtraRequestInfo) (*adapters.RequestData, []error) {
+func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) (*adapters.RequestData, []error) {
   var requests []*adapters.RequestData
   var errors []error
-  
+
   requestCopy := *request
   for _, imp := range request.Imp {
-    requestCopy.Imp = []openrtb.Imp{imp}
+    requestCopy.Imp = []openrtb2.Imp{imp}
 
     requestJSON, err := json.Marshal(request)
     if err != nil {
       errors = append(errors, err)
       continue
     }
-  
+
     requestData := &adapters.RequestData{
       Method: "POST",
       Uri:    a.endpoint,
@@ -546,10 +638,12 @@ func (a *adapter) MakeRequests(request *openrtb.BidRequest, requestInfo *adapter
   return requests, errors
 }
 ```
-</details>
-<p></p>
 
-If your bidding server supports multiple currencies, please be sure to pass through the `request.cur` field. If your bidding server only bids in a single currency, such as USD or EUR, that's fine. Prebid Server will convert your bid to the request currency if you include it in the bid response, otherwise we assume USD and conversion will not occur.
+##### Currency
+
+If your bidding server supports multiple currencies, please pass through the `request.cur` field. If your bidding server only bids in a single currency, such as USD or EUR, that's fine. Prebid Server will convert your bid to the request currency if you include it in the bid response, otherwise we assume USD and conversion will not occur.
+
+Please ensure you forward the bid floor (`request.imp[].bidfloor`) and bid floor currency (`request.imp[].bidfloorcur`) values to your bidding server for enforcement. You can use of the `requestInfo.ConvertCurrency` helper method for currency conversions if your endpoint only supports floors in a specific currency.
 
 Please ensure you forward the bid floor (`request.imp[].bidfloor`) and bid floor currency (`request.imp[].bidfloorcur`) values to your bidding server for enforcement. You have access to the currency conversion helper method `ConvertCurrency` in case your endpoint only supports floors in a single currency.
 
@@ -558,9 +652,8 @@ Please ensure you forward the bid floor (`request.imp[].bidfloor`) and bid floor
 
 ```go
 func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) (*adapters.RequestData, []error) {
-  
-  for _, imp := range request.Imp {
 
+  for _, imp := range request.Imp {
     // Check if imp comes with bid floor amount defined in a foreign currency
     if imp.BidFloor > 0 && imp.BidFloorCur != "" && strings.ToUpper(imp.BidFloorCur) != "USD" {
 
@@ -571,8 +664,7 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
       }
 
       // Update after conversion. All imp elements inside request.Imp are shallow copies
-      // therefore, their non-pointer values are not shared memory and are safe to modify
-      // without risking a data race condition
+      // therefore, their non-pointer values are not shared memory and are safe to modify.
       imp.BidFloorCur = "USD"
       imp.BidFloor = convertedValue
     }
@@ -588,13 +680,15 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
     Uri:     a.endpoint,
     Body:    requestJSON,
   }
-  
+
   return []*adapters.RequestData{requestData}, nil
 }
 ```
 </details>
 <p></p>
 
+##### Common Data
+
 There are a several values of a bid that publishers expect to be populated. Some are defined by the OpenRTB 2.5 specification and some are defined by Prebid conventions.
 
 {: .table .table-bordered .table-striped }
@@ -607,7 +701,7 @@ There are a several values of a bid that publishers expect to be populated. Some
 | [Request-Defined currency conversion rates](https://docs.prebid.org/prebid-server/features/pbs-currency.html) | Prebid | `request.ext.prebid.currency` <br/> The publisher decides to prioritize its own custom currency conversion rates over Prebid Server's currency conversion rates. If a currency rate is not found in `request.ext.prebid.currency`, Prebid Server's rates will be used unless `usepbsrates` is set to `false`. If missing, `usepbsrates` defaults to true.
 | [First Party Data (FPD)](https://docs.prebid.org/prebid-server/features/pbs-fpd.html)| Prebid | `request.imp[].ext.context.data.*`, `request.app.ext.data.*`, `request.site.ext.data.*`, `request.user.ext.data.*` <br/> The publisher may provide first party data (e.g. keywords).
 | GDPR | OpenRTB |  `request.regs.ext.gdpr`, `request.user.ext.consent` <br/> The publisher is specifying the European General Data Protection Regulation flag and TCF consent string.
-| Site or App | OpenRTB | `request.site`, `request.app` <br/> The publisher will provide either the site or app, but not both, representing the client's device. 
+| Site or App | OpenRTB | `request.site`, `request.app` <br/> The publisher will provide either the site or app, but not both, representing the client's device.
 | Supply Chain | OpenRTB | `request.source.ext.schain` <br/> The publisher's declaration of all parties who are selling or reselling the bid request.
 | Test | OpenRTB | `request.test` <br/> The publisher is sending non-production traffic which also enables verbose debugging information from Prebid Server.
 | Video | OpenRTB | `request.imp[].video` <br/> The publisher is specifying video ad requirements or preferences.
@@ -619,18 +713,20 @@ For simplicity, adapters are expected to make net-price bids (e.g. "If this ad w
 
 The `MakeBids` method is responsible for parsing the bidding server's response and mapping it to the [OpenRTB 2.5 Bid Response object model](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf#page=32).
 
-This method is called for each response received from your bidding server within the bidding window (`request.tmax`). If there are no requests or if all requests time out, the `MakeBids` method will not be called.
+This method is called for each response received from your bidding server within the bidding time window (`request.tmax`). If there are no requests or if all requests time out, the `MakeBids` method will not be called.
 
-{: .alert.alert-info :}
+{: .alert.alert-warning :}
 It's *imperative* to include all required information in the response for your bid to be accepted. Please avoid common mistakes, such as not specifying the bid currency and not properly detecting the media type from the bidding server response.
 
 The first argument, `request`, is the exact same OpenRTB 2.5 Bid Request object provided to (and potentially mutated by) the `MakeRequests` method. The information in the `request` may be useful when detecting the media type.
 
 The second argument, `requestData`, is the exact same `adapters.RequestData` object returned by the `MakeRequests` method. It's rare for adapters to make use of this information, but it's provided for potential edge cases.
 
-The third argument, `responseData`, is the HTTP response received from your bidding server and contains the status code, body, and headers. If your bidding server replies with a GZIP encoded body, it will be automatically decompressed. 
+The third argument, `responseData`, is the HTTP response received from your bidding server and contains the status code, body, and headers. If your bidding server replies with a GZIP encoded body, it will be automatically decompressed.
 
-The `MakeBids` method is expected to return an `adapters.BidderResponse` object with one or more bids mapped from your bidding server's response. This may be as simple as decorating an OpenRTB 2.5 Bid Response with a some Prebid Server metadata (such as the media type) or more complicated mapping logic depending on your server's response format.
+The `MakeBids` method is expected to return an `adapters.BidderResponse` object with one or more bids mapped from your bidding server's response. This may be as simple as decorating an OpenRTB 2.5 Bid Response with some Prebid Server metadata (such as the media type) or more complicated mapping logic depending on your server's response format.
+
+##### Object Model
 
 Please review the entire [OpenRTB 2.5 Bid Response](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf#page=32) documentation to fully understand the response object model and expectations. We've summarized some common fields below. Data which is listed as required is enforced by the core framework and cannot be omitted.
 
@@ -639,12 +735,12 @@ Please review the entire [OpenRTB 2.5 Bid Response](https://www.iab.com/wp-conte
 | - | - | -
 | `.Currency` | Required | [3-letter ISO 4217 code](https://www.iso.org/iso-4217-currency-codes.html) defining the currency of the bid. The Prebid Server default is USD.
 | `.Bids[].BidType` | Required | Prebid Server defined value identifying the media type as `banner`, `video`, `audio`, or `native`. Should be mapped from the bidding server response.
-| `.Bids[].Bid.ADomain` | Optional | Advertiser domain for block list checking.
-| `.Bids[].Bid.AdM` | Optional | Ad markup to serve if the bid wins. May be HTML, Native, or VAST/VMAP formats. You should resolve any AUCTION_PRICE macros.
 | `.Bids[].Bid.CrID` | Required | Unique id of the creative.
 | `.Bids[].Bid.ID` | Required | Bidder generated id to assist with logging and tracking.
 | `.Bids[].Bid.ImpID` | Required | ID of the corresponding bid request Impression. Prebid Server validates the id is actually found in the bid request.
 | `.Bids[].Bid.Price` | Required | Net price CPM of the bid, not gross price. Publishers can correct for gross price bids by setting Bid Adjustments to account for fees. We recommend the most granular price a bidder can provide.
+| `.Bids[].Bid.ADomain` | Optional | Advertiser domain for block list checking.
+| `.Bids[].Bid.AdM` | Optional | Ad markup to serve if the bid wins. May be HTML, Native, or VAST/VMAP formats. You should resolve any AUCTION_PRICE macros.
 | `.Bids[].Bid.W` | Optional | Width of the creative in pixels.
 | `.Bids[].Bid.H` | Optional | Height of the creative in pixels.
 | `.Bids[].Bid.Ext` | Optional | Embedded JSON containing Prebid metadata (see below) or custom information.
@@ -652,19 +748,22 @@ Please review the entire [OpenRTB 2.5 Bid Response](https://www.iab.com/wp-conte
 {: .alert.alert-info :}
 We recommend resolving creative OpenRTB macros in your adapter. Otherwise, AUCTION_PRICE will eventually get resolved by the [Prebid Universal Creative](https://github.com/prebid/prebid-universal-creative), but by then the bid price will be in the ad server currency and quantized by the price granularity.
 
-If you'd like to support Long Form Video Ad Pods, then you'll need to provide the followings information:
+If you'd like to support [Long Form Video Ad Pods](/dev-docs/modules/adpod.html)s, then you'll need to provide the followings information:
 
 {: .table .table-bordered .table-striped }
 | BidderResponse Path | Description
 | - | -
-| `.Bids[].BidVideo.PrimaryCategory` | Category for the bid. Should be able to be translated to the primary ad server format.
-| `.Bids[].Bid.Cat` | Category for the bid. Should be able to be translated to the primary ad server format.
+| `.Bids[].BidVideo.PrimaryCategory` | Category for the bid in the taxonomy used by the ad server. Will be passed through without translation.
+| `.Bids[].Bid.Cat` | IAB category for the bid which may be translated to the taxonomy used by the ad server.
 | `.Bids[].BidVideo.Duration` | Length of the video in integer seconds.
 | `.Bids[].DealPriority` | Deal tier integer value. Defaults to 0.
 
 {: .alert.alert-info :}
 Either `.Bids[].BidVideo.PrimaryCategory` or `.Bids[].Bid.Cat` should be provided.
-Prebid has historically struggled with sharing granular bid response data with publishers, analytics, and reporting systems. To address this, we've introduced a standard object model. We encourage adapters to provide as much information as possible in the bid response. 
+
+##### Metadata
+
+Prebid has introduced a standard object model for sharing granular bid response data with publishers, analytics, and reporting systems. We encourage adapters to provide as much information as possible in the bid response.
 
 {: .alert.alert-danger :}
 Bid metadata will be *required* in Prebid.js 5.X+ release, specifically for bid.ADomain and MediaType. We recommend making sure your adapter sets these values or Prebid.js may throw out the bid.
@@ -680,7 +779,7 @@ Bid metadata will be *required* in Prebid.js 5.X+ release, specifically for bid.
 | `.AdvertiserName` | Bidder-specific advertiser name.
 | `.BrandID` | Bidder-specific brand id for advertisers with multiple brands.
 | `.BrandName` | Bidder-specific brand name.
-| `.DChain` | Demand Chain Object. 
+| `.DChain` | Demand chain object.
 | `.PrimaryCategoryID` | Primary IAB category id.
 | `.SecondaryCategoryIDs` | Secondary IAB category ids.
 | `.MediaType` | Either `banner`, `audio`, `video`, or `native`. This is used in the scenario where a bidder responds with a mediatype different than the stated type. e.g. native when the impression is for a banner. One use case is to help publishers determine whether the creative should be wrapped in a safeframe.
@@ -691,82 +790,46 @@ Bid metadata will be *required* in Prebid.js 5.X+ release, specifically for bid.
   <summary>Example: Setting metadata.</summary>
 
 ```go
-func (a *adapter) MakeBids(request *openrtb.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
   ...
   for _, seatBid := range response.SeatBid {
-    for _, bid := range seatBid.Bid {
-      bid := bid // pin https://github.com/kyoh86/scopelint#whats-this
+    for i, bid := range seatBid.Bid {
       b := &adapters.TypedBid{
-        Bid:     &bid,
+        Bid:     &seatBid.Bid[i],
         BidType: getMediaTypeForBid(bid),
-      }
-
-      if meta, err := buildMeta(b); err != nil {
-        errs = append(errs, metaErr)
-      } else {
-        b.Bid.Ext = meta
-        bidResponse.Bids = append(bidResponse.Bids, b)
+        BidMeta: getBidMeta(bid),
       }
   }
   ...
 }
 
-func buildMeta(bid *adapters.TypedBid) (json.RawMessage, error) {
-  metaExt := openrtb_ext.ExtBidPrebid {
-    Meta: &openrtb_ext.ExtBidPrebidMeta {
-      NetworkID:            1,
-      NetworkName:          "Some Network Name",
-      AgencyID:             2,
-      AgencyName:           "Some Agency Name",
-      AdvertiserID:         3,
-      AdvertiserName:       "Some Advertiser Name",
-      DChain:               json.RawMessage(`{Some Demand Chain JSON}`),
-      BrandID:              4,
-      BrandName:            "Some Brand Name",
-      PrimaryCategoryID:    "IAB-1",
-      SecondaryCategoryIDs: []string{"IAB-2", "IAB-3"},
-      MediaType:            b.BidType,
-    }
+func getBidMeta(bid *adapters.TypedBid) *openrtb_ext.ExtBidPrebidMeta {
+  // Not all fields are required. This example includes all fields for
+  // demonstration purposes.
+  return &openrtb_ext.ExtBidPrebidMeta {
+    NetworkID:            1,
+    NetworkName:          "Some Network Name",
+    AgencyID:             2,
+    AgencyName:           "Some Agency Name",
+    AdvertiserID:         3,
+    AdvertiserName:       "Some Advertiser Name",
+    AdvertiserDomains:    []string{"Some Domain"},
+    DemandSource:         "Some Demand Source",
+    DChain:               json.RawMessage(`{Some Demand Chain JSON}`),
+    BrandID:              4,
+    BrandName:            "Some Brand Name",
+    PrimaryCategoryID:    "IAB-1",
+    SecondaryCategoryIDs: []string{"IAB-2", "IAB-3"},
+    MediaType:            "banner",
   }
-  return json.Marshal(meta)
 }
 ```
 </details>
 <p></p>
 
-### Create A User Syncer (Optional)
-
-Prebid Server offers a federated [user sync solution](https://docs.prebid.org/prebid-server/developers/pbs-cookie-sync.html) to store user ids in a single cookie under the host's domain. You may add support with a relatively small amount of code if your bidding server supports this protocol.
-
-Create a file with the path `adatpers/{bidder}/usersync.go` using the following template:
-
-```go
-package {bidder}
-
-import (
-  "text/template"
-  
-  "github.com/prebid/prebid-server/adapters"
-  "github.com/prebid/prebid-server/usersync"
-)
-
-func NewSyncer(template *template.Template) usersync.Usersyncer {
-  return adapters.NewSyncer("{bidder}", template, adapters.SyncTypeRedirect)
-}
-```
-
-The heavy lifting is handled by the `adapters.NewSyncer` method. You just need to provide a few arguments:
-
-{: .table .table-bordered .table-striped }
-| Argument | Description
-| - | -
-| `familyName` | Name used for storing your user sync id within the federated cookie. Please keep this the same as your bidder name.
-| `urlTemplate` | Pass through the `template` argument.
-| `syncType` | Type of user sync supported by your bidding server. The valid options are `SyncTypeRedirect` and `SyncTypeIframe`.
-
 ### Register With The Core
 
-Prebid Server does not use reflection or any other automagic technology to recognize your new bid adapter. You must manually register it with the core framework.
+Prebid Server does not use reflection or any other automated technology to recognize your new bid adapter. You must manually register it with the core framework.
 
 {: .alert.alert-info :}
 You will need to add an `import` statement for your bid adapter package in these files. Modern code editors such as Visual Studio Code and JetBrain's GoLand will automatically do that for you.
@@ -791,7 +854,7 @@ const (
 func CoreBidderNames() []BidderName {
   return []BidderName{
     ...
-     Bidder{Bidder},
+    Bidder{Bidder},
     ...
   }
 }
@@ -809,20 +872,9 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 }
 ```
 
-If you have a user syncer, edit the file `usersync/usersyncers/syncer.go` to include it in the syncer map.
-
-```go
-func NewSyncerMap(cfg *config.Configuration) map[openrtb_ext.BidderName]usersync.Usersyncer {
-  syncers := make(map[openrtb_ext.BidderName]usersync.Usersyncer, len(cfg.Adapters))
-  ...
-  insertIntoMap(cfg, syncers, openrtb_ext.Bidder{Bidder}, {bidder}.NewSyncer)
-  ...
-}
-```
-
 ### Set Adapter Defaults
 
-Lastly, you need to provide default settings for your bid adapter. You can decide if you'd like your bid adapter to be enabled out of the box, and if so, you'll need to provide a default endpoint and default extra adapter info if applicable. If your bid adapter requires host specific information to function properly, such as a security token or host account, then it's best to leave the adapter disabled.
+You need to provide default settings for your bid adapter. You can decide if you'd like your bid adapter to be enabled out of the box, and if so, you'll need to provide a default endpoint and default extra adapter info (if applicable). If your bid adapter requires host specific information to function properly, such as a security token or host account, then it's best to leave the adapter disabled.
 
 {: .alert.alert-warning :}
 **HOST SPECIFIC INFO:** The default endpoint must not be specific to any particular host, such as Xandr/AppNexus. We may ask you about suspicious looking ids during the review process. Please reach out to individual hosts if you need to set specialized configuration.
@@ -835,7 +887,7 @@ Edit the file `config/config.go` to register your default endpoint within the `S
 func SetupViper(v *viper.Viper, filename string) {
   ...
   v.SetDefault("adapters.{bidder}.endpoint", "https://your.url/any/path")
-  v.SetDefault("adapters.{bidder}.extra_info", `{"your": "extra info"}`) 
+  v.SetDefault("adapters.{bidder}.extra_info", `{"your": "extra info"}`)
   ...
 }
 ```
@@ -852,76 +904,9 @@ func SetupViper(v *viper.Viper, filename string) {
 }
 ```
 
-### Set User Syncer Defaults
-
-If you implemented a user syncer, you'll need to provide a default endpoint. Edit the file `config/config.go` to alphabetically register your user syncer in the `setDerivedDefaults` method:
-
-```go
-func (cfg *Configuration) setDerivedDefaults() {
-  ...
-  setDefaultUsersync(cfg.Adapters, openrtb_ext.Bidder{Bidder}, "https://your.url/sync?r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3D{bidder}%26gdpr%3D{%raw%}{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}{%endraw%}%26uid%3D%5BUUID%5D")
-  ...
-}
-```
-
-If you don't have a good default, please add a comment instead.
-
-```go
-func (cfg *Configuration) setDerivedDefaults() {
-  ...
-  // openrtb_ext.Bidder{Bidder} doesn't have a good default.
-  ...
-}
-```
-
-
-Yes, you're right. That url value is quite complicated. You can find further details in our [user sync documentation](https://docs.prebid.org/prebid-server/developers/pbs-cookie-sync.html).
-
-The user sync endpoint is composed of two main parts, the url of your user syncer and a redirect back to Prebid Server. The url of your user syncer is responsible for reading the user id from the client's cookie and redirecting to Prebid Server with a user id macro resolved.
-
-The url of your user syncer can make use of the following privacy policy macros which will be resolved by Prebid Server before sending the url to your server:
-- `{%raw%}{{.USPrivacy}}{%endraw%}`: Client's CCPA consent string.
-- `{%raw%}{{.GDPR}}{%endraw%}`: Client's GDPR TCF enforcement flag.
-- `{%raw%}{{.GDPRConsent}}{%endraw%}`: Client's GDPR TCF consent string.
-
-<details markdown="1">
-  <summary>Example: Bidding server url with no macros.</summary>
-
-```go
-"https://your.url/sync?r="
-```
-</details>
-
-<details markdown="1">
-  <summary>Example: Bidding server url with CCPA privacy consent.</summary>
-
-```go
-"https://your.url/sync?usp={%raw%}{{.USPrivacy}}{%endraw%}&r="
-```
-</details>
-<p></p>
-
-The redirect url for Prebid Server must follow this format:
-```
-{host}/setuid?bidder={bidder}&gdpr={%raw%}{{.GDPR}}&gdpr_consent={{.GDPRConsent}}{%endraw%}&uid=[UUID]
-```
-
-{: .table .table-bordered .table-striped }
-| Token | Description
-| - | -
-| `{host}` | Placeholder for the Prebid Server host url. In code, you would substitute it with `url.QueryEscape(externalURL)`. 
-| `{bidder}` | Placeholder for the name of your bid adapter.
-| `[UUID]` | Macro defined by your user sync server which will be replaced with the user's id.
-
-The final value of the redirect url is encoded for safe use within a query string:
-
-```
-{host}%2Fsetuid%3Fbidder%3D{bidder}%26gdpr%3D{%raw%}{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}{%endraw%}%26uid%3D%5BUUID%5D
-```
-
 ## Test Your Adapter
 
-This chapter will guide you through the creation of automated unit tests to cover your bid adapter code, bidder parameters JSON Schema, and user sync code. We use GitHub Action Workflows to ensure the code you submit passes validation. You can run the same validation locally with this command:
+This section will guide you through the creation of automated unit tests to cover your bid adapter code and bidder parameters JSON Schema. We use GitHub Action Workflows to ensure the code you submit passes validation. You can run the same validation locally with this command:
 
 ```bash
 ./validate.sh --nofmt --cov --race 10
@@ -940,7 +925,7 @@ package {bidder}
 
 import (
   "testing"
-  
+
   "github.com/prebid/prebid-server/adapters/adapterstest"
   "github.com/prebid/prebid-server/config"
   "github.com/prebid/prebid-server/openrtb_ext"
@@ -949,11 +934,11 @@ import (
 func TestJsonSamples(t *testing.T) {
   bidder, buildErr := Builder(openrtb_ext.Bidder{Bidder}, config.Adapter{
     Endpoint: "http://whatever.url"})
-  
+
   if buildErr != nil {
     t.Fatalf("Builder returned unexpected error %v", buildErr)
   }
-  
+
   adapterstest.RunJSONBidderTest(t, "{bidder}test", bidder)
 }
 ```
@@ -1008,7 +993,7 @@ The format of a JSON test is as follows:
 
 The `mockBidRequest`, `httpCalls`, and `expectedBidResponses` fields are required. The `expectedMakeRequestsErrors` and `expectedMakeBidsErrors` may be omitted if there are no expected errors. We provide a `literal` and `regex` mode for testing error values. We often use the `regex` mode to handle error messages produced by the core Go framework which changed between recent releases.
 
-To make everyone's life easier, please use a JSON 'prettifier' to apply standard formatting to your test files. We recommend the use of Visual Studio Code's [Beautify](https://marketplace.visualstudio.com/items?itemName=HookyQR.beautify) extension.
+Please use a JSON 'prettifier' to apply standard formatting to your test files. We recommend the use of Visual Studio Code's [Beautify](https://marketplace.visualstudio.com/items?itemName=HookyQR.beautify) extension.
 
 ### Builder Tests
 
@@ -1020,7 +1005,7 @@ If your adapter supports template parsing, we recommend adding this failure test
 func TestEndpointTemplateMalformed(t *testing.T) {
   _, buildErr := Builder(openrtb_ext.Bidder{Bidder}, config.Adapter{
     Endpoint: "{%raw%}{{Malformed}}{%endraw%}"})
-    
+
   assert.Error(t, buildErr)
 }
 ```
@@ -1033,7 +1018,7 @@ func TestBadConfig(t *testing.T) {
     Endpoint:         `http://it.doesnt.matter/bid`,
     ExtraAdapterInfo: `{foo:42}`,
   })
-  
+
   assert.Error(t, buildErr)
 }
 
@@ -1042,9 +1027,9 @@ func TestEmptyConfig(t *testing.T) {
     Endpoint:         `http://it.doesnt.matter/bid`,
     ExtraAdapterInfo: ``,
   })
-  
+
   bidder{Bidder} := bidder.(*adapter)
-  
+
   assert.NoError(t, buildErr)
   assert.Empty(t, bidder{Bidder}.extraInfo.SomeInfo)
 }
@@ -1060,7 +1045,7 @@ package {bidder}
 import (
   "encoding/json"
   "testing"
-  
+
   "github.com/prebid/prebid-server/openrtb_ext"
 )
 
@@ -1069,7 +1054,7 @@ func TestValidParams(t *testing.T) {
   if err != nil {
     t.Fatalf("Failed to fetch the json schema. %v", err)
   }
-  
+
   for _, p := range validParams {
     if err := validator.Validate(openrtb_ext.Bidder{Bidder}, json.RawMessage(p)); err != nil {
       t.Errorf("Schema rejected valid params: %s", p)
@@ -1082,7 +1067,7 @@ func TestInvalidParams(t *testing.T) {
   if err != nil {
     t.Fatalf("Failed to fetch the json schema. %v", err)
   }
-  
+
   for _, p := range invalidParams {
     if err := validator.Validate(openrtb_ext.Bidder{Bidder}, json.RawMessage(p)); err == nil {
       t.Errorf("Schema allowed invalid params: %s", p)
@@ -1101,66 +1086,11 @@ var invalidParams = []string{
 ```
 Please include tests for required fields, optional fields, conditional fields such as `oneOf`, regex filters, and data type mismatches. For example, if the field is defined as a string please include one invalid case for the wrong data type such as an integer in this example.
 
-You don't have to go crazy with combinatorials. We're looking for just enough test cases to build confidence.
-
-### User Syncer Tests
-
-{: .alert.alert-info :}
-Please skip to the end of this section if your adapter doesn't define a user syncer.
-
-We ask that you include a user syncer test to verify the basic mechanics of macro substitution. The `syncURL` should be the same value used in the `setDefaultUsersync` call with the `url.QueryEscape(externalURL)` code replaced with a simple hardcoded value such as `"host"`. Please keep the privacy policy values simple, as we're only testing substitution.
-
-Create a file with the path `adapters/{bidder}/usersync_test.go` using the following template:
-
-```go
-package {bidder}
-
-import (
-  "testing"
-  "text/template"
-  
-  "github.com/prebid/prebid-server/privacy"
-  "github.com/prebid/prebid-server/privacy/ccpa"
-  "github.com/prebid/prebid-server/privacy/gdpr"
-  "github.com/stretchr/testify/assert"
-)
-
-func TestSyncer(t *testing.T) {
-  syncURL := "<Copy From Default Config>"
-  syncURLTemplate := template.Must(
-    template.New("sync-template").Parse(syncURL),
-  )
-  
-  syncer := NewSyncer(syncURLTemplate)
-  syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{
-    GDPR: gdpr.Policy{
-      Signal:  "A",
-      Consent: "B",
-    },
-    CCPA: ccpa.Policy{
-      Consent: "C",
-    },
-  })
-  
-  assert.NoError(t, err)
-  assert.Equal(t, "<syncURL With Macros Resolved>", syncInfo.URL)
-  assert.Equal(t, "redirect", syncInfo.Type)
-}
-```
-
-If you *DON'T* have a user syncer, edit the file `usersync/usersyncers/syncer_test.go` to exclude your bid adapter from user sync tests:
-
-```go
-adaptersWithoutSyncers := map[openrtb_ext.BidderName]bool{
-  ...
-  openrtb_ext.Bidder{Bidder}: true,
-  ...
-}
-```
+There is no need to provide a combinatorial for every edge case possibility. We're looking for just enough test cases to build confidence.
 
 ### Manual End To End Tests
 
-We'll verify your adapter works correctly on a technical level during the code review, but you'll need to perform separate end-to-end testing:
+We'll verify your adapter works correctly on a technical level during the code review, but you'll need to perform manual end-to-end testing:
 
 1. Build the project and start your server:
    ```bash
@@ -1204,13 +1134,15 @@ We'll verify your adapter works correctly on a technical level during the code r
     }'
    ```
 
-If your bid adapters defines a user syncer, please perform end-to-end testing of the user sync process:
+### User Sync Testing
+
+If your bid adapter defines one or more user sync endpoints, you'll need to perform manual end-to-end testing of each endpoint using the following process:
 
-1.  [Save a User ID](https://docs.prebid.org/prebid-server/endpoints/pbs-endpoint-setuid.html) using the `familyName` of your user syncer. This is likely the same as your bidder name.
+1.  [Save a User ID](https://docs.prebid.org/prebid-server/endpoints/pbs-endpoint-setuid.html) using the `key` of your user sync endpoint. This should default to your bidder name and is case sensitive.
 
 1. Run a test auction (see the curl example above) and verify in the debug response that the outgoing `request.ext.debug.httpcalls` calls includes the User ID you saved in step 1.
 
-It may be a bit tricky to track down the root cause of user sync errors. If you get stuck, please [submit a GitHub issue](https://github.com/prebid/prebid-server/issues/new) and we'll provide guidance.
+If you are having issues finding the root cause of user sync errors, please [submit a GitHub issue](https://github.com/prebid/prebid-server/issues/new) and we'll provide guidance.
 
 ## User Documentation
 
@@ -1234,7 +1166,9 @@ dchain_supported: true/false
 userId: <list of supported vendors>
 media_types: banner, video, audio, native
 safeframes_ok: true/false
-bidder_supports_deals: true/false
+deals_supported: true/false
+floors_supported: true/false
+fpd_supported: true/false
 pbjs: true/false
 pbs: true/false
 pbs_app_supported: true/false
@@ -1264,7 +1198,9 @@ Notes on the metadata fields:
 - If you support adding a demand chain on the bid response, add `dchain_supported: true`. Default is false.
 - If your bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for your bidder. No default.
 - If your bidder supports mobile apps, set `pbs_app_supported: true`. No default value.
-- If your bidder supports deals, set `bidder_supports_deals: true`. No default value.
+- If your bidder supports deals, set `deals_supported: true`. No default value.
+- If your bidder supports floors, set `floors_supported: true`. No default value.
+- If your bidder supports first party data, set `fpd_supported: true`. No default value.
 - If you're a member of Prebid.org, add `prebid_member: true`. Default is false.
 
 
@@ -1281,13 +1217,6 @@ Notes on the metadata fields:
   - `adapters/{bidder}/{bidder}_test.go`
   - `adapters/{bidder}/{bidder}test/exemplary/*.json`
   - `adapters/{bidder}/{bidder}test/supplemental/*.json`
-  - `adapters/{bidder}/{bidder}test/params/race/{mediaType}.json` 
-- User Syncer - If You Have One
-  - `adapters/{bidder}/usersync.go`
-  - `adapters/{bidder}/usersync_test.go`
-  - `usersync/usersyncers/syncer.go`
-- User Syncer - If You Don't
-  - `usersync/usersyncers/syncer_test.go`
 - Register With The Core
   - `openrtb_ext/bidders.go`
   - `exchange/adapter_builders.go`
@@ -1296,7 +1225,7 @@ Notes on the metadata fields:
 
 ## Contribute
 
-Whew! You're almost done. Thank you for taking the time to develop a Prebid Server bid adapter. When you're ready, [contribute](https://github.com/prebid/prebid-server/blob/master/docs/developers/contributing.md) your new bid adapter by opening a PR to the [PBS-Go GitHub repository](https://github.com/prebid/prebid-server) with the name "New Adapter: {Bidder}".
+Thank you for taking the time to develop a Prebid Server bid adapter. When you're ready, [contribute](https://github.com/prebid/prebid-server/blob/master/docs/developers/contributing.md) your new bid adapter by opening a PR to the [PBS-Go GitHub repository](https://github.com/prebid/prebid-server) with the name "New Adapter: {Bidder}".
 
 {: .alert.alert-warning :}
 You don't need to ask permission or open a GitHub issue before submitting an adapter.
diff --git a/prebid-server/developers/add-new-bidder-java.md b/prebid-server/developers/add-new-bidder-java.md
index a40bebcad0..61471a929d 100644
--- a/prebid-server/developers/add-new-bidder-java.md
+++ b/prebid-server/developers/add-new-bidder-java.md
@@ -104,7 +104,6 @@ adapters:
 Modify this template for your bid adapter:
 - Change the maintainer email address to a group distribution list on your ad server's domain. A distribution list is preferred over an individual mailbox to allow for robustness, as roles and team members naturally change.
 - Change the `modifying-vast-xml-allowed` value to `false` if you'd like to opt out of video impression tracking. It defaults to `true`.
-- Change the `pbs-enforces-gdpr` to `false` if you'd like to disable gdpr enforcement. Defaults to `true`.
 - Change the `pbs-enforces-ccpa` to `false` if you'd like to disable ccpa enforcement. Defaults to `true`.
 - Change the `vendor-id` value to id of your bidding server as registered with the [GDPR Global Vendor List (GVL)](https://iabeurope.eu/vendor-list-tcf-v2-0/). Leave this as `0` if you are not registered with IAB Europe.
 - Remove the `capabilities` (app/site) and `mediaTypes` (banner/video/audio/native) combinations which your adapter does not support.
@@ -129,13 +128,15 @@ Default configuration:
 ```yaml
 adapter-defaults:
   enabled: false
-  pbs-enforces-gdpr: true
   pbs-enforces-ccpa: true
-  deprecated-names:
-  aliases: {}
   modifying-vast-xml-allowed: true
 ```
 
+There are also some default properties which can't be overridden in adapter-defaults, but rather in particular adapter's config:
+- `aliases`: Defaults to empty
+- `deprecated-names`: Defaults to empty
+- `extra-info`: Defaults to empty
+
 ### Create bidder alias
 If you want to add bidder that is an alias of existing bidder, you need just to update configuration of parent bidder:
 
@@ -143,7 +144,7 @@ Example of adding bidder alias:
 ```yaml
 adapters:
   yourBidderCode:
-    endpoint: http://possible.endpoint
+    ...
     aliases: 
       yourBidderAlias:
         endpoint: http://possible.alias/endpoint
@@ -155,26 +156,6 @@ adapters:
           - video
         usersync:
           cookie-family-name: yourBidderCode
-    meta-info:
-      maintainer-email: maintainer@email.com
-      app-media-types:
-        - banner
-        - video
-        - audio
-        - native
-      site-media-types:
-        - banner
-        - video
-        - audio
-        - native
-      supported-vendors:
-      vendor-id: your_vendor_id
-    usersync:
-      url: your_bid_adapter_usersync_url
-      redirect-url: /setuid?bidder=yourBidderCode&gdpr={%raw%}{{gdpr}}{%endraw%}&gdpr_consent={%raw%}{{gdpr_consent}}{%endraw%}&us_privacy={%raw%}{{us_privacy}}{%endraw%}
-      cookie-family-name: yourBidderCode
-      type: redirect
-      support-cors: false
 ```
 
 Aliases are configured by adding child configuration object at `adapters.yourBidderCode.aliases.yourBidderAlias`
@@ -814,7 +795,6 @@ Go to `test-application.properties` file and add folowing properties
 ```yaml
 adapters.{bidder}.enabled=true
 adapters.{bidder}.endpoint=http://localhost:8090/{bidder}-exchange
-adapters.{bidder}.pbs-enforces-gdpr=true
 adapters.{bidder}.usersync.url=//{bidder}-usersync
 ```
 
@@ -1188,7 +1168,9 @@ dchain_supported: true/false
 userId: <list of supported vendors>
 media_types: banner, video, audio, native
 safeframes_ok: true/false
-bidder_supports_deals: true/false
+deals_supported: true/false
+floors_supported: true/false
+fpd_supported: true/false
 pbjs: true/false
 pbs: true/false
 pbs_app_supported: true/false
@@ -1218,7 +1200,9 @@ Notes on the metadata fields:
 - If you support adding a demand chain on the bid response, add `dchain_supported: true`. Default is false.
 - If your bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for your bidder. No default.
 - If your bidder supports mobile apps, set `pbs_app_supported`: true. No default value.
-- If your bidder supports deals, set `bidder_supports_deals: true`. No default value.
+- If your bidder supports deals, set `deals_supported: true`. No default value.
+- If your bidder supports floors, set `floors_supported: true`. No default value.
+- If your bidder supports first party data, set `fpd_supported: true`. No default value.
 - If you're a member of Prebid.org, add `prebid_member: true`. Default is false.
 
 
diff --git a/prebid-server/developers/pbs-cookie-sync.md b/prebid-server/developers/pbs-cookie-sync.md
index 5469f89994..dc739375db 100644
--- a/prebid-server/developers/pbs-cookie-sync.md
+++ b/prebid-server/developers/pbs-cookie-sync.md
@@ -50,9 +50,9 @@ POST https://prebid-server.example.com/cookie_sync
 
 3) When it receives the response, Prebid.js loops through each element of `bidder_status[]`, dropping a pixel for each `bidder_status[].usersync.url`.
 
-4) The bidder-specific endpoints read the users's cookie for the bidder's domain and respond with a redirect back to Prebid Server's [`/setuid` endpoint](/prebid-server/endpoints/pbs-endpoint-setuid.html)
+4) The bidder-specific endpoints read the users' cookie for the bidder's domain and respond with a redirect back to Prebid Server's [`/setuid` endpoint](/prebid-server/endpoints/pbs-endpoint-setuid.html)
 
-5) When the browser receives this redirect, it contacts Prebid Server, which will once again check the privacy settings and will update the `uids` cookie if allowed.
+5) When the browser receives this redirect, it contacts Prebid Server, which will once again check the privacy settings and if allowed,  update the `uids` cookie.
 
 ### Setting the uids cookie from AMP
 
@@ -60,7 +60,8 @@ Cookie sync for AMP works in a way quite similar to Prebid.js.
 
 1) The Prebid Server hosting company places a modified version of the `load-cookie` script onto a CDN. This script is part of the [Prebid Universal Creative](https://github.com/prebid/prebid-universal-creative/blob/master/src/cookieSync.js) repo.
 
-Note that the only two values currently valid for 'endpoint' are 'appnexus' and 'rubicon' -- other host companies should update their copy to include their endpoint.
+{: .alert.alert-warning :}
+The only two values currently valid for 'endpoint' are 'appnexus' and 'rubicon' -- other host companies should update their copy to include their endpoint.
 
 See [the AMP implementation guide](/dev-docs/show-prebid-ads-on-amp-pages.html#user-sync) for more information.
 
@@ -76,21 +77,19 @@ See [the AMP implementation guide](/dev-docs/show-prebid-ads-on-amp-pages.html#u
 </amp-iframe>
 ```
 
-Note: if the publisher has an AMP Consent Management Platform, they should use `load-cookie-with-consent.html`.
+{: .alert.alert-info :}
+If the publisher has an AMP Consent Management Platform, they should use `load-cookie-with-consent.html`.
 
 3) At runtime, the `load-cookie` script just calls the Prebid Server /cookie_sync endpoint. The rest works the same as described for Prebid.js above.
 
 
 ## Bidder Instructions for Building a Sync Endpoint
 
-Building a sync endpoint is optional -- mobile-only bidders don't benefit from
-ID syncing. But for browser-based bidding, ID syncing can help improve buyer bid rate. There are two main options a bidder can choose to support:
+Building a sync endpoint is optional -- there is no benefit from ID syncing for mobile-only bidders. For browser-based bidding, ID syncing can help improve buyer bid rate. There are two main options a bidder can choose to support:
 
 - redirect: the client will drop an IMG tag into the page, then call the bidder's URL which needs to redirect to the Prebid Server /setuid endpoint.
 - iframe: the client will drop an IFRAME tag into the page, then call the bidder's URL which responds with HTML and Javascript that calls the Prebid Server /setuid endpoint at some point.
 
-PBS-Java allows bidders to support both options.
-
 Bidders must implement an endpoint under their domain which accepts an encoded URI for redirects. This URL should be able to accept privacy parameters:
 
 - gdpr: if 0, declares this request isn't in GDPR scope. If 1, declares it is in scope. Otherwise indeterminate.
@@ -99,20 +98,24 @@ Bidders must implement an endpoint under their domain which accepts an encoded U
 
 The specific attributes can differ for your endpoint. For instance, you could choose to receive gdprConsent rather than gdpr_consent.
 
-Here's an example that shows the privacy macros as coded into PBS-Go:
+Here's an example that shows the privacy macros as configured in PBS-Go:
 ```
-GET some-bidder-domain.com/usersync-url?gdpr={%raw%}{{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}{%endraw%}&redirectUri=prebid-server.example.com%2Fsetuid%3Fbidder%3Dsomebidder%26uid%3DYOURMACRO
+userSync:
+  redirect:
+    url: https://some-bidder-domain.com/usersync-url?gdpr={%raw%}{{.GDPR}}{%endraw%}&consent={%raw%}{{.GDPRConsent}}{%endraw%}&us_privacy={%raw%}{{.USPrivacy}}{%endraw%}&redirect={%raw%}{{.RedirectURL}}{%endraw%}
+    userMacro: YOURMACRO
 ```
+
 PBS-Java uses slightly different macros in the bidder config:
 ```
-    usersync:
-      url: https://some-bidder-domain.com/usersync-url?gdpr={%raw%}{{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}{%endraw%}&redirectUri=
-      redirect-url: /setuid?bidder=acuityads&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid=YOURMACRO
+usersync:
+  url: https://some-bidder-domain.com/usersync-url?gdpr={%raw%}{{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}{%endraw%}&redirectUri=
+  redirect-url: /setuid?bidder=acuityads&gdpr={%raw%}{{gdpr}}{%endraw%}&gdpr_consent={%raw%}{{gdpr_consent}}{%endraw%}&us_privacy={%raw%}{{us_privacy}}{%endraw%}&uid=YOURMACRO
 ```
-In either case, the {%raw%}{{}}{%endraw%} macros are resolved by PBS.
+In either case, the {%raw%}{{...}}{%endraw%} macros are resolved by PBS.
 
-{: .alert.alert-info :}
-Important: The "YOURMACRO" string here needs to be whatever your sync endpoint will recognize and resolve to the user's ID from your domain. Some examples of macros that bidders use: $UID, ${UID}, $$visitor_cookie$$, ${DI_USER_ID}, etc. Every bidder has their own value here.
+{: .alert.alert-warning :}
+The "YOURMACRO" string here needs to be whatever your sync endpoint will recognize and resolve to the user's ID from your domain. Some examples of macros that bidders use: $UID, ${UID}, $$visitor_cookie$$, ${DI_USER_ID}, etc. Every bidder has their own value here.
 
 Here's how this all comes together:
 
diff --git a/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.md b/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.md
index 079e38ee65..007d721f2b 100644
--- a/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.md
+++ b/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.md
@@ -211,10 +211,10 @@ It's also possible to define different bid adjustment factors by mediatype, whic
     "prebid": {
       "bidadjustmentfactors": {
         "bidderA": 0.9,
-        "bidderB": 0.8
+        "bidderB": 0.8,
         "mediatypes": {
           "banner": {
-            "bidderA": 0.8,
+            "bidderA": 0.8
           },
           "video-outstream": {
             "bidderC": 0.9
@@ -222,7 +222,7 @@ It's also possible to define different bid adjustment factors by mediatype, whic
           "video": {
             "bidderB": 0.85
           }
-       }
+        }
       }
     }
   }
@@ -268,7 +268,8 @@ to set these params on the response at `response.seatbid[i].bid[j].ext.prebid.ta
           "precision": 2,
           "ranges": [{
             "max": 20.00,
-            "increment": 0.10 // This is equivalent to the deprecated "pricegranularity": "medium"
+            "increment": 0.10 // This is equivalent to the deprecated
+                              // "pricegranularity": "medium"
           }]
         },
         "includewinners": true,     // Optional param defaulting to false
@@ -423,9 +424,9 @@ This prevents breaking API changes as new Bidders are added to the project.
 For example, if the Request defines an alias like this:
 
 ```
-  "aliases": {
-    "appnexus": "rubicon"
-  }
+"aliases": {
+  "appnexus": "rubicon"
+}
 ```
 
 then any `imp.ext.appnexus` params will actually go to the **rubicon** adapter.
@@ -438,13 +439,16 @@ For environments that have turned on [GDPR enforcement](/prebid-server/features/
 To do this, just set `ext.prebid.aliasgvlids` alongside ext.prebid.aliases:
 
 ```
-"ext":
+"ext": {
   "prebid": {
-      "aliases": { "newAlias": "originalBidderCode" },
-      "aliasgvlids": { "newAlias": 11111 }
+    "aliases": {
+      "newAlias": "originalBidderCode"
+    },
+    "aliasgvlids": {
+      "newAlias": 11111
     }
   }
-});
+}
 ```
 
 ##### Stored Requests
@@ -526,12 +530,10 @@ Example:
 {
   "imp": [{
     ...
-    "banner": {
-      ...
-    }
+    "banner": { ... },
     "instl": 1,
     ...
-  }]
+  }],
   "device": {
     ...
     "h": 640,
@@ -556,20 +558,20 @@ PBS with interstitial support will come preconfigured with a list of common ad s
 To set the desired 'ad server currency', use the standard OpenRTB `cur` attribute. Note that Prebid Server only looks at the first currency in the array.
 
 ```
-    "cur": ["USD"]
+"cur": ["USD"]
 ```
 
 If you want or need to define currency conversion rates (e.g. for currencies that your Prebid Server doesn't support),
-define ext.prebid.currency.rates. (Currently supported in PBS-Java only)
+define ext.prebid.currency.rates.
 
 ```
 "ext": {
   "prebid": {
-	  "currency": {
-		  "rates": {
-			  "USD": { "UAH": 24.47, "ETB": 32.04 }
-		  }
-	  }
+    "currency": {
+      "rates": {
+        "USD": { "UAH": 24.47, "ETB": 32.04 }
+      }
+    }
   }
 }
 ```
@@ -585,9 +587,9 @@ Basic supply chains are passed to Prebid Server on `source.ext.schain` and passe
 Bidder-specific schains:
 
 ```
-ext.prebid.schains: [
-   { bidders: ["bidderA"], schain: { SCHAIN OBJECT 1}},
-   { bidders: ["*"], schain: { SCHAIN OBJECT 2}}
+"ext.prebid.schains": [
+   { "bidders": ["bidderA"], "schain": { SCHAIN OBJECT 1}},
+   { "bidders": ["*"], "schain": { SCHAIN OBJECT 2}}
 ]
 ```
 In this scenario, Prebid Server sends the first schain object to `bidderA` and the second schain object to everyone else.
@@ -600,24 +602,23 @@ Prebid Server adapters can support the [Prebid.js User ID modules](/dev-docs/mod
 
 ```
 {
-    "user": {
-        "ext": {
-            "eids": [{
-                "source": "adserver.org",
-                "uids": [{
-                    "id": "111111111111",
-                    "ext": {
-                        "rtiPartner": "TDID"
-                    }
-                }]
-            },
-            {
-                "source": "pubcid.org",
-                "id":"11111111"
-            }
-            ]
-        }
+  "user": {
+    "ext": {
+      "eids": [{
+        "source": "adserver.org",
+        "uids": [{
+          "id": "111111111111",
+          "ext": {
+            "rtiPartner": "TDID"
+          }
+        }]
+      },
+      {
+        "source": "pubcid.org",
+        "id":"11111111"
+      }]
     }
+  }
 }
 ```
 
@@ -627,17 +628,17 @@ Publishers can constrain which bidders receive which user.ext.eids entries. See
 
 ```
 {
-    ext: {
-        prebid: {
-            data: {
-                eidpermissions: [   // prebid server will use this to filter user.ext.eids
-                   {"source": "sharedid.org", "bidders": ["*"]},  // * is the default
-                   {"source": "neustar.biz", "bidders": ["bidderB"]},
-                   {"source": "id5-sync.com", "bidders": ["bidderA","bidderC"]}
-                ]
-            }
-        }
+  "ext": {
+    "prebid": {
+      "data": {
+        "eidpermissions": [   // prebid server will use this to filter user.ext.eids
+          {"source": "sharedid.org", "bidders": ["*"]},  // * is the default
+          {"source": "neustar.biz",  "bidders": ["bidderB"]},
+          {"source": "id5-sync.com", "bidders": ["bidderA","bidderC"]}
+        ]
+      }
     }
+  }
 }
 ```
 
@@ -678,24 +679,34 @@ When a storedauctionresponse ID is specified:
 This request:
 ```
 {
-  "test":1,
-  "tmax":500,
+  "test": 1,
+  "tmax": 500,
   "id": "test-auction-id",
   "app": { ... },
   "ext": {
-      "prebid": {
-             "targeting": {},
-             "cache": { "bids": {} }
-       }
+    "prebid": {
+      "targeting": {},
+      "cache": {
+        "bids": {}
+      }
+    }
   },
   "imp": [
     {
       "id": "a",
-      "ext": { "prebid": { "storedauctionresponse": { "id": "1111111111" } } }
+      "ext": {
+        "prebid": {
+          "storedauctionresponse": { "id": "1111111111" }
+        }
+      }
     },
     {
       "id": "b",
-      "ext": { "prebid": { "storedauctionresponse": { "id": "22222222222" } } }
+      "ext": {
+        "prebid": {
+          "storedauctionresponse": { "id": "22222222222" }
+        }
+      }
     }
   ]
 }
@@ -704,16 +715,16 @@ This request:
 Will result in this response, assuming that the ids exist in the appropriate DB table read by Prebid Server:
 ```
 {
-    "id": "test-auction-id",
-    "seatbid": [
-        {
-             // BidderA bids from storedauctionresponse=1111111111
-             // BidderA bids from storedauctionresponse=22222222
-        },
-       {
-             // BidderB bids from storedauctionresponse=1111111111
-             // BidderB bids from storedauctionresponse=22222222
-       }
+  "id": "test-auction-id",
+  "seatbid": [
+    {
+      // BidderA bids from storedauctionresponse=1111111111
+      // BidderA bids from storedauctionresponse=22222222
+    },
+    {
+      // BidderB bids from storedauctionresponse=1111111111
+      // BidderB bids from storedauctionresponse=22222222
+    }
   ]
 }
 ```
@@ -724,37 +735,37 @@ In contrast to what's outlined above, this approach lets some real auctions take
 
 ```
 {
-  "test":1,
-  "tmax":500,
+  "test": 1,
+  "tmax": 500,
   "id": "test-auction-id",
   "app": { ... },
   "ext": {
-      "prebid": {
-             "targeting": {},
-             "cache": { "bids": {} }
-       }
+    "prebid": {
+      "targeting": {},
+        "cache": { "bids": {} }
+    }
   },
   "imp": [
     {
       "id": "a",
       "ext": {
-          "prebid": {
-            "storedbidresponse": [
-                  { "bidder": "BidderA", "id": "333333" },
-                  { "bidder": "BidderB", "id": "444444" },
-             ]
-           }
+        "prebid": {
+          "storedbidresponse": [
+            { "bidder": "BidderA", "id": "333333" },
+            { "bidder": "BidderB", "id": "444444" },
+          ]
+        }
       }
     },
     {
       "id": "b",
       "ext": {
-          "prebid": {
-            "storedbidresponse": [
-                  { "bidder": "BidderA", "id": "5555555" },
-                  { "bidder": "BidderB", "id": "6666666" },
-             ]
-           }
+        "prebid": {
+          "storedbidresponse": [
+            { "bidder": "BidderA", "id": "5555555" },
+            { "bidder": "BidderB", "id": "6666666" },
+          ]
+        }
       }
     }
   ]
@@ -764,18 +775,18 @@ Could result in this response:
 
 ```
 {
-    "id": "test-auction-id",
-    "seatbid": [
-        {
-             "bid": [
-             // contents of storedbidresponse=3333333 as parsed by bidderA adapter
-             // contents of storedbidresponse=5555555 as parsed by bidderA adapter
-             ]
-        },
-       {
-             // contents of storedbidresponse=4444444 as parsed by bidderB adapter
-             // contents of storedbidresponse=6666666 as parsed by bidderB adapter
-       }
+  "id": "test-auction-id",
+  "seatbid": [
+    {
+      "bid": [
+      // contents of storedbidresponse=3333333 as parsed by bidderA adapter
+      // contents of storedbidresponse=5555555 as parsed by bidderA adapter
+      ]
+    },
+    {
+      // contents of storedbidresponse=4444444 as parsed by bidderB adapter
+      // contents of storedbidresponse=6666666 as parsed by bidderB adapter
+    }
   ]
 }
 ```
@@ -793,49 +804,52 @@ It specifies where in the OpenRTB request non-standard attributes should be pass
 
 ```
 {
+  "ext": {
+    "prebid": {
+      "data": { "bidders": [ "rubicon", "appnexus" ] }  // these are the bidders allowed to see protected data
+    }
+  },
+  "site": {
+    "keywords": "",
+    "search": "",
     "ext": {
-       "prebid": {
-           "data": { "bidders": [ "rubicon", "appnexus" ] }  // these are the bidders allowed to see protected data
-       }
-    },
-    "site": {
-         "keywords": "",
-         "search": "",
-         "ext": {
-             data: { GLOBAL SITE DATA } // only seen by bidders named in ext.prebid.data.bidders[]
-         }
-    },
-    "user": {
-        "keywords": "",
-        "gender": "",
-        "yob": 1999,
-        "geo": {},
-        "ext": {
-            data: { GLOBAL USER DATA }  // only seen by bidders named in ext.prebid.data.bidders[]
+      "data": { GLOBAL SITE DATA } // only seen by bidders named in ext.prebid.data.bidders[]
+    }
+  },
+  "user": {
+    "keywords": "",
+    "gender": "",
+    "yob": 1999,
+    "geo": {},
+    "ext": {
+      "data": { GLOBAL USER DATA }  // only seen by bidders named in ext.prebid.data.bidders[]
+    }
+  },
+  "imp": [
+    {
+      ...
+      "ext": {
+        "data": {
+          ADUNIT SPECFIC CONTEXT DATA  // can be seen by all bidders
         }
-    },
-    "imp": [
-        ...
-        "ext": {
-            "data": {
-                ADUNIT SPECFIC CONTEXT DATA  // can be seen by all bidders
-            }
-         }
-    ]
+      }
+    }
+  ]
+}
 ```
 
 Bidder-specific data can be defined with ext.prebid.bidderconfig:
 ```
-ext: {
-  prebid: {
-    bidderconfig:
-      bidders: ["bidderA", "bidderB"],
-      config: [
-	ortb2: {
-	  site: { ... },
-          user: { ... }
-	}
-      ]
+"ext": {
+  "prebid": {
+    "bidderconfig": {
+      "bidders": ["bidderA", "bidderB"]
+    },
+    "config": {
+      "ortb2": {
+        "site": { ... },
+        "user": { ... }
+      }
     }
   }
 }
@@ -858,20 +872,21 @@ An OpenRTB extension, whether in the the original request or the [stored-request
 The OpenRTB field is `ext.prebid.adservertargeting`. Here's an example:
 
 ```
-   ext.prebid.adservertargeting:  [{
-              "key": "hb_amp_ow",           // the targeting key
-              "source": "bidrequest",       // pull the value from the path specified in the bid request object
-              "value": "ext.prebid.amp.data.ow"  // path to value in the bidrequest
-            },{
-               "key": "hb_static_thing",
-               "source": "static",          // just use the 'value' provided
-               "value": "my-static-value"
-            },{
-               "key": "{{BIDDER}}_custom1", // {{BIDDER}} is a macro to be resolved
-               "source": "bidresponse",     // pull the value from the path specified in the bid response object
-               "value": "seatbid.bid.ext.custom1"
-            }
-   }]
+"ext.prebid.adservertargeting":  [
+  {
+    "key": "hb_amp_ow",           // the targeting key
+    "source": "bidrequest",       // pull the value from the path specified in the bid request object
+    "value": "ext.prebid.amp.data.ow"  // path to value in the bidrequest
+  },{
+    "key": "hb_static_thing",
+    "source": "static",          // just use the 'value' provided
+    "value": "my-static-value"
+  },{
+    "key": "{% raw %}{{BIDDER}}{% endraw %}_custom1", // {% raw %}{{BIDDER}}{% endraw %} is a macro to be resolved
+    "source": "bidresponse",     // pull the value from the path specified in the bid response object
+    "value": "seatbid.bid.ext.custom1"
+  }
+]
 ```
 `ext.prebid.adservertargeting` is an array objects. Each object has the following format:
 
@@ -884,30 +899,30 @@ The OpenRTB field is `ext.prebid.adservertargeting`. Here's an example:
 
 In order to pull AMP parameters out into targeting, Prebid Server places AMP query string parameters in ext.prebid.amp.data. e.g.
 ```
-    "ext": {
-	"prebid": {
-	    "amp": {
-		"data": {
-		    "adc": "GA1.2.662776284.1602172186",
-		    "curl": "https://example.com/index.html",
-		    "debug": "1",
-		    "pvid": "",  // page view ID
-		    "ms": "",    // multi-size
-		    "ow": "",    // override-width
-		    "oh": "",    // override-height
-		    "w": "300",
-		    "h": "50",
-		    "gdpr_consent": "",
-		    "purl": "https://example.com/index.html",
-		    "slot": "/11111/amp_test",
-		    "timeout": "1000",
-		    "targeting": "{\"site\":{\"attr\":\"val\"}}",
-		    "tag_id": "amp-AMP_Test-300x250",
-		    "account": "22222"
-		}
-	    }
-	}
+"ext": {
+  "prebid": {
+    "amp": {
+      "data": {
+        "adc": "GA1.2.662776284.1602172186",
+        "curl": "https://example.com/index.html",
+        "debug": "1",
+        "pvid": "",  // page view ID
+        "ms": "",    // multi-size
+        "ow": "",    // override-width
+        "oh": "",    // override-height
+        "w": "300",
+        "h": "50",
+        "gdpr_consent": "",
+        "purl": "https://example.com/index.html",
+        "slot": "/11111/amp_test",
+        "timeout": "1000",
+        "targeting": "{\"site\":{\"attr\":\"val\"}}",
+        "tag_id": "amp-AMP_Test-300x250",
+        "account": "22222"
+      }
     }
+  }
+}
 ```
 
 ##### EID Permissions (PBS-Go only)
@@ -917,17 +932,17 @@ in user.ext.eids is allowed to be passed to which bid adapter. For example:
 
 ```
 {
-    ext: {
-        prebid: {
-            data: {
-                eidpermissions: [   // prebid server will use this to filter user.ext.eids
-                   {"source": "sharedid.org", "bidders": ["*"]},  // * is the default
-                   {"source": "neustar.biz", "bidders": ["bidderB"]},
-                   {"source": "id5-sync.com", "bidders": ["bidderA","bidderC"]}
-                ]
-            }
-        }
+  "ext": {
+    "prebid": {
+      "data": {
+        "eidpermissions": [   // prebid server will use this to filter user.ext.eids
+          {"source": "sharedid.org", "bidders": ["*"]},  // * is the default
+          {"source": "neustar.biz",  "bidders": ["bidderB"]},
+          {"source": "id5-sync.com", "bidders": ["bidderA","bidderC"]}
+        ]
+      }
     }
+  }
 }
 ```
 
@@ -942,19 +957,19 @@ The Prebid extension to the OpenRTB protocol is `ext.prebid.multibid`. For examp
 
 ```
 {
-  ext: {
-    prebid: {
-      multibid: [{
-        bidder: "bidderA",
-        maxbids: 2,
-        targetbiddercodeprefix: "bidA"
-      },{
-        bidder: "bidderB",
-        maxbids: 3,
-        targetbiddercodeprefix: "bidB"
-      },{
-        bidders: ["bidderC", "bidderD"]
-        maxbids: 2
+  "ext": {
+    "prebid": {
+      "multibid": [{
+        "bidder": "bidderA",
+        "maxbids": 2,
+        "targetbiddercodeprefix": "bidA"
+      }, {
+        "bidder": "bidderB",
+        "maxbids": 3,
+        "targetbiddercodeprefix": "bidB"
+      }, {
+        "bidders": ["bidderC", "bidderD"],
+        "maxbids": 2
       }]
     }
   }
@@ -980,36 +995,36 @@ Prebid Server core does the following when it sees `ext.prebid.multibid`:
 Here's an example response:
 ```
 {
-seatbid: [{
-  seat: "bidderA",
-  bid: [{
-    id: "bid1",
-    impid: "imp1",
-    price: 1.04,
-    ext: {
-        prebid: {
-            targeting: {
-                hb_pb_bidderA: 1.00
-            },
-            targetbiddercode: "bidderA"
+  "seatbid": [{
+    "seat": "bidderA",
+    "bid": [{
+      "id": "bid1",
+      "impid": "imp1",
+      "price": 1.04,
+      "ext": {
+        "prebid": {
+          "targeting": {
+            "hb_pb_bidderA": 1.00
+          },
+          "targetbiddercode": "bidderA"
         }
-    }
-    ...
-  },{
-    id: "bid2",
-    impid: "imp1",   // same imp as above
-    price:0.8,
-    ext: {
-        prebid: {
-            targeting: {
-                hb_pb_bidA2: 0.50
-            },
-            targetbiddercode: "bidA2"
+      }
+      ...
+    }, {
+      "id": "bid2",
+      "impid": "imp1", // same imp as above
+      "price": 0.8,
+      "ext": {
+        "prebid": {
+          "targeting": {
+            "hb_pb_bidA2": 0.50
+          },
+          "targetbiddercode": "bidA2"
         }
-    }
-    ...
+      }
+      ...
+    }]
   }]
-}]
 }
 ```
 
@@ -1022,24 +1037,25 @@ which causes PBS-core to place the video-related attributes on the response.
 
 ```
 {
-   ... 
-    
-    "imp": [
-        {
-            "id": "123456789",
-            "video": { ... }, 
-            "ext": {
-                "prebid": {
-                    "storedrequest": { "id": "xxx" },
-                    "options": {
-                        "echovideoattrs": true
-                    } 
-                }
-            }, 
-	    ...
+  ...
+  "imp": [{
+    "id": "123456789",
+    "video": {
+      ...
+    },
+    "ext": {
+      "prebid": {
+        "storedrequest": {
+          "id": "xxx"
+        },
+        "options": {
+          "echovideoattrs": true
         }
-    ]
+      }
+    },
     ...
+  }]
+  ...
 }
 ```
 1. Prebid Server receives this request and expands the `storedrequest` value, merging it with the imp object.
@@ -1047,31 +1063,26 @@ which causes PBS-core to place the video-related attributes on the response.
 
 ```
 {
-    "seatbid": [{
-            "bid": [{
-                   ...
-                    "ext": {
-                        "prebid": {
-                            "storedrequestattributes":{
-                                "maxduration": 60, 
-                                "mimes": [
-                                    "video/mp4"
-                                ], 
-                                "minduration": 15, 
-                                "protocols": [
-                                    1, 
-                                    2
-                                ], 
-                                "skipafter": 0, 
-                                "skipmin": 0, 
-                                "startdelay": 0,
-                                "playbackmethod": [1]
-                            }
-                        }
-                    }
-                }]
-        }],
-...
+  "seatbid": [{
+    "bid": [{
+      ...
+      "ext": {
+        "prebid": {
+          "storedrequestattributes": {
+            "maxduration": 60,
+            "mimes": ["video/mp4"],
+            "minduration": 15,
+            "protocols": [1, 2],
+            "skipafter": 0,
+            "skipmin": 0,
+            "startdelay": 0,
+            "playbackmethod": [1]
+          }
+        }
+      }
+    }]
+  }],
+  ...
 }
 ```
 
@@ -1133,31 +1144,31 @@ Prebid Server will generate ad server targeting variables as defined by request
 
 ```
 {
-seatbid: [{
-  seat: "bidderA",
-  bid: [{
-    id: "bid1",
-    impid: "imp1",
-    price: 1.04,
-    ext: {
-        prebid: {
-            targeting: {
-		hb_pb: 1.00, // values without prefixes on the winning bids only
-                hb_pb_bidderA: 1.00, // only if includebidderkeys is true
-		hb_bidder: "bidderA",
-		hb_size: "300x250",
-		hb_size_bidderA: "300x250",
-		hb_format: "video" // only if includeformat is specified
-		hb_deal: "123" // only if bid response contains a deal
-            }
+  "seatbid": [{
+    "seat": "bidderA",
+    "bid": [{
+      "id": "bid1",
+      "impid": "imp1",
+      "price": 1.04,
+      "ext": {
+        "prebid": {
+          "targeting": {
+            "hb_pb": 1.00, // values without prefixes on the winning bids only
+            "hb_pb_bidderA": 1.00, // only if includebidderkeys is true
+            "hb_bidder": "bidderA",
+            "hb_size": "300x250",
+            "hb_size_bidderA": "300x250",
+            "hb_format": "video", // only if includeformat is specified
+            "hb_deal": "123"      // only if bid response contains a deal
+          }
         }
-    }
-    ...
+      }
+      ...
+    }]
   }]
-}]
+}
 ```
 
-
 ##### Debug Output
 
 `response.ext.debug.httpcalls.{bidder}` will be populated only if `test:1` or `ext.prebid.debug:true`.
@@ -1170,20 +1181,16 @@ It is only returned on `test` bids for performance reasons, but may be useful du
 This contains the request after the resolution of stored requests and implicit information (e.g. site domain, device user agent).
 
 ```
-  "ext": {
-    "debug": {
-      "httpcalls": {
-        "bidderA": [
-          ...
-        ]
-      },
-      "resolvedrequest": {
-        ...
-      },
-      "responsetimemillis": {
-        ...
-      }
-      ...
+"ext": {
+  "debug": {
+    "httpcalls": {
+      "bidderA": [ ... ]
+    },
+    "resolvedrequest": { ... },
+    "responsetimemillis": { ... }
+    ...
+  }
+}
 ```
 
 ##### Original Bid CPM (PBS-Java only)
@@ -1244,9 +1251,9 @@ The PBJS version comes from ext.prebid.channel: `{name: "pbjs", version: "4.39"}
 
 The Prebid SDK version comes from:
 ```
-app.ext.prebid: {
-   source:  "prebid-mobile"
-   version: "1.2.3"
+"app.ext.prebid": {
+   "source":  "prebid-mobile"
+   "version": "1.2.3"
 }
 ```
 
@@ -1281,6 +1288,7 @@ app.ext.prebid: {
 | req | ext.prebid.auctiontimestamp | timestamp for use in correlating PBJS and PBS events | long int | 123456789 | yes |
 | req | ext.prebid.options. echovideoattrs | causes PBS-core to [echo video attributes](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#echo-storedrequest-video-attributes-pbs-java-only) on seatbid[].bid[].ext.prebid.storedrequestattributes so the player has access to them | boolean | true | yes |
 | req | ext.prebid.multibid | allows bidders to respond with more than one bid | object | see [docs](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#multibid-pbs-java-only) | yes, but only their value |
+| req | ext.prebid.buyeruid | An alternate to [/cookie_sync](/prebid-server/endpoints/pbs-endpoint-cookieSync.html), the request can supply bidder ID values | object | See [doc](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#buyer-uid) | no |
 | resp | seatbid[].bid[].ext. prebid.targeting | ad server targeting values. Related to req ext.prebid.targeting. | object | see [docs](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#ad-server-targeting) | n/a |
 | resp | seatbid[].bid[].ext.prebid. type | "banner", "video", "native" | string | "banner" | n/a |
 | resp | seatbid[].bid[].ext.prebid. cache.bids.url | URL location of the bid or VAST | string | URL | n/a |
diff --git a/prebid-server/endpoints/pbs-endpoint-admin.md b/prebid-server/endpoints/pbs-endpoint-admin.md
index 15f77672ab..bca308651e 100644
--- a/prebid-server/endpoints/pbs-endpoint-admin.md
+++ b/prebid-server/endpoints/pbs-endpoint-admin.md
@@ -138,6 +138,7 @@ Query Params
 - statusCode - specifies that only interactions resulting in this response status code should be logged; valid values: >=200 and <=500
 - account - specifies that only interactions involving this account should be logged
 - limit - number of interactions to log; there is an upper threshold for this value set in configuration
+- bidder - name of the bidder whose adapter request will be logged
 
 ## /logging/changelevel
 
diff --git a/prebid-server/endpoints/pbs-endpoint-event.md b/prebid-server/endpoints/pbs-endpoint-event.md
index 0c354142a3..28a4f38b05 100644
--- a/prebid-server/endpoints/pbs-endpoint-event.md
+++ b/prebid-server/endpoints/pbs-endpoint-event.md
@@ -7,7 +7,7 @@ title: Prebid Server | Endpoints | Events
 
 # Prebid Server | Endpoints | Events (Java-only)
 
-PBS-Java supports events as described in these GitHub issues:
+Prebid Server supports events as described in these GitHub issues:
 
 - [Prebid Server Event Notification proposal](https://github.com/prebid/prebid-server/issues/800)
 - [Prebid Server Event Updates](https://github.com/prebid/prebid-server/issues/1202)
diff --git a/prebid-server/endpoints/pbs-endpoint-overview.md b/prebid-server/endpoints/pbs-endpoint-overview.md
index 502dcfe7b1..e6f0e6c739 100644
--- a/prebid-server/endpoints/pbs-endpoint-overview.md
+++ b/prebid-server/endpoints/pbs-endpoint-overview.md
@@ -22,8 +22,8 @@ The API endpoints recognized by Prebid Server:
 | [GET /getuids](/prebid-server/endpoints/pbs-endpoint-getuids.html) | Parses the `uids` cookie and returns JSON. |
 | [GET /status](/prebid-server/endpoints/pbs-endpoint-status.html) | A health check. |
 | [GET /info](/prebid-server/endpoints/info/pbs-endpoint-info.html) | Returns various information about how the server is configured. |
-| [GET /event](/prebid-server/endpoints/pbs-endpoint-event.html) | (PBS-Java only) Alerts Prebid Server to process an event. |
-| [POST /vtrack](/prebid-server/endpoints/pbs-endpoint-event.html) | (PBS-Java only) Cache VAST XML after inserting tracking string. |
+| [GET /event](/prebid-server/endpoints/pbs-endpoint-event.html) | Alerts Prebid Server to process an event. |
+| [POST /vtrack](/prebid-server/endpoints/pbs-endpoint-event.html) | Cache VAST XML after inserting tracking string. |
 | [/currency/rates](/prebid-server/endpoints/pbs-endpoint-admin.html) | (Admin port only) Retrieves the server's current currency conversion rates. |
 
 ## Prebid Cache
diff --git a/prebid-server/endpoints/pbs-endpoint-setuid.md b/prebid-server/endpoints/pbs-endpoint-setuid.md
index ea379418ac..eb47472dd5 100644
--- a/prebid-server/endpoints/pbs-endpoint-setuid.md
+++ b/prebid-server/endpoints/pbs-endpoint-setuid.md
@@ -16,7 +16,7 @@ This endpoint saves a UserID for a Bidder in the Cookie. Saved IDs will be recog
 
 ### Query Params
 
-- `bidder`: The FamilyName of the Usersyncer (`../../usersync/usersync.go`) which is being synced.
+- `bidder`: The key of the bidder which is being synced. This may not always match the bidder name,.
 - `uid`: The ID which the Bidder uses to recognize this user. If undefined, the UID for `bidder` will be deleted.
 - `gdpr`: This should be `1` if GDPR is in effect, `0` if not, and undefined if the caller isn't sure
 - `gdpr_consent`: This is required if `gdpr` is one, and optional (but encouraged) otherwise. If present, it should be an [unpadded base64-URL](https://tools.ietf.org/html/rfc4648#page-7) encoded [Vendor Consent String](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/Consent%20string%20and%20vendor%20list%20formats%20v1.1%20Final.md).
@@ -38,16 +38,8 @@ If in doubt, contact the company hosting Prebid Server and ask if they're GDPR-r
 
 ### Return Values
 
-PBS-Go: 
-
-- HTTP 200
-    - Success: blank body with Set-Cookies header
-    - Failure: error message in body
-
-PBS-Java:
-
 - HTTP 400 - The request is in GDPR scope and the consent string is missing or invalid.
-- HTTP 451 - PBS does not have permission to set a cookie due to GDPR or other privacy rule.
+- HTTP 451 - PBS does not have permission to set a cookie due to GDPR or another privacy rule.
 - HTTP 200
     - Success with image response: if the f=i parameter is specified or if the named bidder prefers redirect cookie_syncs, then PBS responds with a blank 1x1 PNG, set the Content-Length to the appropriate number of bytes, and set Content-Type to image/png
     - Success with empty response: if the f=b parameter is specified or if the named bidder prefers iframe cookie_syncs, then PBS responds with empty HTML, Content-Length 0 and Content-Type to text/html
diff --git a/prebid-server/features/pbs-currency.md b/prebid-server/features/pbs-currency.md
index 3fe503fe98..347abf63e6 100644
--- a/prebid-server/features/pbs-currency.md
+++ b/prebid-server/features/pbs-currency.md
@@ -84,13 +84,13 @@ Rates can be passed in on the request:
 
 ```
 "ext": {
-    "prebid": {
-	  "currency": {
-		  "rates": {
-			  "USD": { "UAH": 24.47, "ETB": 32.04, "EUR": 0.92, ... }
-		  },
-                  "usepbsrates": false // defaults to true
-	  }
+  "prebid": {
+    "currency": {
+      "rates": {
+        "USD": { "UAH": 24.47, "ETB": 32.04, "EUR": 0.92, ... }
+      },
+      "usepbsrates": false // defaults to true
+    }
   }
 }
 ```
@@ -104,3 +104,9 @@ Note that the `usepbsrates` flag allows you to define which rates to use when PB
 
 A dedicated endpoint on the Admin port will allow you to see what's happening within the currency converter.
 See [currency rates endpoint](/prebid-server/endpoints/pbs-endpoint-admin.html) for more details.
+
+## Price Granularity
+
+When converting to a currency where the typical nominal CPMs are much different than USD such as JPY or INR, use a custom price granularity that reflects the typical range of CPMs in that currency.  
+
+The predefined price granularities such as `medium` or `dense` will not be correctly scaled and thus almost every bid will end in the top bucket.  Unlike Prebid.js, Prebid Server does not support `granularityMultiplier` to scale granularities so a custom price granularity needs to be used.
\ No newline at end of file
diff --git a/prebid-server/features/pbs-default-request.md b/prebid-server/features/pbs-default-request.md
index 3badc95482..d11b01a092 100644
--- a/prebid-server/features/pbs-default-request.md
+++ b/prebid-server/features/pbs-default-request.md
@@ -21,7 +21,7 @@ default_request:
     alias_info: false
 ```
 
-The `file.name` option is the path/filename of a JSON file containing default request JSON. See the [stored request doc](/prebid-server/features/pbs-storedreqs.html) and the [openrtb2/auction endpoint doc](/prebid-server/endpoints/openrtb2/auction.html) for details about the syntax.
+The `file.name` option is the path/filename of a JSON file containing default request JSON. See the [stored request doc](/prebid-server/features/pbs-storedreqs.html) and the [openrtb2/auction endpoint doc](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html) for details about the syntax.
 
 PBS-Java has a slightly different configuration in application.yaml:
 ```
diff --git a/prebid-server/features/pbs-feature-idx.md b/prebid-server/features/pbs-feature-idx.md
index 8165c65688..6a11cfb541 100644
--- a/prebid-server/features/pbs-feature-idx.md
+++ b/prebid-server/features/pbs-feature-idx.md
@@ -11,8 +11,8 @@ title: Prebid Server | Features
 | Feature Set | Feature | Description | PBS-Go | PBS-Java |
 |-------------+---------+-------------+--------+----------|
 | [Currency](/prebid-server/features/pbs-currency.html) | Core | Loads currency conversions from an outside source, allows non-supported currencies to come in on the OpenRTB2 request, converts bid currencies to the request's prefered currency. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| [Currency](/prebid-server/features/pbs-currency.html) | Request-Defined Rates | Allows the request to define its own currency rates. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| Currency | pbsConvertCurrency method | Allows adapters to convert bid floors to a different currency if needed. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| [Currency](/prebid-server/features/pbs-currency.html) | Request-Defined Rates | Allows the request to define its own currency rates. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Currency | Convert Currency Method | Allows adapters to convert bid floors to a different currency if needed. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [Deals](/prebid-server/features/pbs-deals.html) | Core | Basic deal support, creating hb_deal targeting when appropriate. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Deals | Deal prioritization | Supports the 'preferdeals' [targeting flag](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#targeting) to give deals the priority when PBS returns ad server targeting. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [AMP](/prebid-server/use-cases/pbs-amp.html) | Core | Reads and responds to the /openrtb2/amp endpoint | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
@@ -49,27 +49,27 @@ title: Prebid Server | Features
 | [Supply Chain](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#supply-chain-support) | Bidder-specific schains | Accepts bidder-specific schain | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Supply Chain | Host SChain | The host company can supply a global schain that's appended to the list of incoming nodes in source.ext.schain. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Publisher Accounts | Core | Ability to enforce that requests coming in have a valid account ID. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| Publisher Accounts | AMP account parameter | Accept the account parameter on the AMP request. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Publisher Accounts | AMP account parameter | Accept the account parameter on the AMP request. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Publisher Accounts | Account-specific TTLs | Allow each account ID to have a custom PBC time-to-live for banner and video. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [Video](/formats/video.html) | Core | Support for basic instream and outstream video: passes video parameters to adapters, stores VAST responses when instructed. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Video | Outstream renderers | Support for bidders specifying their own renderers for outstream video. | | |
 | Video | Long-form video | Support for the [long-form video endpoint](/prebid-server/endpoints/openrtb2/pbs-endpoint-video.html). | <img src="/assets/images/icons/icon-check-green.png" width="30"> | |
 | Video | IAB advertiser category mapping | Able to map IAB advertiser categories to a supplied mapping table. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | |
-| Video | [Echo video attributes](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#echo-storedrequest-video-attributes-pbs-java-only) | To support mobile video, copies stored request video attributes to the response. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Video | [Echo video attributes](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#echo-storedrequest-video-attributes-pbs-java-only) | To support mobile video, copies stored request video attributes to the response. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [Interstitials](/prebid-server/features/pbs-interstitials.html) | Core | Support device.ext.prebid.interstitial.minwidthperc and device.ext.prebid.interstitial.minheightperc parameters, [dynamically updating the impression format object](https://github.com/prebid/prebid-server/issues/755) from a configurable list of sizes filtered by these parameters. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [Aliases](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#bidder-aliases) | Core | Maps a biddercode on an incoming request to a specific server-side bid adapter named in the request or defined in config. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Aliases | [GVL ID support](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#bidder-alias-gvl-ids-pbs-java-only) | Define the IAB GVL ID for an aliased biddercode. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [User ID Sync](/prebid-server/developers/pbs-cookie-sync.html) | Core | Implements the /cookie_sync and /setuid endpoints. Bidders may choose either redirect or iframe method. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| User ID Sync | Multi-Method | Bidders can supply both pixel redirects as well as iframe syncs. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| User ID Sync | Cooperative sync | Does a pixel sync with more than just the bidders on the page. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| User ID Sync | Multi-Method | Bidders can supply both pixel redirects as well as iframe syncs. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| User ID Sync | Cooperative sync | Does a pixel sync with more than just the bidders on the page. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | User ID Permissions | Extended ID Permissions | Allows publishers to determine which bidders are allowed to receive which extended ID. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | |
 | User ID Sync | Account override | Allows accounts to override the cooperative sync feature and bidder limits. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | User ID | [EID Permissions](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#eid-permissions) | The Publisher can define which bidders receive which extended user IDs. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| [Events](https://docs.google.com/document/d/1ry0X4C2EV-R0pMrm1IQk9BstxaT395UCl3KKqTGa5c8/edit#heading=h.7w5yevygp2gz) | Events | Ability to process the /event endpoint, place /event URLs in the OpenRTB response, and place /event URLs in VAST XML. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| Events | Events vasttrack endpoint | Ability to process the /vasttrack endpoint initated by Prebid.js, placing /event URLs in VAST XML. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| Events | Events BidID Generation | Some bidders don't generate unique enough BidIDs to join with auction events. This feature allows the host company to inject a PBS-generated BidID alongside the bidder-generated ID. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| [Events](https://docs.google.com/document/d/1ry0X4C2EV-R0pMrm1IQk9BstxaT395UCl3KKqTGa5c8/edit#heading=h.7w5yevygp2gz) | Events | Ability to process the /event endpoint, place /event URLs in the OpenRTB response, and place /event URLs in VAST XML. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Events | Events vasttrack endpoint | Ability to process the /vasttrack endpoint initated by Prebid.js, placing /event URLs in VAST XML. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Events | Events BidID Generation | Some bidders don't generate unique enough BidIDs to join with auction events. This feature allows the host company to inject a PBS-generated BidID alongside the bidder-generated ID. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Auction | [MultiBid](/prebid-server/endpoints/openrtb2/pbs-endpoint-auction.html#multibid-pbs-java-only) | Allow named bidders to supply more than one response. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
-| Analytics | Analytics module support | Allows developers to plug in a [custom analytics adapter](/developers/pbs-build-an-analytics-adapter.html). | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
+| Analytics | Analytics module support | Allows developers to plug in a [custom analytics adapter](/prebid-server/developers/pbs-build-an-analytics-adapter.html). | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Bid Response Validation | Validate secure markup | PBS can configurably reject bid responses that don't supply a secure creative when in a secure context. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | Bid Response Validation | Validate bid sizes | PBS can configurably reject bid responses with sizes that are bigger than the request dimensions. | | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
 | [Bidder Info Endpoints](/prebid-server/endpoints/info/pbs-endpoint-info.html) | Core | Provides details on which bidders and parameters exist in this Prebid Server. | <img src="/assets/images/icons/icon-check-green.png" width="30"> | <img src="/assets/images/icons/icon-check-green.png" width="30"> |
diff --git a/prebid-server/features/pbs-privacy.md b/prebid-server/features/pbs-privacy.md
index bceda67ffe..bc83cc5a6c 100644
--- a/prebid-server/features/pbs-privacy.md
+++ b/prebid-server/features/pbs-privacy.md
@@ -58,7 +58,7 @@ There are a number of GDPR configuration settings that PBS Host Companies must
 consider:
 
 - **GDPR enabled** - Allows the host company to turn off GDPR support. Default setting is enabled=true.
-- **Default GDPR applies** - How Prebid Server should respond if the incoming request doesn't have the `gdpr` flag. (Note: this config is currently called `usersync_if_ambiguous` in PBS-Go and gdpr.default-value in PBS-Java.)
+- **Default GDPR applies** - How Prebid Server should respond if the incoming request doesn't have the `gdpr` flag. (Note: this config is currently called `gdpr.default_value` in PBS-Go and `gdpr.default-value` in PBS-Java.)
 - **Host company GVL ID** - Currently PBS requires the host company to have a GVL-ID or the setting of the `uids` cookie in GDPR scope will fail.
 - **GDPR enforcement flags** - for each Purpose
 - **Host Cookie TTL** - The default expiration time of the `uids` cookie set in the host company domain should be defined to match what's in the TCF 2.1 `maxCookieAgeSeconds` GVL field. (This is the host-cookie.ttl-days setting in both Go and Java.)
diff --git a/prebid-server/hosting/pbs-database.md b/prebid-server/hosting/pbs-database.md
index 4dfde3d158..08efe50163 100644
--- a/prebid-server/hosting/pbs-database.md
+++ b/prebid-server/hosting/pbs-database.md
@@ -99,7 +99,7 @@ create a view as desired. We'll fix this someday.
 Account data is queried on every request to pull in important data. There is an LRU cache in the server
 so the database isn't actually hit on every request.
 
-In PBS-Java, many account-configuration options come from the database, while in PBS-Go, those options are available in YAML configuration.
+In PBS-Java, many account-configuration options come from the database. In PBS-Go, those options are available in either a YAML configuration or from an HTTP API.
 
 In both versions the server can optionally validate the account against this database and reject accounts from
 unknown sources.
@@ -108,7 +108,7 @@ The algorithm the server uses for determining the account ID of the incoming req
 
 1. look in site.publisher.id
 2. look in app.publisher.id
-3. if AMP, look for the 'account' parameter on the query string (PBS-Java only)
+3. if AMP, look for the 'account' parameter on the query string
 
 Here are the fields the server can recognize in the database response:
 
diff --git a/prebid-server/hosting/pbs-hosting.md b/prebid-server/hosting/pbs-hosting.md
index 96402bd87c..144fd0f196 100644
--- a/prebid-server/hosting/pbs-hosting.md
+++ b/prebid-server/hosting/pbs-hosting.md
@@ -68,7 +68,7 @@ populating data from their internal systems.
 You'll want to hook both Prebid Server and Prebid Cache up to an
 operational monitoring system.
 
-- PBS-Go currently supports Influx and Promotheus
+- PBS-Go currently supports Influx and Prometheus
 - PBS-Java currently supports Influx and Graphite
 
 ## Installing the Software
diff --git a/prebid-server/pbs-modules/index.md b/prebid-server/pbs-modules/index.md
index 746c4da817..5a1b32b172 100644
--- a/prebid-server/pbs-modules/index.md
+++ b/prebid-server/pbs-modules/index.md
@@ -64,7 +64,7 @@ hooks:
           "entrypoint": { # stage
             "groups": [
               {
-                "timeout": 3000,  # in nanoseconds
+                "timeout": 3,  # in milliseconds
                 "hook-sequence": [
                   {
                     "modulecode": "modulecode1",
@@ -76,8 +76,8 @@ hooks:
                   }
                 ]
               },{ // this group depends on the results of the first group
-		"timeout": 5000,  # in nanoseconds
-		"hook-sequence": [
+		            "timeout": 5,  # in milliseconds
+		            "hook-sequence": [
                   {
                     "modulecode": "modulecode3",
                     "hookimplcode": "hook3-depends-on-hook1"
@@ -97,7 +97,7 @@ hooks:
           "raw-auction-request": { # stage
             "groups": [
               {
-                "timeout": 5000,
+                "timeout": 5,
                 "hook-sequence": [
                   {
                     "modulecode": "modulecodeA",
diff --git a/prebid-server/versions/pbs-versions-go.md b/prebid-server/versions/pbs-versions-go.md
index 9f6a45ea99..d2de934923 100644
--- a/prebid-server/versions/pbs-versions-go.md
+++ b/prebid-server/versions/pbs-versions-go.md
@@ -28,7 +28,7 @@ The Go version of Prebid Server is for those who:
 
 ## Features
 
-PBS-Go has all the core PBS features, but does have a backlog of newer [features](/prebid-server/features/pbs-feature-idx.html), so you'll want to look over the list to be familiar with the differences.
+We recommend you review the [feature comparison list](/prebid-server/features/pbs-feature-idx.html) to familiarize yourself with the differences between this and PBS-Java in deciding which version is right for you.
 
 ## Code Repositories
 
diff --git a/prebid-server/versions/pbs-versions-java.md b/prebid-server/versions/pbs-versions-java.md
index d024930727..7f68600244 100644
--- a/prebid-server/versions/pbs-versions-java.md
+++ b/prebid-server/versions/pbs-versions-java.md
@@ -27,7 +27,7 @@ The Java version of Prebid Server is for those who:
 
 ## Features
 
-PBS-Java look over the [feature list](/prebid-server/features/pbs-feature-idx.html) to be familiar with the differences.
+We recommend you review the [feature comparison list](/prebid-server/features/pbs-feature-idx.html) to familiarize yourself with the differences between this and PBS-Go in deciding which version is right for you.
 
 ## Code Repositories
 
diff --git a/prebid-video/video-getting-started.md b/prebid-video/video-getting-started.md
index 82bc941d97..fbc05431c3 100644
--- a/prebid-video/video-getting-started.md
+++ b/prebid-video/video-getting-started.md
@@ -137,7 +137,7 @@ And this is where setups for instream and outstream diverge. Please follow one o
 Be sure to note the setting for price granularity.  You might need to set up a custom price granularity. (See “Custom CPM Bucket Sizing” under [Price Granularity](/dev-docs/publisher-api-reference/setConfig.html#setConfig-Price-Granularity). Or, if you’re monetizing both banner and video inventory with Prebid, you might need to define format-specific price granularity settings through  [mediaTypePriceGranularity](/dev-docs/publisher-api-reference/setConfig.html#setConfig-MediaType-Price-Granularity).
 
 {: .alert.alert-info :}
-**Prebid Server**  If you’re using Prebid Server, you also need to configure your server-to-server bidder adapters. See [Getting Started with Prebid Server]({{site.github.url}}/dev-docs/get-started-with-prebid-server.html#step-4-configure-s2s-bidder-adapters) for details and examples.
+**Prebid Server**  If you’re using Prebid Server, you also need to configure your server-to-server bidder adapters. See [Getting Started with Prebid Server](/overview/prebid-server-overview.html).
 
 ### Examples
 
diff --git a/troubleshooting/troubleshooting-guide.md b/troubleshooting/troubleshooting-guide.md
index 7dd94f51f8..12843faac9 100644
--- a/troubleshooting/troubleshooting-guide.md
+++ b/troubleshooting/troubleshooting-guide.md
@@ -182,7 +182,7 @@ Here's another scenario using the 'debugging' feature described in the previous
 
 This section covers cases in which a particular server-side bidder doesn't always respond with a bid, or you want to try specific bid CPM values to verify line item setup.
 
-If you're using Prebid Server (i.e. the [s2sConfig](/dev-docs/publisher-api-reference/setconfig#setConfig-Server-to-Server) option), you can force it to respond with a particular canned response on any page by defining a storedAuctionResponse ID on the javascript console:
+If you're using Prebid Server (i.e. the [s2sConfig](/dev-docs/publisher-api-reference/setConfig.html#setConfig-Server-to-Server) option), you can force it to respond with a particular canned response on any page by defining a storedAuctionResponse ID on the javascript console:
 
 ```javascript
 javascript console> pbjs.setConfig({