From 3d662e765a939259779ef2c946c798c00252c22f Mon Sep 17 00:00:00 2001
From: sberry <sberry@appnexus.com>
Date: Fri, 13 Jan 2017 16:54:40 -0500
Subject: [PATCH 01/30] fixed js fiddle example line numbering

---
 assets/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index df265ee224..99915ebcd8 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -327,7 +327,7 @@ table.jsfiddle-line-number .line-number {
   margin-bottom: 6px;
 }
 
-table {
+table:not(.jsfiddle-line-number) {
     table-layout: fixed;
     word-wrap: break-word;
 }

From ad95aa2104986416d1be064afb7758884504fd0a Mon Sep 17 00:00:00 2001
From: Dan Harton <dan@sparklit.com>
Date: Sat, 14 Jan 2017 09:54:53 -0800
Subject: [PATCH 02/30] Add AdButler to Prebid homepage (#162)

Bidder params were added when adapter was initially committed, but this file was never updated.
---
 index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.md b/index.md
index 1b294bfa42..89157ba1b2 100755
--- a/index.md
+++ b/index.md
@@ -103,7 +103,8 @@ description: A free and open source library for publishers to quickly implement
     <div class="col-xs-6 col-sm-4"><h3>GumGum</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Vertoz</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Smart AdServer</h3></div>
-
+    <div class="col-xs-6 col-sm-4"><h3>AdButler</h3></div>
+    
     <!-- END BIDDERS -->
     
     </div>

From cbb4d48fffcb63b5ca47ab79b396e94a95887fcb Mon Sep 17 00:00:00 2001
From: sberry <sberry@appnexus.com>
Date: Tue, 17 Jan 2017 13:33:04 -0500
Subject: [PATCH 03/30] added video player examples. put example tab into
 separate layout file

---
 _includes/example_tab.html               |  24 +++++
 _layouts/example.html                    |  19 +---
 _layouts/player_example.html             | 125 +++++++++++++++++++++++
 assets/css/style.css                     |   7 +-
 dev-docs/examples/brightcove-example.md  |  93 +++++++++++++++++
 dev-docs/examples/jw-cloud-example.md    |  89 ++++++++++++++++
 dev-docs/examples/jw-selfhost-example.md |  87 ++++++++++++++++
 dev-docs/examples/kaltura-example.md     |  78 ++++++++++++++
 dev-docs/examples/ooyala-example.md      |  82 +++++++++++++++
 9 files changed, 586 insertions(+), 18 deletions(-)
 create mode 100644 _includes/example_tab.html
 create mode 100644 _layouts/player_example.html
 create mode 100644 dev-docs/examples/brightcove-example.md
 create mode 100644 dev-docs/examples/jw-cloud-example.md
 create mode 100644 dev-docs/examples/jw-selfhost-example.md
 create mode 100644 dev-docs/examples/kaltura-example.md
 create mode 100644 dev-docs/examples/ooyala-example.md

diff --git a/_includes/example_tab.html b/_includes/example_tab.html
new file mode 100644
index 0000000000..caa1a67e61
--- /dev/null
+++ b/_includes/example_tab.html
@@ -0,0 +1,24 @@
+<h5>All Examples</h5>
+
+<ul id="example-tab">
+
+  {% assign example_pages = (site.pages | where: "layout", "example") | sort: "pid" %}
+  {% for epage in example_pages %}
+    <li>
+      <a href="{{ epage.url }}">{{ epage.title }}</a>
+      {% if epage.is_beta %}
+        <span class="label label-warning">Beta</span>
+      {% endif %}
+    </li>
+  {% endfor %}
+  <br>
+  {% assign pl_example_pages = (site.pages | where: "layout", "player_example" | sort: "pid" %}
+  {% for p_epage in pl_example_pages %}
+    <li>
+      <a href="{{ p_epage.url }}">{{ p_epage.title }}</a>
+      {% if p_epage.is_beta %}
+        <span class="label label-warning">Beta</span>
+      {% endif %}
+    </li>
+  {% endfor %}
+</ul>
\ No newline at end of file
diff --git a/_layouts/example.html b/_layouts/example.html
index 14ff4a65e1..9d03f1e5cc 100644
--- a/_layouts/example.html
+++ b/_layouts/example.html
@@ -13,24 +13,9 @@
           </div>
 
           <div class="col-md-6">
-            <h5>All Examples</h5>
-
-            <ul id="example-tab">
-
-              {% assign example_pages = (site.pages | where: "layout", "example") | sort: "pid" %}
-
-              {% for epage in example_pages %}
-                <li>
-                  <a href="{{ epage.url }}">{{ epage.title }}</a>
-                  {% if epage.is_beta %}
-                    <span class="label label-warning">Beta</span>
-                  {% endif %}
-                </li>
-              {% endfor %}
-
-            </ul>
+            {% include example_tab.html %}
             <!-- </div> -->
-        </div>
+          </div>
       </div>
     </div>
   </div>
diff --git a/_layouts/player_example.html b/_layouts/player_example.html
new file mode 100644
index 0000000000..533873ddcb
--- /dev/null
+++ b/_layouts/player_example.html
@@ -0,0 +1,125 @@
+{% include head.html %}
+
+{% include main_nav.html %}
+
+<div class="container bs-docs-container">
+  <div class="row">
+
+    <div class="col-md-5">
+      <div class="docs-sidebar">
+        <div class="row">
+          <div class="col-md-6">
+            {% include left_nav.html %}
+          </div>
+
+          <div class="col-md-6">
+            {% include example_tab.html %}
+            <!-- </div> -->
+          </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-md-7" role="main">
+    <div class="bs-docs-section" markdown="1">
+
+      <h1>{{ page.description }} </h1>
+
+      {% if page.why_link %}
+        <h4>Who should use this example:</h4>
+
+        <ul>
+          <li>Please refer to the <a href="{{page.why_link}}" target="_blank">product feature launch notes</a>.</li>
+        </ul>
+      {% endif %}
+      <p>This page is an example of using prebid video with a specific player. For a general guide to using video in prebid, click <a href="prebid.org/dev-docs/show-video-with-a-dfp-video-tag.html">here.</a></p>
+      <br>
+
+      <h4>This page contains:</h4>
+
+      <p>
+        <ul>
+          {% for about_bullet in page.about %}
+            <li>{{ about_bullet}}</li>
+          {% endfor %}
+        </ul>
+      </p>
+      <br>
+      <h4>Player specific notes:</h4>
+      <p>
+        <ul>
+          {% for player_bullet in page.player_notes %}
+            <li>{{ player_bullet}}</li>
+          {% endfor %}
+        </ul>
+      </p>
+      <br>
+      <p>
+
+        Click <a href="//{{page.demo_link}}">here</a> to view a demo page with this example. Click <strong>Edit in JSFiddle</strong> to open the example in a new tab. 
+
+      </p>
+
+      <p>
+        For tips and troublshooting info, see:
+        <ul>
+          <li>
+            <a href="{{site.github.url}}/dev-docs/toubleshooting-tips.html">Tips for Troubleshooting</a>
+          </li>
+          <li>
+            <a href="{{site.github.url}}/dev-docs/common-issues.html">Common Issues</a>
+          </li>
+        </ul>
+      </p>
+
+    </div>
+  </div>
+
+</div>
+
+<br>
+
+<div class="row">
+
+<div class="col-sm-6">
+
+
+<table class="jsfiddle-line-number">
+<tr>
+<td class="line-number">
+
+{% for num in (1..page.code_lines) %}
+
+{{ num }} <br>
+
+{% endfor %}
+
+</td>
+
+<td>
+
+<iframe width="100%" height="{{page.code_height}}" src="//{{page.jsfiddle_link}}" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+</td>
+</tr>
+</table>
+
+
+</div>
+
+<div class="col-sm-6">
+
+
+{% include dev-docs/build-from-source-warning.md %}
+
+{{content}}
+
+</div>
+<br><br>
+
+</div>
+
+  </div>
+
+
+{% include foot.html %}
diff --git a/assets/css/style.css b/assets/css/style.css
index df265ee224..aaca586f18 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -327,7 +327,12 @@ table.jsfiddle-line-number .line-number {
   margin-bottom: 6px;
 }
 
-table {
+table:not(.jsfiddle-line-number) {
     table-layout: fixed;
     word-wrap: break-word;
 }
+
+div.pl-doc-entry{
+  position: absolute;
+}
+
diff --git a/dev-docs/examples/brightcove-example.md b/dev-docs/examples/brightcove-example.md
new file mode 100644
index 0000000000..692d87ea66
--- /dev/null
+++ b/dev-docs/examples/brightcove-example.md
@@ -0,0 +1,93 @@
+---
+layout: player_example
+title: Brightcove Player Integration
+description: Show a prebid ad in a Brightcove player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Using invokeVideoPlayer to set up and access the Brightcove player instance.
+- Using bc() to make sure all the necessary scripts are loaded before playing an ad.
+- Playing an ad using Brightcove's ima3 plugin.
+- Configuring the player's ima3 settings on page.
+
+player_notes:
+- For this demo we'll be configuring the player's ima3 settings on the page instead of in video cloud. Make sure you load the ima3 script and css file in addition to your player script.
+- On the publish page for the video or player, choose the <b>Advanced</b> embed code (not Standard).
+
+jsfiddle_link: jsfiddle.net/shirleylberry/dd4wd8z7/embedded/html/
+demo_link: video-demo.appnexus.com/pbjs/brightcove-prebid/bc-demo.html
+
+code_lines: 154
+code_height: 3325
+
+pid: 32
+---
+<div markdown="1" style="top:110px" class="pl-doc-entry">
+#### Line 4: Load the ima3 css file
+Load the ima3 css file to ensure the ad displays correctly in the player.
+</div>
+
+<div markdown="1" style="top:300px" class="pl-doc-entry">
+#### Line 15 to 18: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:550px" class="pl-doc-entry">
+#### Line 20 to 36: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:1000px" class="pl-doc-entry">
+#### Line 38 to 54: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1225px" class="pl-doc-entry">
+#### Line 57 to 75: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1400px" class="pl-doc-entry">
+#### Line 62 to 69: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2475px" class="pl-doc-entry">
+#### Line 113 to 122: Create video element
+Create your video element. You can copy paste this from the embed code in Video Cloud. Add an id tag to the player element - this is what we'll use to reference the player later.
+</div>
+
+<div markdown="1" style="top:2600px" class="pl-doc-entry">
+#### Line 125 and 126: Include player and ima3 plugin scripts
+First, include the player script from Brightcove. This will also be part of the embed code provided by Video Cloud. Then include the ima3 plugin script. Since we are not configuring the plugin in Video Cloud, we need to include this script on the page. 
+</div>
+
+<div markdown="1" style="top:2700px" class="pl-doc-entry">
+#### Line 129 to 146: Redefine invokeVideoPlayer
+Redefine `invokeVideoPlayer` to replace the temporary one we defined above. Now, `invokeVideoPlayer` will take in the winning url, create the player, and play the ad.
+</div>
+
+<div markdown="1" style="top:2775px" class="pl-doc-entry">
+#### Line 130: Use bc to reference the video player
+The first time we reference the player, we use the `bc()` method to ensure that all the player scripts have loaded before we add the video element to the dom or interact with it.
+</div>
+
+<div markdown="1" style="top:2850px" class="pl-doc-entry">
+#### Line 130 to 137: Pass options into the ima3 plugin
+Next pass in a json object of options to the player's ima3 plugin. The `url` we passed into `invokeVideoPlayer` will be the `serverUrl` we pass into the plugin.
+</div>
+
+<div markdown="1" style="top:2975px" class="pl-doc-entry">
+#### Line 139 to 145: Add a `ready` listener and interact with the player
+Call `videojs()` and pass in the id of the video element to get a reference to the player. Call `.ready` on the player to set up the event listener, and place any code that will interact with the player inside the callback (such as logging events for the player or ads).
+</div>
+
+<div markdown="1" style="top:3125px" class="pl-doc-entry">
+#### Line 148 to 151: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
diff --git a/dev-docs/examples/jw-cloud-example.md b/dev-docs/examples/jw-cloud-example.md
new file mode 100644
index 0000000000..8f1a83b515
--- /dev/null
+++ b/dev-docs/examples/jw-cloud-example.md
@@ -0,0 +1,89 @@
+---
+layout: player_example
+title: JW Cloud Player Integration
+description: Show a prebid ad in a cloud hosted JW Player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Setting up JW Player to dynamically play ads.
+- Using a cloud-hosted JW player.
+- Using invokeVideoPlayer to set up and access the JW Player instance.
+- Dynamically inserting a preroll ad into JW Player.
+
+player_notes:
+- You must have the correct JW Player license that allows you to play advertising.
+- The different methods of embedding JW Player on your site can be found <a href="https://support.jwplayer.com/customer/portal/articles/1406723-mp4-video-embed">here</a>. 
+- For this example we will be using method 1, a cloud-hosted player and JW Platform hosted content. To see an example using the self-hosted player, click <a href="#">here</a>.
+- No matter what embedding method you choose to use, you must follow the <b>custom embed</b> instructions. You cannot use the single-line embed.
+- If you're using a cloud-hosted player, <b>do not enable advertising in the platform</b>. We'll do it on page so that we can use the vast url from prebid.
+- You can set up most of your player's settings in the platform. The platform settings will be used unless overridden on the page in the setup call.
+
+jsfiddle_link: jsfiddle.net/shirleylberry/zt70zj9z/embedded/html/
+demo_link: video-demo.appnexus.com/pbjs/JWPlayerDemo/jwPlatformPrebidDemo.html
+
+code_lines: 137
+code_height: 2950
+
+pid: 30
+---
+<div markdown="1" style="top:200px" class="pl-doc-entry">
+#### Line 15 to 18: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:550px" class="pl-doc-entry">
+#### Line 20 to 34: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:950px" class="pl-doc-entry">
+#### Line 36 to 52: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1275px" class="pl-doc-entry">
+#### Line 54 to 73: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1400px" class="pl-doc-entry">
+#### Line 60 to 71: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2300px" class="pl-doc-entry">
+#### Line 112: Include the player library
+The script tag for your cloud-hosted video player can be found in your JW Platform account on the player's page, under 'Cloud Player Library URL'. The player will use the settings you define in JW Platform unless you override them on the page in the setup call.
+</div>
+
+<div markdown="1" style="top:2415px" class="pl-doc-entry">
+#### Line 114: Get a reference to the player instance
+Get a reference to the player by calling `jwplayer()` and passing in the id of the div you want to load the player into.
+</div>
+
+<div markdown="1" style="top:2500px" class="pl-doc-entry">
+#### Line 117 to 122: Call setup on the player instance
+Call `setup()` on the player instance with the settings you want. We need to pass in a media file and an advertising block with a `client` defined.
+</div>
+
+<div markdown="1" style="top:2575px" class="pl-doc-entry">
+#### Line 119 to 121: Pass in Advertising
+We must pass in an `"advertising"` block in our settings in order to enable advertising for this player. We can also specify the tag or an ad schedule here but for this demo we'll insert the tag dynamically before the content plays.
+</div>
+
+<div markdown="1" style="top:2675px" class="pl-doc-entry">
+#### Line 124 to 126: Play a prebid ad as a preroll
+Before the player begins to play the content video, play an ad.
+</div>
+
+<div markdown="1" style="top:2750px" class="pl-doc-entry">
+#### Line 129 to 132: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
+
+
diff --git a/dev-docs/examples/jw-selfhost-example.md b/dev-docs/examples/jw-selfhost-example.md
new file mode 100644
index 0000000000..eb38e97d23
--- /dev/null
+++ b/dev-docs/examples/jw-selfhost-example.md
@@ -0,0 +1,87 @@
+---
+layout: player_example
+title: JW Self-Hosted Player Integration
+description: Show a prebid ad in a self-hosted JW Player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Setting up JW Player to dynamically play ads.
+- Using a self-hosted player.
+- Create a masterVideoTag and pass it to invokeVideoPlayer.
+- Use invokeVideoPlayer to set up and access the JW Player instance.
+- Dynamically insert a preroll ad into JW Player.
+
+player_notes:
+- You must have the correct JW Player license that allows you to play advertising.
+- The different methods of embedding JW Player on your site can be found <a href="https://support.jwplayer.com/customer/portal/articles/1406723-mp4-video-embed">here</a>. 
+- For this example we will be using method 3, a self-hosted player and JW Platform hosted content. To see an example using the cloud-hosted player, click <a href="#">here</a>.
+- No matter what embedding method you choose to use, you must follow the <b>custom embed</b> instructions. You cannot use the single-line embed.
+
+jsfiddle_link: jsfiddle.net/shirleylberry/357yaqgc/embedded/html/
+demo_link: http://video-demo.appnexus.com/pbjs/JWPlayerDemo/jwPlayerPrebid.html
+
+code_lines: 141
+code_height: 3050
+
+pid: 31
+---
+<div markdown="1" style="top:175px" class="pl-doc-entry">
+#### Line 9 to 12: Include your self-hosted JW Player code and license key
+Load the JW Player script. Open another script tag and define your license key. Replace `abcdefghijkl` with your own license key for an account that has advertising enabled. You can find your license key in your dashboard by going to Tools (found under the Players section) and scrolling to Downloads to find JW Player 7 (Self-Hosted).
+</div>
+
+<div markdown="1" style="top:350px" class="pl-doc-entry">
+#### Line 15 to 18: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:575px" class="pl-doc-entry">
+#### Line 20 to 36: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:1000px" class="pl-doc-entry">
+#### Line 38 to 54: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1325px" class="pl-doc-entry">
+#### Line 57 to 75: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1500px" class="pl-doc-entry">
+#### Line 62 to 69: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2475px" class="pl-doc-entry">
+#### Line 119: Get a reference to the player instance
+Get a reference to the player by calling `jwplayer()` and passing in the id of the div you want to load the player into.
+</div>
+
+<div markdown="1" style="top:2565px" class="pl-doc-entry">
+#### Line 122 to 131: Call setup on the player instance
+Call `setup()` on the player instance with the settings you want. We need to pass in a media file and an advertising block with a `client` defined.
+</div>
+
+<div markdown="1" style="top:2660px" class="pl-doc-entry">
+#### Line 124 to 126: Pass in Advertising
+We must pass in an `"advertising"` block with a `client` in our settings in order to enable advertising for this player. We can also specify the tag or an ad schedule here but for this demo we'll insert the tag dynamically before the content plays.
+</div>
+
+<div markdown="1" style="top:2770px" class="pl-doc-entry">
+#### Line 129 to 131: Play the prebid ad as a preroll
+Listen for the `beforePlay()` event from the player and play the ad returned from prebid.
+</div>
+
+<div markdown="1" style="top:2850px" class="pl-doc-entry">
+#### Line 134 to 137: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
+
diff --git a/dev-docs/examples/kaltura-example.md b/dev-docs/examples/kaltura-example.md
new file mode 100644
index 0000000000..366bb456b3
--- /dev/null
+++ b/dev-docs/examples/kaltura-example.md
@@ -0,0 +1,78 @@
+---
+layout: player_example
+title: Kaltura Player Integration
+description: Show a prebid ad in a Kaltura player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Using invokeVideoPlayer to set up and access the Kaltura player instance.
+- Using the dynamic embed integration method with the Kaltura player.
+
+player_notes:
+- In Kaltura studio, enable the advertising plugin you want to use. For this demo we'll be using the VAST 3.0 plugin.
+- We'll be using the <b>Dynamic Embed</b> method to add the player to the page. We need to customize the player on the page, so the auto embed method will not work.
+- To find the Dynamic Embed code for your player, go to the content tab and select the 'Preview and Embed' action. Click 'Show Advanced Options' to see more embedding options, and select 'Dynamic Embed' from the dropdown menu.
+
+jsfiddle_link: jsfiddle.net/shirleylberry/17vap1ro/embedded/html/
+demo_link: video-demo.appnexus.com/pbjs/kaltura-prebid/kaltura-demo.html
+
+code_lines: 139
+code_height: 3000
+
+pid: 34
+---
+<div markdown="1" style="top:150px" class="pl-doc-entry">
+#### Line 11 to 14: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:550px" class="pl-doc-entry">
+#### Line 20 to 36: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:900px" class="pl-doc-entry">
+#### Line 36 to 52: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1200px" class="pl-doc-entry">
+#### Line 54 to 73: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1400px" class="pl-doc-entry">
+#### Line 60 to 70: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2250px" class="pl-doc-entry">
+#### Line 112 to 128: Include Kaltura player script
+Add the script for your Kaltura player. This will be part of the code you will copy paste from Kaltura.
+</div>
+
+<div markdown="1" style="top:2375px" class="pl-doc-entry">
+#### Line 112 to 128: Embed the Kaltura Player
+Call `kWidget.embed()` and pass in a JSON object of your player settings. Most of this JSON object will be part of the code you will copy paste from Kaltura.
+</div>
+
+<div markdown="1" style="top:2475px" class="pl-doc-entry">
+#### Line 118 to 121: Add vast settings to the player settings
+Inside the `flashVars`, add another key called `"vast"` and pass in a JSON object with the position you want to play your ad, and the url of the ad, which in this case will be the `url` we got back from prebid.
+</div>
+
+<div markdown="1" style="top:2625px" class="pl-doc-entry">
+#### Line 124 to 127: Add a ready callback and get a reference to the player
+Add a ready callback to the player settings. This allows us to get a reference to the player, stored in the variable `kdp` in order to interact with it later.
+</div>
+
+<div markdown="1" style="top:2750px" class="pl-doc-entry">
+#### Line 131 to 134: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
+
diff --git a/dev-docs/examples/ooyala-example.md b/dev-docs/examples/ooyala-example.md
new file mode 100644
index 0000000000..8d595c4c24
--- /dev/null
+++ b/dev-docs/examples/ooyala-example.md
@@ -0,0 +1,82 @@
+---
+layout: player_example
+title: Ooyala Player Integration
+description: Show a prebid ad in an Ooyala player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Including the correct scripts on the page. A guide can be found <a href="http://help.ooyala.com/video-platform/documentation/concepts/pbv4_plugins.html">here</a>.
+- Using the Ooyala v4 player API.
+- Using Ooyala's Google IMA plugin.
+- Passing a vast tag to the Ooyala player.
+
+player_notes:
+- This guide uses the V4 Ooyala player. To get the embed code for the V4 player, select <b>New Ooyala Player (V4) Embed Code</b> in the embed options instead of HTML Embed Code. 
+- Do not select an ad set in the 'Monetize' tab. We'll control that setting on the page.
+
+jsfiddle_link: jsfiddle.net/shirleylberry/hxzue5eu/embedded/html/
+demo_link: video-demo.appnexus.com/pbjs/ooyala-prebid/ooyala-demo.html
+
+code_lines: 154
+code_height: 3300
+
+pid: 34
+---
+
+<div markdown="1" style="top:200px" class="pl-doc-entry">
+#### Line 7 to 22: Load Player Scripts
+Load the Ooyla player scripts you plan to use. You must load the core player script, the scripts for whatever video formats you want to support, and the scripts for the ad manager you want to use. The scripts themselves and a guide for choosing which ones you need can be found [here](http://help.ooyala.com/video-platform/documentation/concepts/pbv4_plugins.html).
+</div>
+
+<div markdown="1" style="top:550px" class="pl-doc-entry">
+#### Line 27 to 30: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:900px" class="pl-doc-entry">
+#### Line 36 to 50: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:1200px" class="pl-doc-entry">
+#### Line 52 to 68: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1550px" class="pl-doc-entry">
+#### Line 70 to 89: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1725px" class="pl-doc-entry">
+#### Line 76 to 86: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2675px" class="pl-doc-entry">
+#### Line 126 to 140: Define player settings
+Define the settings you want for your player in a JSON object. These lines will be part of the embed code you copy paste from Ooyala Backlot, we just need to add the ad parameters.
+</div>
+
+<div markdown="1" style="top:2800px" class="pl-doc-entry">
+#### Line 132 to 137: Add the ad parameters to the player settings
+Create a new JSON object in the player parameters. The key should be the ad manager you're using (in our case we're using the [Google ima ads manager](http://help.ooyala.com/video-platform/concepts/pbv4_ads_dev_google_ima.html), so the key is `"google-ima-ads-manager"`). The ima ads manager requires an ad set (which we've named `"all_ads"`. 
+Make sure you follow proper [JSON formatting](http://www.w3schools.com/js/js_json_syntax.asp) as you add the ad parameters.
+</div>
+
+<div markdown="1" style="top:2950px" class="pl-doc-entry">
+#### Line 141 to 143: Initialize the player
+Use the `OO.ready()` event to make sure that all the necessary Ooyala plugins have loaded before attempting to create the player. Once it has, call `create()` and pass in the div you're creating the player in, the ID of the content video, and the player settings we created above.
+</div>
+
+<div markdown="1" style="top:3075px" class="pl-doc-entry">
+#### Line 134 to 137: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
+
+

From 23f43226b275f069cde2535bf966f0a232b6e1a3 Mon Sep 17 00:00:00 2001
From: sberry <sberry@appnexus.com>
Date: Tue, 17 Jan 2017 17:17:28 -0500
Subject: [PATCH 04/30] fixed broken links on player example pages

---
 _layouts/player_example.html             | 2 +-
 dev-docs/examples/jw-cloud-example.md    | 2 +-
 dev-docs/examples/jw-selfhost-example.md | 4 ++--
 dev-docs/examples/kaltura-example.md     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_layouts/player_example.html b/_layouts/player_example.html
index 533873ddcb..e73d511e85 100644
--- a/_layouts/player_example.html
+++ b/_layouts/player_example.html
@@ -32,7 +32,7 @@ <h4>Who should use this example:</h4>
           <li>Please refer to the <a href="{{page.why_link}}" target="_blank">product feature launch notes</a>.</li>
         </ul>
       {% endif %}
-      <p>This page is an example of using prebid video with a specific player. For a general guide to using video in prebid, click <a href="prebid.org/dev-docs/show-video-with-a-dfp-video-tag.html">here.</a></p>
+      <p>This page is an example of using prebid video with a specific player. For a general guide to using video in prebid, click <a href="{{site.github.url}}/dev-docs/show-video-with-a-dfp-video-tag.html">here.</a></p>
       <br>
 
       <h4>This page contains:</h4>
diff --git a/dev-docs/examples/jw-cloud-example.md b/dev-docs/examples/jw-cloud-example.md
index 8f1a83b515..b2b79a9ca9 100644
--- a/dev-docs/examples/jw-cloud-example.md
+++ b/dev-docs/examples/jw-cloud-example.md
@@ -18,7 +18,7 @@ about:
 player_notes:
 - You must have the correct JW Player license that allows you to play advertising.
 - The different methods of embedding JW Player on your site can be found <a href="https://support.jwplayer.com/customer/portal/articles/1406723-mp4-video-embed">here</a>. 
-- For this example we will be using method 1, a cloud-hosted player and JW Platform hosted content. To see an example using the self-hosted player, click <a href="#">here</a>.
+- For this example we will be using method 1, a cloud-hosted player and JW Platform hosted content. To see an example using the self-hosted player, click <a href="/dev-docs/examples/jw-selfhost-example.html">here</a>.
 - No matter what embedding method you choose to use, you must follow the <b>custom embed</b> instructions. You cannot use the single-line embed.
 - If you're using a cloud-hosted player, <b>do not enable advertising in the platform</b>. We'll do it on page so that we can use the vast url from prebid.
 - You can set up most of your player's settings in the platform. The platform settings will be used unless overridden on the page in the setup call.
diff --git a/dev-docs/examples/jw-selfhost-example.md b/dev-docs/examples/jw-selfhost-example.md
index eb38e97d23..9ca0f50d94 100644
--- a/dev-docs/examples/jw-selfhost-example.md
+++ b/dev-docs/examples/jw-selfhost-example.md
@@ -19,11 +19,11 @@ about:
 player_notes:
 - You must have the correct JW Player license that allows you to play advertising.
 - The different methods of embedding JW Player on your site can be found <a href="https://support.jwplayer.com/customer/portal/articles/1406723-mp4-video-embed">here</a>. 
-- For this example we will be using method 3, a self-hosted player and JW Platform hosted content. To see an example using the cloud-hosted player, click <a href="#">here</a>.
+- For this example we will be using method 3, a self-hosted player and JW Platform hosted content. To see an example using the cloud-hosted player, click <a href="/dev-docs/examples/jw-cloud-example.html">here</a>.
 - No matter what embedding method you choose to use, you must follow the <b>custom embed</b> instructions. You cannot use the single-line embed.
 
 jsfiddle_link: jsfiddle.net/shirleylberry/357yaqgc/embedded/html/
-demo_link: http://video-demo.appnexus.com/pbjs/JWPlayerDemo/jwPlayerPrebid.html
+demo_link: video-demo.appnexus.com/pbjs/JWPlayerDemo/jwPlayerPrebid.html
 
 code_lines: 141
 code_height: 3050
diff --git a/dev-docs/examples/kaltura-example.md b/dev-docs/examples/kaltura-example.md
index 366bb456b3..b361bdfe5d 100644
--- a/dev-docs/examples/kaltura-example.md
+++ b/dev-docs/examples/kaltura-example.md
@@ -19,7 +19,7 @@ player_notes:
 - To find the Dynamic Embed code for your player, go to the content tab and select the 'Preview and Embed' action. Click 'Show Advanced Options' to see more embedding options, and select 'Dynamic Embed' from the dropdown menu.
 
 jsfiddle_link: jsfiddle.net/shirleylberry/17vap1ro/embedded/html/
-demo_link: video-demo.appnexus.com/pbjs/kaltura-prebid/kaltura-demo.html
+demo_link: video-demo.appnexus.com/pbjs/kaltura-prebid/klt-demo.html
 
 code_lines: 139
 code_height: 3000

From d35b5009715045a7cf1daed8fa94de48ed7e401f Mon Sep 17 00:00:00 2001
From: Matt Kendall <mkendall@appnexus.com>
Date: Thu, 19 Jan 2017 14:24:55 -0500
Subject: [PATCH 05/30] Update tag id

---
 examples/pbjs_demo.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/pbjs_demo.html b/examples/pbjs_demo.html
index 10a27c8389..4289123ebb 100644
--- a/examples/pbjs_demo.html
+++ b/examples/pbjs_demo.html
@@ -78,19 +78,19 @@
                 {
                     bidder: 'appnexus',
                     params: {
-                       placementId: '4799418'
+                       placementId: '10433394'
                     }
                 },
                 // 1 ad unit can also be targeted by multiple bids from 1 bidder
                 {
                     bidder: 'appnexus',
                     params: {
-                       placementId: '4799418'
+                       placementId: '10433394'
                     }
                 },{
                     bidder: 'appnexus',
                     params: {
-                       placementId: '4799418'
+                       placementId: '10433394'
                     }
                 },
                 /*
@@ -268,4 +268,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

From 35c6de3f9af60f05300c6c7fe07963a5bcdbd377 Mon Sep 17 00:00:00 2001
From: Matt Kendall <mkendall@appnexus.com>
Date: Thu, 19 Jan 2017 15:36:01 -0500
Subject: [PATCH 06/30] Update GA account

---
 _includes/foot.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/foot.html b/_includes/foot.html
index 3f68fb54f8..20c0957cf9 100644
--- a/_includes/foot.html
+++ b/_includes/foot.html
@@ -103,11 +103,11 @@
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-66025807-1', 'auto');
+  ga('create', 'UA-90624301-1', 'auto');
   ga('send', 'pageview');
 
 </script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 7b9e56fabf988698a28a783d6b6d4539f567c99d Mon Sep 17 00:00:00 2001
From: sberry <sberry@appnexus.com>
Date: Thu, 19 Jan 2017 15:53:49 -0500
Subject: [PATCH 07/30] added videojs player example

---
 dev-docs/examples/videojs-example.md | 78 ++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 dev-docs/examples/videojs-example.md

diff --git a/dev-docs/examples/videojs-example.md b/dev-docs/examples/videojs-example.md
new file mode 100644
index 0000000000..006fa135de
--- /dev/null
+++ b/dev-docs/examples/videojs-example.md
@@ -0,0 +1,78 @@
+---
+layout: player_example
+title: VideoJS Player Integration
+description: Show a prebid ad in a VideoJS player
+
+top_nav_section: dev_docs
+nav_section: quick-start
+
+hide: true
+beta: true
+
+about:
+- Using invokeVideoPlayer to set up and access the VideoJS player instance.
+- Using a plugin to play ads in the player.
+- Configuring the ad plugin options.
+
+player_notes:
+- Make sure to incude at least one advertising plugin you want to use on the page. For this demo, we're using the <a href="https://github.com/MailOnline/videojs-vast-vpaid">Mail Online vast/vpaid plugin</a>.
+- A guide to the options the vastClient accepts can be found <a href="https://github.com/MailOnline/videojs-vast-vpaid#options">here</a>.
+
+jsfiddle_link: jsfiddle.net/shirleylberry/vfzo8ofu/embedded/html/
+demo_link: video-demo.appnexus.com/pbjs/mjacobson/video_testing/prebid_video_videojs_new.html
+
+code_lines: 159
+code_height: 3450
+
+pid: 34
+---
+<div markdown="1" style="top:200px" class="pl-doc-entry">
+#### Line 20 to 36: Include VideoJS assets
+Add the VideoJS script and css file to your page, along with the script and css files for any plugins you want, which should include an advertising plugin. For this demo we'll be using the vast-vpaid plugin.
+</div>
+
+<div markdown="1" style="top:500px" class="pl-doc-entry">
+#### Line 11 to 14: Pre-define `invokeVideoPlayer`
+Because we have no way of knowing when all the bids will be returned from prebid we can't be sure that the browser will reach the point where `invokeVideoPlayer` is defined before bidsBackHandler fires and tries to call it. To prevent a `invokeVideoPlayer not defined` error, we pre-define it before we make the call to prebid, and redefine it later on with the code to create the player and play the ad. In this first version it simply stores the winning vast to use later.
+</div>
+
+<div markdown="1" style="top:800px" class="pl-doc-entry">
+#### Line 20 to 36: Create a video ad unit
+Create a video ad unit to request bids for. The `code` is the name we'll use to refer to this ad unit throughout the prebid code. Make sure you include the `mediaType: 'video'` and replace the `placementId` with your own valid placement ID.
+</div>
+
+<div markdown="1" style="top:1100px" class="pl-doc-entry">
+#### Line 36 to 52: Log the bids for debugging
+Log information about the bids to the console, including whether any bids were returned. This isn't strictly necessary, but is useful for debugging.
+</div>
+
+<div markdown="1" style="top:1500px" class="pl-doc-entry">
+#### Line 54 to 73: Add the ad units and request bids
+Add the ad units you want to request bids for to prebid, and then call `requestBids()`, passing in a json object. In the json object, define the `bidsBackHandler` callback which will run once all the bids are returned.
+</div>
+
+<div markdown="1" style="top:1650px" class="pl-doc-entry">
+#### Line 60 to 70: Build masterVideoTag and call invokeVideoPlayer
+Once we have the bids back, `bidsBackHandler` will be called. Inside this callback, we create the masterVideoTag and pass it to the video player by calling `invokeVideoPlayer()`.
+</div>
+
+<div markdown="1" style="top:2625px" class="pl-doc-entry">
+#### Line 124 to 129: Create video element
+Create an html5 video element and give it an ID. We'll use this id to reference the player later. 
+</div>
+
+<div markdown="1" style="top:2850px" class="pl-doc-entry">
+#### Line 136 to 148: Initialize video element
+Access the player instance by calling `videojs()` and passing in the player's id. Add a `ready` listener to make sure the player is ready before interacting with it. 
+</div>
+
+<div markdown="1" style="top:2975px" class="pl-doc-entry">
+#### Line 136 to 148: Pass settings to vast plugin
+Pass in a json object to the player's vastClient (defined by the vast / vpaid plugin we're using). The requires an `adTagUrl`, which will be the url returned by prebid. You can view all the options available for the vastClient [here](https://github.com/MailOnline/videojs-vast-vpaid#options).
+</div>
+
+<div markdown="1" style="top:3175px" class="pl-doc-entry">
+#### Line 131 to 134: Account for page speed
+If prebid returned bids before the browser reached the end of the page, the first version of `invokeVideoPlayer` will have been called from `bidsBackHandler` so the winning vast tag will be stored in tempTag. If that's the case, we want to call the 'real' version of `invokeVideoPlayer` with the stored url to create the player and play the ad. If `tempTag` is not defined, that means the browser reached the end of the page before the bids came back from prebid, meaning the 'real' version of `invokeVideoPlayer` was already called.
+</div>
+

From 69e24a9baca418be0e14c86892743b7b297aa6d7 Mon Sep 17 00:00:00 2001
From: lntho <leon.tzuhao.ho@gmail.com>
Date: Tue, 24 Jan 2017 08:57:27 -0800
Subject: [PATCH 08/30] Update OpenX adaptor documentations (#166)

---
 dev-docs/bidders/openx.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-docs/bidders/openx.md b/dev-docs/bidders/openx.md
index 419fcd03b0..a1e18a54e7 100644
--- a/dev-docs/bidders/openx.md
+++ b/dev-docs/bidders/openx.md
@@ -21,6 +21,6 @@ biddercode_longer_than_12: false
 {: .table .table-bordered .table-striped }
 | Name | Scope | Description | Example |
 | :--- | :---- | :---------- | :------ |
-| `jstag_url` | required | The publisher specific URL of jstag | `ox-d.xyz.servedbyopenx.com/w/1.0/jstag?ef=db&nc=23923-EF` |
-| `unit` | required | the ad unit ID | "538562284" |
-| `pgid` | optional | The page ID | "534205285" |
+| `unit` | required | The ad unit ID provided by OpenX | "538562284" |
+| `delDomain` | required | The publisher specific domain provided by OpenX | "clientname-d.openx.net" |
+| `customParams` | optional | Permits passing any publisher key-value pairing into the bid request | {"gender": "female"} |

From 3c0905190c1c1d7c26625e9b0d7740f3c17ac1fb Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Wed, 25 Jan 2017 11:03:42 -0500
Subject: [PATCH 09/30] Clarify Prebid Video setup requirements

Namely, that you must build the library with support for at least one
video-enabled bidder adaptor.
---
 dev-docs/show-video-with-a-dfp-video-tag.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dev-docs/show-video-with-a-dfp-video-tag.md b/dev-docs/show-video-with-a-dfp-video-tag.md
index b289b72df8..fdfb5018f6 100644
--- a/dev-docs/show-video-with-a-dfp-video-tag.md
+++ b/dev-docs/show-video-with-a-dfp-video-tag.md
@@ -32,6 +32,19 @@ The code below was built with access to the following libraries:
 + video.js version 5.9.2
 + MailOnline videojs-vast-vpaid plugin version 2.0.2
 
+Also, you need to make sure to include the code below in your
+`adapters.json` when building Prebid.js.  If you don't build Prebid.js
+with support for at least one video-enabled bidder, you will not be
+able to show any video ads.
+
+{% highlight js %}
+{
+  "appnexusAst" : {
+    "supportedMediaTypes" : ["video"]
+  }
+}
+{% endhighlight %}
+
 ## Implementation
 
 This section will take you through the code you need to write to show

From 52d28e3f341e9df029c9d81470564228551ea637 Mon Sep 17 00:00:00 2001
From: David M <david.mejorado@gmail.com>
Date: Tue, 17 Jan 2017 17:13:51 -0800
Subject: [PATCH 10/30] Add GumGum documentation

---
 dev-docs/bidders/gumgum.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 dev-docs/bidders/gumgum.md

diff --git a/dev-docs/bidders/gumgum.md b/dev-docs/bidders/gumgum.md
new file mode 100644
index 0000000000..e45bf0a198
--- /dev/null
+++ b/dev-docs/bidders/gumgum.md
@@ -0,0 +1,29 @@
+---
+layout: bidder
+title: GumGum
+description: Prebid GumGum Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: gumgum
+
+biddercode_longer_than_12: false
+
+---
+
+### Note:
+
+The GumGum Header Bidding adaptor requires setup and approval from the GumGum
+team. Please reach out to your account manager or <support@gumgum.com> for more
+information.
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description | Example          |
+|:-----------|:---------|:------------|:-----------------|
+| `inScreen` | optional | Tracking ID | `'MyTrackingID'` |
+| `inSlot`   | optional | Slot ID     | `9`              |

From 7b4e51135a33b4a5e41da3a8610466347c34291f Mon Sep 17 00:00:00 2001
From: Matt Kendall <mkendall@appnexus.com>
Date: Thu, 26 Jan 2017 09:20:14 -0500
Subject: [PATCH 11/30] Upgrade to 0.18.0

---
 download.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/download.md b/download.md
index f379353718..233a25b220 100644
--- a/download.md
+++ b/download.md
@@ -445,14 +445,76 @@ To improve the speed and load time of your site, build Prebid.js for only the he
     </div>
   </div>
 
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="fidelity" class="bidder-check-box"> Fidelity Media
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="widespace" class="bidder-check-box"> Widespace
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="sekindoUM" class="bidder-check-box"> Sekindo Universal Mccann
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="smartadserver" class="bidder-check-box"> Smart AdServer
+      </label>
+    </div>
+  </div>
 
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="headbidding" class="bidder-check-box"> Headbidding
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="sharethrough" class="bidder-check-box"> Sharethrough
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="smartyads" class="bidder-check-box"> SmartyAds
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="xhb" class="bidder-check-box"> Xaxis
+      </label>
+    </div>
+  </div>
 
 
 </div>
 
 <br>
 <p>
-(Version 0.16.0)
+(Version 0.18.0)
 </p>
 
 <div class="form-group">

From 75fa9c43251520b61ae03f5c8efa495c7ec15276 Mon Sep 17 00:00:00 2001
From: rizhang <rizhang@umich.edu>
Date: Mon, 30 Jan 2017 11:09:34 -0800
Subject: [PATCH 12/30] added sharethrough to home page, download page, and
 docs (#165)

* added sharethrough to home page, download page, and docs

* removed sharethrough from download md
---
 dev-docs/bidders/sharethrough.md | 25 +++++++++++++++++++++++++
 index.md                         |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 dev-docs/bidders/sharethrough.md

diff --git a/dev-docs/bidders/sharethrough.md b/dev-docs/bidders/sharethrough.md
new file mode 100644
index 0000000000..2959b4a98e
--- /dev/null
+++ b/dev-docs/bidders/sharethrough.md
@@ -0,0 +1,25 @@
+---
+layout: bidder
+title: Sharethrough
+description: Prebid Sharethrough Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: sharethrough
+
+biddercode_longer_than_12: false
+
+---
+
+### Note:
+The Sharethrough bidder adapter requires additional setup and approval from the Sharethrough Integrations team. Please reach out to your account manager for more information to start using it.
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+| :--- | :---- | :---------- | :------ |
+| `pkey` | required | The placement key | `'DfFKxpkRGPMS7A9f71CquBgZ'` |
diff --git a/index.md b/index.md
index 89157ba1b2..acdab2cb2c 100755
--- a/index.md
+++ b/index.md
@@ -104,6 +104,7 @@ description: A free and open source library for publishers to quickly implement
     <div class="col-xs-6 col-sm-4"><h3>Vertoz</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Smart AdServer</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>AdButler</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Sharethrough</h3></div>
     
     <!-- END BIDDERS -->
     

From 7f59b686580c3f399e64ea91f99c96b0429739bc Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Tue, 31 Jan 2017 10:44:32 -0500
Subject: [PATCH 13/30] Fix two broken links

---
 dev-docs/how-prebid-on-amp-works.md      | 2 +-
 dev-docs/show-prebid-ads-on-amp-pages.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-docs/how-prebid-on-amp-works.md b/dev-docs/how-prebid-on-amp-works.md
index 91e46026eb..bd5e2fa722 100644
--- a/dev-docs/how-prebid-on-amp-works.md
+++ b/dev-docs/how-prebid-on-amp-works.md
@@ -38,6 +38,6 @@ For more information, see [the AMP example in our Github repo](https://github.co
 ## Related Topics
 
 + [Show Prebid Ads on AMP Pages]({{site.github.url}}/dev-docs/show-prebid-ads-on-amp-pages.html) (Developers)
-+ [Setting up Prebid for AMP in DFP]({{}}/adops/setting-up-prebid-for-amp-in-dfp.html) (Ad Ops)
++ [Setting up Prebid for AMP in DFP]({{site.github.url}}/adops/setting-up-prebid-for-amp-in-dfp.html) (Ad Ops)
 
 </div>
diff --git a/dev-docs/show-prebid-ads-on-amp-pages.md b/dev-docs/show-prebid-ads-on-amp-pages.md
index 72bc58ecd4..7d9423c499 100644
--- a/dev-docs/show-prebid-ads-on-amp-pages.md
+++ b/dev-docs/show-prebid-ads-on-amp-pages.md
@@ -336,6 +336,6 @@ It basically does two things:
 
 + [How Prebid on AMP Works]({{site.github.url}}/dev-docs/how-prebid-on-amp-works.html)
 + Sections "Running ads from a custom domain" and "Enhance incoming ad configuration" of the [AMP for Ads](https://www.ampproject.org/docs/reference/components/amp-ad) docs
-+ [Setting up Prebid for AMP in DFP]({{}}/adops/setting-up-prebid-for-amp-in-dfp.html) (Ad Ops)
++ [Setting up Prebid for AMP in DFP]({{site.github.url}}/adops/setting-up-prebid-for-amp-in-dfp.html) (Ad Ops)
 
 </div>

From 3d6b03185a88739e9585e166f632c3b804e60c96 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Tue, 31 Jan 2017 16:39:55 -0500
Subject: [PATCH 14/30] Update email button text

---
 index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.md b/index.md
index acdab2cb2c..f707ebb0e1 100755
--- a/index.md
+++ b/index.md
@@ -25,7 +25,7 @@ description: A free and open source library for publishers to quickly implement
     <input type="text" class="form-control" id="email-field" placeholder="Email" required>
   </div>
   <div class="form-group">
-    <button class="btn btn-outline btn-lg" id="submit-email" onclick="submitEmail()">Join Best Practices Group</button>
+    <button class="btn btn-outline btn-lg" id="submit-email" onclick="submitEmail()">Get the Latest Updates</button>
   </div>        
 </div>
 

From 4a088e8e8e28260c4051314c7109418e7bd52806 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Wed, 1 Feb 2017 10:35:44 -0500
Subject: [PATCH 15/30] Remove email form until we have Parse replacement

---
 index.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/index.md b/index.md
index f707ebb0e1..bc284dbb8b 100755
--- a/index.md
+++ b/index.md
@@ -20,14 +20,14 @@ description: A free and open source library for publishers to quickly implement
 
     <p class="lead">The above header bidding ad is auctioned with Prebid.js. <a href="/overview/intro.html" target="_blank">Learn more about this auction here.</a></p>
 
-<div class="form-inline">
-  <div class="form-group form-group-lg">
-    <input type="text" class="form-control" id="email-field" placeholder="Email" required>
-  </div>
-  <div class="form-group">
-    <button class="btn btn-outline btn-lg" id="submit-email" onclick="submitEmail()">Get the Latest Updates</button>
-  </div>        
-</div>
+<!-- <div class="form-inline"> -->
+<!--   <div class="form-group form-group-lg"> -->
+<!--     <input type="text" class="form-control" id="email-field" placeholder="Email" required> -->
+<!--   </div> -->
+<!--   <div class="form-group"> -->
+<!--     <button class="btn btn-outline btn-lg" id="submit-email" onclick="submitEmail()">Get the Latest Updates</button> -->
+<!--   </div> -->
+<!-- </div> -->
 
     <hr class="full-rule">
 

From e6ebf91dfad0a7d830e4b1585e6846586926b9b5 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Wed, 1 Feb 2017 15:06:41 -0500
Subject: [PATCH 16/30] Add 'How to add a new video bidder adaptor'

Also update 'How to Add a New Bidder Adaptor' as follows:

- Add links to the new page

- Remove most of the video-related content in favor of linking to the
  new video-specific page
---
 dev-docs/bidder-adaptor.md                    |  16 +-
 .../how-to-add-a-new-video-bidder-adaptor.md  | 236 ++++++++++++++++++
 2 files changed, 244 insertions(+), 8 deletions(-)
 create mode 100644 dev-docs/how-to-add-a-new-video-bidder-adaptor.md

diff --git a/dev-docs/bidder-adaptor.md b/dev-docs/bidder-adaptor.md
index 2f294a0d70..2d760a1f3b 100644
--- a/dev-docs/bidder-adaptor.md
+++ b/dev-docs/bidder-adaptor.md
@@ -19,6 +19,10 @@ At a high level, a bidder adapter is responsible for:
 
 This page has instructions for writing your own bidder adapter.  The instructions here try to walk you through some of the code you'll need to write for your adapter.  When in doubt, use [the working adapters in the Github repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters) for reference.
 
+{: .alert.alert-success :}
+**Adding a Video Bidder Adaptor?**  
+See [How to Add a New Video Bidder Adaptor]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
+
 * TOC
 {:toc}
 
@@ -29,7 +33,7 @@ In your PR to add the new adapter, please provide the following information:
 
 - The contact email of the adapter's maintainer.
 - A test ad unit that will consistently return test creatives. This helps us to ensure future Prebid.js updates do not break your adapter.
-
+- Any other information listed as required in [CONTRIBUTING.md](https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md).
 
 ## Step 2: Add a new bidder JS file
 
@@ -57,15 +61,12 @@ module.exports = BidderNameAdapter;
 
 A good example of an adapter that uses this pattern for its implementation is [OpenX](https://github.com/prebid/Prebid.js/blob/master/src/adapters/openx.js).
 
-
 ## Step 3: Design your bid params
 
-Use the `bid.params` object for defining the parameters of your ad request. At a minimum, you should include the tag ID and the  site ID.  You can also include ad sizes, keywords, and other data, such as video bidding information.
+Use the `bid.params` object for defining the parameters of your ad request. At a minimum, you should include the tag ID and the  site ID.  You can also include ad sizes, keywords, and other data, such as [video bidding information]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
 
 For more information about the kinds of information that can be passed using these parameters, see [the list of bidder parameters]({{site.github.url}}/dev-docs/bidders.html).
 
-For example, if your bidder supports serving video ads, you could add a `video` object to your adapter's bid parameters like the [AppNexus AST adapter]({{site.github.url}}/dev-docs/bidders.html#appnexusAst).  To see how those video params are processed and added to the ad tag, see [the AST adapter's implementation of the `callBids` function](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
-
 For more information about how the implementation of `callBids` should work generally, see the next section.
 
 
@@ -126,9 +127,6 @@ To register the bid, call the `bidmanager.addBidResponse(adUnitCode, bidObject)`
 * If the bid is valid, use `bidfactory.createBid(1)` to create the `bidObject`.  A status of `1` means the bid is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
 * If the bid is invalid (no fill or error), use `bidfactory.createBid(2)` to create the `bidObject`.  A status of `2` means "no bid".
 
-{: .alert.alert-info :}
-If your bidder supports serving video ads, it needs to provide a VAST video URL in its response.  On the adapter side, your implementation of `createBid` needs to add the VAST URL to the bid.  For an example implementation, see the implementation in the [AST adapter](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
-
 Example:
 
 {% highlight js %}
@@ -185,6 +183,8 @@ For usage examples, see [the working adapters in the repo](https://github.com/pr
 
 ## Further Reading
 
++ [How to Add a New Video Bidder Adaptor]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html)
+
 + [The bidder adapter sources in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters)
 
 </div>
diff --git a/dev-docs/how-to-add-a-new-video-bidder-adaptor.md b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
new file mode 100644
index 0000000000..bf862135ff
--- /dev/null
+++ b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
@@ -0,0 +1,236 @@
+---
+layout: page
+title: How to Add a New Video Bidder Adaptor
+description: Documentation on how to add a new video bidder adaptor
+pid: 26
+top_nav_section: dev_docs
+nav_section: adaptors
+---
+
+<div class="bs-docs-section" markdown="1">
+
+# How to Add a New Video Bidder Adaptor
+{:.no_toc}
+
+At a high level, a bidder adaptor is responsible for:
+
+1. Sending out bid requests to the ad server
+2. Registering the bids that are returned with Prebid.js
+
+This page has instructions for writing your own video-enabled bidder adaptor.  The instructions here try to walk you through some of the code you'll need to write for your adaptor.
+
+When in doubt, use an adaptor that already has support for video for reference, such as [the AppNexus AST adaptor in the Github repo](https://github.com/prebid/Prebid.js/blob/master/src/adaptors/appnexusAst.js).  (The code samples and descriptions below are based on it.)
+
+* TOC
+{:toc}
+
+## Step 1: Prepare prerequisites for a pull request
+
+In your PR to add the new adapter, please provide the following information:
+
+- The contact email of the adapter's maintainer.
+- A test ad unit that will consistently return test creatives. This helps us to ensure future Prebid.js updates do not break your adapter.
+- Any other information listed as required in [CONTRIBUTING.md](https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md).
+
+## Step 2: Add a new bidder JS file
+
+1. Create a JS file under `src/adapters` with the name of the bidder,
+   e.g., `rubicon.js`
+
+2. Your adapter should export the `callBids` function.  Prebid.js
+   executes this function when the page asks to send out bid requests.
+
+{% highlight js %}
+import Adapter    from 'src/adapters/adapter';
+import bidfactory from 'src/bidfactory';
+import bidmanager from 'src/bidmanager';
+
+// This constant is used when adding video params to the tag below.
+// You should use params that are understood by your bidder.
+const VIDEO_TARGETING = ['id', 'mimes', 'minduration',
+                         'maxduration', 'startdelay', 
+                         'skippable', 'playback_method', 
+                         'frameworks'];
+
+function BidderNameAdapter() {
+
+    let baseAdapter = Adapter.createNew('bidderNameAdaptor');
+
+    baseAdapter.callBids = function(bidRequest) {
+      // Add your implementation here.
+      const bids = bidRequest.bids || [];
+      const tags = bids
+        .map(bid => {
+            // ... other code ...
+            if (bid.params.video) {
+              tag.video = {};
+              // place any valid video params on the tag
+              Object.keys(bid.params.video)
+                .filter(param => VIDEO_TARGETING.includes(param))
+                .forEach(param => tag.video[param] = bid.params.video[param]);
+            }
+            // ... other code ...
+        return tag;
+        });
+    }
+
+    // ... other code ...
+}
+
+module.exports = BidderNameAdapter;
+{% endhighlight %}
+
+## Step 3: Design your bid params
+
+Use the `bid.params` object for defining the parameters of your ad request. At a minimum, you should include the tag ID and the  site ID.  You can also include ad sizes, keywords, and other data, such as video bidding information.
+
+For more information about the kinds of information that can be passed using these parameters, see [the list of bidder parameters]({{site.github.url}}/dev-docs/bidders.html).
+
+In order to make sure your adaptor supports video, you'll need to:
+
+1. Add a `video` object to your adapter's bid parameters like the one in the [AppNexus AST adapter]({{site.github.url}}/dev-docs/bidders.html#appnexusAst).  To see an example showing how those video params are processed and added to the ad tag, see [the AST adapter's implementation of the `callBids` function](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
+
+2. Your bidder will have to support returning a DFP VAST URL somewhere in its bid response.  Each new bidder adaptor added to Prebid.js will have to support its own video URL.  For more information, see the implementation of [pbjs.buildMasterVideoTagFromAdserverTag](https://github.com/prebid/Prebid.js/blob/master/src/prebid.js#L656).
+
+## Step 4: Send out bid requests
+
+When the page asks Prebid.js to send out bid requests, your bidder's `callBids(bidRequest)` function will be executed, sending out bid requests to your bidder.
+
+The `bidRequest` object contains information about the bids configured in the request as shown below.
+
+{% highlight js %}
+{
+    bidderCode: "openx",
+    bids: [
+        {
+            bidder: "openx",
+            adUnitCode: "id123/header-bid-tag-0",
+            sizes: [ [300, 250], [300, 600] ]
+            // params is custom to the bidder adapter and will be
+            // passed through from the configuration as is.
+            params: { 
+            	unit: '3242432',
+                pgid: '123124',
+                jstag_url: 'http://...'
+            },
+        }, {
+        	bidder: "openx",
+        	// params, adUnit Code, and sizes
+        	// Note that the same adUnitCode may appear again.
+    	}
+    ]
+}
+{% endhighlight %}
+
+Note that you should keep track of the `adUnitCode` in bid requests (this is also known as the "placement code" by some bidders). In the next section this will come in handy.
+
+## Step 5: Register bid responses
+
+When the bid response(s) are available, notify Prebid.js immediately, so that your bid can get into the auction as soon as possible. A bidder's API will usually have an event listener that notifies you when the bid responses are back.
+
+To register the bid, call the `bidmanager.addBidResponse(adUnitCode, bidObject)` function. To register multiple bids, call the function multiple times.  Here's one way to do it:
+
+```javascript
+Object.keys(bidRequests)
+  .map(bidId => bidRequests[bidId].placementCode)
+  .forEach(placementCode => {
+    bidmanager.addBidResponse(placementCode, createBid(STATUS.NO_BID));
+  });
+```
+
+If the bid is valid, create the `bidObject` like so, matching the bid request/response pair:
+
+```
+import { getBidRequest } from '../utils.js';
+var bidRequest = getBidRequest(id);
+var bid = bidfactory.createBid(1, bidRequest);
+```
+
+A status of `1` means the bid is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
+
+If the bid is invalid (no fill or error), create the `bidObject` like so:
+
+```
+import { getBidRequest } from '../utils.js';
+var bidRequest = getBidRequest(id);
+var bid = bidfactory.createBid(2, bidRequest);
+```
+
+A status of `2` means "no bid".
+
+{: .alert.alert-info :}
+**IMPORTANT NOTE FOR VIDEO BIDDERS**  
+If your bidder supports serving video ads, it needs to provide a VAST video URL in its response.  On the adapter side, your implementation of `createBid` needs to add the VAST URL to the bid.  For an example implementation, see the implementation of `createBid` in the [AppNexus AST adapter](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
+
+Example:
+
+{% highlight js %}
+
+// In the bidder's API callback...
+
+// the bidder API's ad response unit that has info like CPM, creative content
+var adUnit;
+
+var bidObject = bidfactory.createBid(1);
+bidObject.bidderCode = 'openx';
+bidObject.cpm = Number(adUnit.get('pub_rev')) / 1000;
+bidObject.ad = adUnit.get('html');
+bidObject.width = adUnit.get('width');
+bidObject.height = adUnit.get('height');
+
+// send the bidResponse object to bid manager with the adUnitCode.
+bidmanager.addBidResponse(adUnitCode, bidObject);
+
+// invalid bid response
+bidObject = bidfactory.createBid(2);
+bidObject.bidderCode = 'openx';
+bidmanager.addBidResponse(adUnitCode, bidObject);
+
+{% endhighlight %}
+
+**`adUnitCode` in `addBidResponse`**
+
+In bidder API's callback, there'll be ID(s) that tie back to the request params in the `bid` object. Building a map from `adUnitCode` to the request param(s)/ID(s) will help you retrieve the `adUnitCode` based on the callback.
+
+**`bidObject` in `addBidResponse`**
+
+The required parameters to add into `bidObject` are:
+
+{: .table .table-bordered .table-striped }
+| Key          | Scope     | Description                                                              | Example                              |
+| :----        | :-------- | :-------                                                                 | :-------                             |
+| `bidderCode` | Required  | The bidder code.                                                         | `"pubmatic"`                         |
+| `cpm`        | Required  | The bid price. We recommend the most granular price a bidder can provide | 3.5764                               |
+| `width`      | Required  | The width of the returned creative.                                      | 300                                  |
+| `height`     | Required  | The height of the returned creative.                                     | 250                                  |
+| `ad`         | Required  | The creative payload of the returned bid                                 | `"<html><h3>I am an ad</h3></html>"` |
+
+## Step 6. Update `adapters.json`
+
+Finally, add `"video"` to the array of media types your adapter supports.
+
+```javascript
+{
+  "bidderName": {
+    "supportedMediaTypes": ["video"]
+  }
+}
+```
+
+## Helper functions
+
+**`adloader.loadScript(scriptURL, callback, cacheRequest)`**
+
+Load a script asynchronously. The callback function will be executed when the script finishes loading.
+
+Use this with the `cacheRequest` argument set to `true` if the script you're loading is a library or something else that doesn't change between requests.  It will cache the script so you don't have to wait for it to load before firing the supplied callback.
+
+For usage examples, see [the working adapters in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters).
+
+## Further Reading
+
++ [How to Add a New Bidder Adapter](http://{{site.github.url}}/dev-docs/bidder-adaptor.html)
+
++ [The bidder adapter sources in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters)
+
+</div>

From 2cc1b763ec45dee03e11ec0aee431cba85fa406d Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Tue, 7 Feb 2017 13:45:22 -0500
Subject: [PATCH 17/30] Clarify description of how `bid.params` is defined

---
 dev-docs/bidder-adaptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-docs/bidder-adaptor.md b/dev-docs/bidder-adaptor.md
index 2d760a1f3b..b93dd0c4cf 100644
--- a/dev-docs/bidder-adaptor.md
+++ b/dev-docs/bidder-adaptor.md
@@ -63,7 +63,7 @@ A good example of an adapter that uses this pattern for its implementation is [O
 
 ## Step 3: Design your bid params
 
-Use the `bid.params` object for defining the parameters of your ad request. At a minimum, you should include the tag ID and the  site ID.  You can also include ad sizes, keywords, and other data, such as [video bidding information]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
+Use the `bid.params` object for defining the parameters of your ad request.  You can include tag ID, site ID, ad size, keywords, and other data, such as [video bidding information]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
 
 For more information about the kinds of information that can be passed using these parameters, see [the list of bidder parameters]({{site.github.url}}/dev-docs/bidders.html).
 

From 69a7c24bd6a69d38c44f2880d521a3a0c1faf137 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Tue, 7 Feb 2017 13:48:53 -0500
Subject: [PATCH 18/30] Revise to add more video-specific examples/code

Specifically:

- Clarify `bid.params` description
- Show an AST video bid request object
- Break Step 5, "Register bid responses" into smaller chunks
- Clarify adding video info to bid response
- Smaller copy edits sprinkled throughout
---
 .../how-to-add-a-new-video-bidder-adaptor.md  | 165 +++++++++---------
 1 file changed, 81 insertions(+), 84 deletions(-)

diff --git a/dev-docs/how-to-add-a-new-video-bidder-adaptor.md b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
index bf862135ff..7bb8e7daf3 100644
--- a/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
+++ b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
@@ -35,7 +35,7 @@ In your PR to add the new adapter, please provide the following information:
 ## Step 2: Add a new bidder JS file
 
 1. Create a JS file under `src/adapters` with the name of the bidder,
-   e.g., `rubicon.js`
+   e.g., `yourBidder.js`
 
 2. Your adapter should export the `callBids` function.  Prebid.js
    executes this function when the page asks to send out bid requests.
@@ -52,9 +52,8 @@ const VIDEO_TARGETING = ['id', 'mimes', 'minduration',
                          'skippable', 'playback_method', 
                          'frameworks'];
 
-function BidderNameAdapter() {
-
-    let baseAdapter = Adapter.createNew('bidderNameAdaptor');
+function YourBidderAdapter() {
+    let baseAdapter = Adapter.createNew('yourBidderAdapter');
 
     baseAdapter.callBids = function(bidRequest) {
       // Add your implementation here.
@@ -77,12 +76,12 @@ function BidderNameAdapter() {
     // ... other code ...
 }
 
-module.exports = BidderNameAdapter;
+module.exports = YourBidderAdapter;
 {% endhighlight %}
 
 ## Step 3: Design your bid params
 
-Use the `bid.params` object for defining the parameters of your ad request. At a minimum, you should include the tag ID and the  site ID.  You can also include ad sizes, keywords, and other data, such as video bidding information.
+Use the `bid.params` object for defining the parameters of your ad request.  You can include tag ID, site ID, ad size, keywords, and other data, such as video bidding information.
 
 For more information about the kinds of information that can be passed using these parameters, see [the list of bidder parameters]({{site.github.url}}/dev-docs/bidders.html).
 
@@ -90,128 +89,126 @@ In order to make sure your adaptor supports video, you'll need to:
 
 1. Add a `video` object to your adapter's bid parameters like the one in the [AppNexus AST adapter]({{site.github.url}}/dev-docs/bidders.html#appnexusAst).  To see an example showing how those video params are processed and added to the ad tag, see [the AST adapter's implementation of the `callBids` function](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
 
-2. Your bidder will have to support returning a DFP VAST URL somewhere in its bid response.  Each new bidder adaptor added to Prebid.js will have to support its own video URL.  For more information, see the implementation of [pbjs.buildMasterVideoTagFromAdserverTag](https://github.com/prebid/Prebid.js/blob/master/src/prebid.js#L656).
+2. Your bidder will have to support returning a VAST URL somewhere in its bid response.  Each new bidder adaptor added to Prebid.js will have to support its own video URL.  For more information, see the implementation of [pbjs.buildMasterVideoTagFromAdserverTag](https://github.com/prebid/Prebid.js/blob/master/src/prebid.js#L656).
 
 ## Step 4: Send out bid requests
 
 When the page asks Prebid.js to send out bid requests, your bidder's `callBids(bidRequest)` function will be executed, sending out bid requests to your bidder.
 
-The `bidRequest` object contains information about the bids configured in the request as shown below.
+The `bidRequest` object contains information about the bids in the request as shown below.  This example uses an AppNexus AST video bid request, so keep in mind not everything will be the same for your own bidder.
 
 {% highlight js %}
 {
-    bidderCode: "openx",
-    bids: [
-        {
-            bidder: "openx",
-            adUnitCode: "id123/header-bid-tag-0",
-            sizes: [ [300, 250], [300, 600] ]
-            // params is custom to the bidder adapter and will be
-            // passed through from the configuration as is.
-            params: { 
-            	unit: '3242432',
-                pgid: '123124',
-                jstag_url: 'http://...'
-            },
-        }, {
-        	bidder: "openx",
-        	// params, adUnit Code, and sizes
-        	// Note that the same adUnitCode may appear again.
-    	}
-    ]
+  "bidderCode": "appnexusAst",
+  "requestId": "52ddd9cc-8f77-4f54-91cb-b49b78f02292",
+  "bidderRequestId": "11919bf315f56d",
+  "bids": [
+    {
+      "bidder": "appnexusAst",
+      "params": {
+        "placementId": "10433394"
+      },
+      "placementCode": "/19968336/header-bid-tag-0",
+      "mediaType": "video",
+      "sizes": [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          300
+        ]
+      ],
+      "bidId": "230a95a8ac95a9",
+      "bidderRequestId": "11919bf315f56d",
+      "requestId": "52ddd9cc-8f77-4f54-91cb-b49b78f02292"
+    }
+  ],
+  "start": 1486418703275,
+  "auctionStart": 1486418703274,
+  "timeout": 3000
 }
 {% endhighlight %}
 
-Note that you should keep track of the `adUnitCode` in bid requests (this is also known as the "placement code" by some bidders). In the next section this will come in handy.
+Note that you should keep track of the `adUnitCode` in bid requests (this is also known as the "placement code" by some bidders).  You'll need this later on when you [register the bid response with the bid manager](#register-bid-response-bid-manager).
 
 ## Step 5: Register bid responses
 
 When the bid response(s) are available, notify Prebid.js immediately, so that your bid can get into the auction as soon as possible. A bidder's API will usually have an event listener that notifies you when the bid responses are back.
 
-To register the bid, call the `bidmanager.addBidResponse(adUnitCode, bidObject)` function. To register multiple bids, call the function multiple times.  Here's one way to do it:
+{: .alert.alert-warning :}
+**IMPORTANT NOTE FOR VIDEO BIDDERS**  
+If your bidder supports serving video ads, it needs to provide a VAST video URL in its response.  On the adapter side, your implementation of `createBid` needs to add the VAST URL to the bid.  For an example implementation, see the implementation of `createBid` in the [AppNexus AST adapter](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
 
-```javascript
-Object.keys(bidRequests)
-  .map(bidId => bidRequests[bidId].placementCode)
-  .forEach(placementCode => {
-    bidmanager.addBidResponse(placementCode, createBid(STATUS.NO_BID));
-  });
-```
+### Create the bid response object
 
-If the bid is valid, create the `bidObject` like so, matching the bid request/response pair:
+If the bid is valid, create the bid response as shown below, matching the bid request/response pair.  A status of `1` means the bid response is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
 
-```
-import { getBidRequest } from '../utils.js';
-var bidRequest = getBidRequest(id);
-var bid = bidfactory.createBid(1, bidRequest);
-```
+{% highlight js %}
+var utils      = require('../utils.js');
+var bidfactory = require('../bidfactory.js');
 
-A status of `1` means the bid is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
+var bidRequest  = utils.getBidRequest(id);
+var bidResponse = bidfactory.createBid(1, bidRequest);
+{% endhighlight %}
 
-If the bid is invalid (no fill or error), create the `bidObject` like so:
+If the bid is invalid (no fill or error), create the `bidObject` as shown below.  A status of `2` means "no bid".
 
-```
-import { getBidRequest } from '../utils.js';
-var bidRequest = getBidRequest(id);
-var bid = bidfactory.createBid(2, bidRequest);
-```
+{% highlight js %}
+var bidRequest  = utils.getBidRequest(id);
+var bidResponse = bidfactory.createBid(2, bidRequest);
+{% endhighlight %}
 
-A status of `2` means "no bid".
+### Add info to the bid response
 
-{: .alert.alert-info :}
-**IMPORTANT NOTE FOR VIDEO BIDDERS**  
-If your bidder supports serving video ads, it needs to provide a VAST video URL in its response.  On the adapter side, your implementation of `createBid` needs to add the VAST URL to the bid.  For an example implementation, see the implementation of `createBid` in the [AppNexus AST adapter](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).
+Once you've created the bid response, assuming it's valid, you must add more video-specific information:
 
-Example:
++ Player width
++ Player height
++ VAST URL
+
+Note that you'll have to modify the example code below to match the parameters returned by your bidder.  We've also omitted a lot of error-checking.  You can refer to the [AppNexus AST adapter implementation](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js#L228) for details.
 
 {% highlight js %}
+var baseAdapter = require('baseAdapter.js');
 
-// In the bidder's API callback...
+// Pull the ad object out of your bidder's response.
+var ad = getRtbBid(tag);
 
-// the bidder API's ad response unit that has info like CPM, creative content
-var adUnit;
+// The bid request needs a code to identify the bidder.
+bidResponse.bidderCode = 'yourBidder';
 
-var bidObject = bidfactory.createBid(1);
-bidObject.bidderCode = 'openx';
-bidObject.cpm = Number(adUnit.get('pub_rev')) / 1000;
-bidObject.ad = adUnit.get('html');
-bidObject.width = adUnit.get('width');
-bidObject.height = adUnit.get('height');
+// What is the bid price?
+bidResponse.cpm = ad.cpm;
 
-// send the bidResponse object to bid manager with the adUnitCode.
-bidmanager.addBidResponse(adUnitCode, bidObject);
+// Video-specific information: player width and height, and VAST URL.
+bidResponse.width   = ad.rtb.video.player_width;
+bidResponse.height  = ad.rtb.video.player_height;
+bidResponse.vastUrl = ad.rtb.video.asset_url;
+{% endhighlight %}
 
-// invalid bid response
-bidObject = bidfactory.createBid(2);
-bidObject.bidderCode = 'openx';
-bidmanager.addBidResponse(adUnitCode, bidObject);
+<a name="register-bid-response-bid-manager" />
+
+### Register the bid response with the bid manager
 
+Now that you've added the required information to the bid response, you must register the response with the bid manager by calling the `bidmanager.addBidResponse(adUnitCode, bidObject)` function. To register multiple bid responses, call the function multiple times.
+
+{% highlight js %}
+bidmanager.addBidResponse(adUnitCode, bidObject);
 {% endhighlight %}
 
 **`adUnitCode` in `addBidResponse`**
 
 In bidder API's callback, there'll be ID(s) that tie back to the request params in the `bid` object. Building a map from `adUnitCode` to the request param(s)/ID(s) will help you retrieve the `adUnitCode` based on the callback.
 
-**`bidObject` in `addBidResponse`**
-
-The required parameters to add into `bidObject` are:
-
-{: .table .table-bordered .table-striped }
-| Key          | Scope     | Description                                                              | Example                              |
-| :----        | :-------- | :-------                                                                 | :-------                             |
-| `bidderCode` | Required  | The bidder code.                                                         | `"pubmatic"`                         |
-| `cpm`        | Required  | The bid price. We recommend the most granular price a bidder can provide | 3.5764                               |
-| `width`      | Required  | The width of the returned creative.                                      | 300                                  |
-| `height`     | Required  | The height of the returned creative.                                     | 250                                  |
-| `ad`         | Required  | The creative payload of the returned bid                                 | `"<html><h3>I am an ad</h3></html>"` |
-
 ## Step 6. Update `adapters.json`
 
 Finally, add `"video"` to the array of media types your adapter supports.
 
 ```javascript
 {
-  "bidderName": {
+  "yourBidder": {
     "supportedMediaTypes": ["video"]
   }
 }
@@ -225,7 +222,7 @@ Load a script asynchronously. The callback function will be executed when the sc
 
 Use this with the `cacheRequest` argument set to `true` if the script you're loading is a library or something else that doesn't change between requests.  It will cache the script so you don't have to wait for it to load before firing the supplied callback.
 
-For usage examples, see [the working adapters in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters).
+For usage examples of `loadScript`, see [the adapters in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters).
 
 ## Further Reading
 

From 0e72ffeaea66c736282414e3214b4f0fb602cd1d Mon Sep 17 00:00:00 2001
From: Mats Attnas <mats.attnas@twenga.com>
Date: Wed, 8 Feb 2017 10:14:49 +0100
Subject: [PATCH 19/30] Add Twenga adapter docs and download checkbox

---
 dev-docs/bidders/twenga.md | 22 ++++++++++++++++++++++
 download.md                |  8 ++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 dev-docs/bidders/twenga.md

diff --git a/dev-docs/bidders/twenga.md b/dev-docs/bidders/twenga.md
new file mode 100644
index 0000000000..b65536943d
--- /dev/null
+++ b/dev-docs/bidders/twenga.md
@@ -0,0 +1,22 @@
+---
+layout: bidder
+title: Twenga
+description: Prebid Twenga Bidder Adaptor
+top_nav_section: dev_docs
+nav_section: reference
+hide: true
+biddercode: twenga
+biddercode_longer_than_12: false
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name          | Scope    | Description                                                                                                                | Example    |
+| :------------ | :------- | :------------------------------------------------------------------------------------------------------------------------- | :--------- |
+| `placementId` | required | Identifier for the ad placement, as provided by Twenga.                                                                    | `"123456"` |
+| `siteId`      | optional | Identifier for the site, as an integer value. Mainly used for reports.                                                     | `123456`   |
+| `publisherId` | optional | Identifier for the publisher, as an integer value. Mainly used for reports.                                                | `123456`   |
+| `currency`    | optional | ISO 4217 currency code for the bid price and floor. The default currency is EUR.                                           | `"USD"`    |
+| `bidFloor`    | optional | Minimum CPM to participate with a bid for this ad placement. Should be in EUR or the currency specified by `currency`.     | `0.35`     |
+| `country`     | optional | Two-letter ISO 3166-1 country code for merchant selection. By default, the user IP address will be used to determine this. | `DE`       |
diff --git a/download.md b/download.md
index 233a25b220..0b6021fba4 100644
--- a/download.md
+++ b/download.md
@@ -501,6 +501,14 @@ To improve the speed and load time of your site, build Prebid.js for only the he
     </div>
   </div>
 
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="twenga" class="bidder-check-box"> Twenga
+      </label>
+    </div>
+  </div>
+
   <div class="col-md-4">
     <div class="checkbox">
       <label>

From 47559d74f5f1aff3f2fb4b10af02a118c0d965aa Mon Sep 17 00:00:00 2001
From: Vladimir Marteev <xor104@gmail.com>
Date: Wed, 8 Feb 2017 13:11:25 +0300
Subject: [PATCH 20/30] Add Lifestreet adapter

---
 dev-docs/bidders/lifestreet.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 dev-docs/bidders/lifestreet.md

diff --git a/dev-docs/bidders/lifestreet.md b/dev-docs/bidders/lifestreet.md
new file mode 100644
index 0000000000..2ea144b81d
--- /dev/null
+++ b/dev-docs/bidders/lifestreet.md
@@ -0,0 +1,27 @@
+---
+layout: bidder
+title: Lifestreet
+description: Prebid Lifestreet Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: lifestreet
+
+biddercode_longer_than_12: false
+
+---
+
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name            | Scope    | Description                          | Example                                   |
+|:----------------|:---------|:-------------------------------------|:------------------------------------------|
+| `jstag_url`     | required | JS Ad-Tag URL                        | `'//ads.lfstmedia.com/getad?site=285071'` |
+| `slot`          | required | Ad Slot                              | `'slot166704'`                            |
+| `adkey`         | required | Ad Key                               | `'78c'`                                   |
+| `ad_size`       | required | Ad Size                              | `'160x600'`                               |
+| `timeout`       | optional | Prebid.js Timeout                    | `1500`                                    |

From 2aaf5bc75226f668fec52c5e96f4e03dd4d88fa6 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Wed, 8 Feb 2017 15:14:54 -0500
Subject: [PATCH 21/30] Add Conversant to homepage

---
 index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.md b/index.md
index bc284dbb8b..f6f568066a 100755
--- a/index.md
+++ b/index.md
@@ -91,6 +91,7 @@ description: A free and open source library for publishers to quickly implement
     <div class="col-xs-6 col-sm-4"><h3>Meme Global</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Underdog Media</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Centro</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Conversant</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Adblade</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Piximedia</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>GetIntent</h3></div>

From b0640654b2d53e35a16e0b01f951777639dbcda2 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Thu, 9 Feb 2017 11:43:41 -0500
Subject: [PATCH 22/30] Update `bidmanager.createBid` docs with 2nd param

Addresses https://github.com/prebid/prebid.github.io/issues/168
---
 dev-docs/bidder-adaptor.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/dev-docs/bidder-adaptor.md b/dev-docs/bidder-adaptor.md
index b93dd0c4cf..75d6512fc7 100644
--- a/dev-docs/bidder-adaptor.md
+++ b/dev-docs/bidder-adaptor.md
@@ -124,8 +124,22 @@ When the bid response(s) are available, notify Prebid.js immediately, so that yo
 
 To register the bid, call the `bidmanager.addBidResponse(adUnitCode, bidObject)` function. To register multiple bids, call the function multiple times.
 
-* If the bid is valid, use `bidfactory.createBid(1)` to create the `bidObject`.  A status of `1` means the bid is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
-* If the bid is invalid (no fill or error), use `bidfactory.createBid(2)` to create the `bidObject`.  A status of `2` means "no bid".
+If the bid is valid, create the bid response as shown below, matching the bid request/response pair.  A status of `1` means the bid response is valid.  For details about the status codes, see [constants.json](https://github.com/prebid/Prebid.js/blob/master/src/constants.json).
+
+{% highlight js %}
+var utils       = require('../utils.js');
+var bidfactory  = require('../bidfactory.js');
+
+var bidRequest  = utils.getBidRequest(id);
+var bidResponse = bidfactory.createBid(1, bidRequest);
+{% endhighlight %}
+
+If the bid is invalid (no fill or error), create the `bidObject` as shown below.  A status of `2` means "no bid".
+
+{% highlight js %}
+var bidRequest  = utils.getBidRequest(id);
+var bidResponse = bidfactory.createBid(2, bidRequest);
+{% endhighlight %}
 
 Example:
 
@@ -136,7 +150,8 @@ Example:
 // the bidder API's ad response unit that has info like CPM, creative content
 var adUnit;
 
-var bidObject = bidfactory.createBid(1);
+var bidRequest  = utils.getBidRequest(id);
+var bidObject = bidfactory.createBid(1, bidRequest);
 bidObject.bidderCode = 'openx';
 bidObject.cpm = Number(adUnit.get('pub_rev')) / 1000;
 bidObject.ad = adUnit.get('html');
@@ -147,7 +162,7 @@ bidObject.height = adUnit.get('height');
 bidmanager.addBidResponse(adUnitCode, bidObject);
 
 // invalid bid response
-bidObject = bidfactory.createBid(2);
+bidObject = bidfactory.createBid(2, bidRequest);
 bidObject.bidderCode = 'openx';
 bidmanager.addBidResponse(adUnitCode, bidObject);
 

From 1a74311bbbd5c223529b236360ada49ae6218f85 Mon Sep 17 00:00:00 2001
From: Vladimir Marteev <xor104@gmail.com>
Date: Mon, 13 Feb 2017 17:43:25 +0300
Subject: [PATCH 23/30] Add download checkbox

---
 download.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/download.md b/download.md
index 233a25b220..9c83a8ae62 100644
--- a/download.md
+++ b/download.md
@@ -509,6 +509,14 @@ To improve the speed and load time of your site, build Prebid.js for only the he
     </div>
   </div>
 
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="lifestreet" class="bidder-check-box"> Lifestreet
+      </label>
+    </div>
+  </div>
+
 
 </div>
 

From 585024cd7f2f6d1c83753d5e9a05a47d7e0283e5 Mon Sep 17 00:00:00 2001
From: Matt Kendall <mkendall@appnexus.com>
Date: Wed, 15 Feb 2017 16:32:05 -0500
Subject: [PATCH 24/30] Update to 0.19.0 build

---
 download.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 index.md    | 11 +++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/download.md b/download.md
index 6bdf711fee..abed0b6aca 100644
--- a/download.md
+++ b/download.md
@@ -525,12 +525,59 @@ To improve the speed and load time of your site, build Prebid.js for only the he
     </div>
   </div>
 
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="mantis" class="bidder-check-box"> Mantis Ad Network
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="admixer" class="bidder-check-box"> AdMixer
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="vertamedia" class="bidder-check-box"> Vertamedia
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="oftmedia" class="bidder-check-box"> 152Media
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="matomy" class="bidder-check-box"> Matomy
+      </label>
+    </div>
+  </div>
+
+  <div class="col-md-4">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" bidderCode="stickyadstv" class="bidder-check-box"> StickyAdsTV
+      </label>
+    </div>
+  </div>
 
 </div>
 
 <br>
 <p>
-(Version 0.18.0)
+(Version 0.19.0)
 </p>
 
 <div class="form-group">
diff --git a/index.md b/index.md
index f6f568066a..b0cda05202 100755
--- a/index.md
+++ b/index.md
@@ -106,9 +106,16 @@ description: A free and open source library for publishers to quickly implement
     <div class="col-xs-6 col-sm-4"><h3>Smart AdServer</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>AdButler</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Sharethrough</h3></div>
-    
+    <div class="col-xs-6 col-sm-4"><h3>Mantis Ad Network</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>AdMixer</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Twenga</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Lifestreet</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Vertamedia</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>StickyAdsTV</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>152Media</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Matomy</h3></div>
+
     <!-- END BIDDERS -->
-    
     </div>
 
     <hr class="full-rule">

From b68b735a83ae6ea121a91019d14e654cf3b2ad3b Mon Sep 17 00:00:00 2001
From: onaydenov <onaydenov@users.noreply.github.com>
Date: Tue, 21 Feb 2017 15:17:29 +0200
Subject: [PATCH 25/30] Add Fidelity Media SSP

---
 index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.md b/index.md
index b0cda05202..433e6c36fa 100755
--- a/index.md
+++ b/index.md
@@ -114,6 +114,7 @@ description: A free and open source library for publishers to quickly implement
     <div class="col-xs-6 col-sm-4"><h3>StickyAdsTV</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>152Media</h3></div>
     <div class="col-xs-6 col-sm-4"><h3>Matomy</h3></div>
+    <div class="col-xs-6 col-sm-4"><h3>Fidelity Media</h3></div>
 
     <!-- END BIDDERS -->
     </div>

From 4e307da11461746541ca00b9c18de78349d6da32 Mon Sep 17 00:00:00 2001
From: Andrew Bowman <gbowman@appnexus.com>
Date: Wed, 22 Feb 2017 14:13:31 -0500
Subject: [PATCH 26/30] Created missing bidder settings for several bidders per
 https://github.com/prebid/Prebid.js/issues/659

---
 dev-docs/.DS_Store                   | Bin 6148 -> 6148 bytes
 dev-docs/bidders/152media.md         |  23 ++++++++++++++++++++++
 dev-docs/bidders/adequant.md         |  23 ++++++++++++++++++++++
 dev-docs/bidders/admixer.md          |  23 ++++++++++++++++++++++
 dev-docs/bidders/brealtime.md        |   2 ++
 dev-docs/bidders/defymedia.md        |  25 ++++++++++++++++++++++++
 dev-docs/bidders/districtm.md        |  23 ++++++++++++++++++++++
 dev-docs/bidders/districtmdmx.md     |  26 +++++++++++++++++++++++++
 dev-docs/bidders/featureforward.md   |  25 ++++++++++++++++++++++++
 dev-docs/bidders/headbidding.md      |  26 +++++++++++++++++++++++++
 dev-docs/bidders/jcartermarketing.md |  26 +++++++++++++++++++++++++
 dev-docs/bidders/mantis.md           |  23 ++++++++++++++++++++++
 dev-docs/bidders/matomy.md           |  23 ++++++++++++++++++++++
 dev-docs/bidders/memeglobal.md       |  23 ++++++++++++++++++++++
 dev-docs/bidders/nginad.md           |  24 +++++++++++++++++++++++
 dev-docs/bidders/pagescience.md      |  28 +++++++++++++++++++++++++++
 dev-docs/bidders/sekindo.md          |  23 ++++++++++++++++++++++
 dev-docs/bidders/smartyads.md        |  24 +++++++++++++++++++++++
 dev-docs/bidders/smartyadstv.md      |  23 ++++++++++++++++++++++
 dev-docs/bidders/underdogmedia.md    |  23 ++++++++++++++++++++++
 dev-docs/bidders/vertamedia.md       |  24 +++++++++++++++++++++++
 dev-docs/bidders/widespace.md        |  24 +++++++++++++++++++++++
 dev-docs/bidders/xaxis.md            |  23 ++++++++++++++++++++++
 23 files changed, 507 insertions(+)
 create mode 100644 dev-docs/bidders/152media.md
 create mode 100644 dev-docs/bidders/adequant.md
 create mode 100644 dev-docs/bidders/admixer.md
 create mode 100644 dev-docs/bidders/defymedia.md
 create mode 100644 dev-docs/bidders/districtm.md
 create mode 100644 dev-docs/bidders/districtmdmx.md
 create mode 100644 dev-docs/bidders/featureforward.md
 create mode 100644 dev-docs/bidders/headbidding.md
 create mode 100644 dev-docs/bidders/jcartermarketing.md
 create mode 100644 dev-docs/bidders/mantis.md
 create mode 100644 dev-docs/bidders/matomy.md
 create mode 100644 dev-docs/bidders/memeglobal.md
 create mode 100644 dev-docs/bidders/nginad.md
 create mode 100644 dev-docs/bidders/pagescience.md
 create mode 100644 dev-docs/bidders/sekindo.md
 create mode 100644 dev-docs/bidders/smartyads.md
 create mode 100644 dev-docs/bidders/smartyadstv.md
 create mode 100644 dev-docs/bidders/underdogmedia.md
 create mode 100644 dev-docs/bidders/vertamedia.md
 create mode 100644 dev-docs/bidders/widespace.md
 create mode 100644 dev-docs/bidders/xaxis.md

diff --git a/dev-docs/.DS_Store b/dev-docs/.DS_Store
index 2a4fcb3164f7f7a3bf4c55697bbef7e0703c3ac8..06352542db5557b478d837ae835937dd42660370 100644
GIT binary patch
delta 215
zcmZoMXfc@J&&aVcU^g=($7CKBS0i?YB!*0e6d+7xC}Jp1DlaZb%E?b+U|=|vRFIQd
zTw-8woso%|g_Vt+gOihklb2)iUKaVuFIdd$qk}W@%L5WiGLjODz;f{dlGW8lMy6&u
z3Wg>IwK@vb=H>=E3MR&8wY3}^;;M$Wo(Z{?Rn;}Mb+dpL00AQ-gl6D}(lBZ^kb&m3
cvf!e;ocz3WpbSVC*XAIW^-P=DIsWnk0Ms2XtN;K2

delta 32
ocmZoMXfc@J&&akhU^g=(+hiUV*UjOq8<;jWurY3C=lIJH0HR|F!~g&Q

diff --git a/dev-docs/bidders/152media.md b/dev-docs/bidders/152media.md
new file mode 100644
index 0000000000..dfc9cb580a
--- /dev/null
+++ b/dev-docs/bidders/152media.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: 152Media
+description: Prebid 152Media Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: oftmedia
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
diff --git a/dev-docs/bidders/adequant.md b/dev-docs/bidders/adequant.md
new file mode 100644
index 0000000000..ca7d9e1d4b
--- /dev/null
+++ b/dev-docs/bidders/adequant.md
@@ -0,0 +1,23 @@
+layout: bidder
+title: Adequant
+description: Prebid Adequant Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: adequant
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `publisherId` | required | | |
+| `bidfloor` | optional | | |
diff --git a/dev-docs/bidders/admixer.md b/dev-docs/bidders/admixer.md
new file mode 100644
index 0000000000..9a323a74ba
--- /dev/null
+++ b/dev-docs/bidders/admixer.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: AdMixer
+description: Prebid AdMixer Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: admixer
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `zone` | required | | |
diff --git a/dev-docs/bidders/brealtime.md b/dev-docs/bidders/brealtime.md
index 1ed55093db..5247acccf0 100644
--- a/dev-docs/bidders/brealtime.md
+++ b/dev-docs/bidders/brealtime.md
@@ -21,3 +21,5 @@ biddercode_longer_than_12: false
 | Name | Scope | Description | Example |
 | :--- | :---- | :---------- | :------ |
 | `placementId` | required | The placement ID from bRealTime | `"1234567"` |
+
+bRealTime is an aliased bidder for AppNexus
diff --git a/dev-docs/bidders/defymedia.md b/dev-docs/bidders/defymedia.md
new file mode 100644
index 0000000000..53908b3ce7
--- /dev/null
+++ b/dev-docs/bidders/defymedia.md
@@ -0,0 +1,25 @@
+---
+layout: bidder
+title: Defy Media
+description: Prebid Defy Media Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: defymedia
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
+
+Defy Media is an aliased bidder for AppNexus
diff --git a/dev-docs/bidders/districtm.md b/dev-docs/bidders/districtm.md
new file mode 100644
index 0000000000..0d3736cb83
--- /dev/null
+++ b/dev-docs/bidders/districtm.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: DistrictM
+description: Prebid DistrictM Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: districtm
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
diff --git a/dev-docs/bidders/districtmdmx.md b/dev-docs/bidders/districtmdmx.md
new file mode 100644
index 0000000000..c67747b6ce
--- /dev/null
+++ b/dev-docs/bidders/districtmdmx.md
@@ -0,0 +1,26 @@
+---
+layout: bidder
+title: DistrictmDMX
+description: Prebid DistrictmDMX Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: districtmDMX
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `id` | required | | |
+| `floor` | optional | | |
+| `revShare` | optional | | |
+| `currency` | optional | | |
diff --git a/dev-docs/bidders/featureforward.md b/dev-docs/bidders/featureforward.md
new file mode 100644
index 0000000000..be71517ef1
--- /dev/null
+++ b/dev-docs/bidders/featureforward.md
@@ -0,0 +1,25 @@
+---
+layout: bidder
+title: Feature Forward
+description: Prebid Feature Forward Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: featureforward
+
+biddercode_longer_than_12: true
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
+
+Feature Forward is an aliased bidder for AppNexus
diff --git a/dev-docs/bidders/headbidding.md b/dev-docs/bidders/headbidding.md
new file mode 100644
index 0000000000..23d91dbeb0
--- /dev/null
+++ b/dev-docs/bidders/headbidding.md
@@ -0,0 +1,26 @@
+---
+layout: bidder
+title: Head Bidding
+description: Prebid Head Bidding Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: headbidding
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `zoneId` | required | | |
+| `host` | required | | |
+
+Head Bidding is an aliased bidder for AdKernel
diff --git a/dev-docs/bidders/jcartermarketing.md b/dev-docs/bidders/jcartermarketing.md
new file mode 100644
index 0000000000..0b94f43d37
--- /dev/null
+++ b/dev-docs/bidders/jcartermarketing.md
@@ -0,0 +1,26 @@
+---
+layout: bidder
+title: J Carter Marketing
+description: Prebid J Carter Marketing Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: jcm
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `id` | required | | |
+| `siteID` | required | | |
+| `tier2SiteID` | optional | | |
+| `tier3SiteID` | optional | | |
diff --git a/dev-docs/bidders/mantis.md b/dev-docs/bidders/mantis.md
new file mode 100644
index 0000000000..21b3013691
--- /dev/null
+++ b/dev-docs/bidders/mantis.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Mantis
+description: Prebid Mantis Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: mantis
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `property` | required | | |
diff --git a/dev-docs/bidders/matomy.md b/dev-docs/bidders/matomy.md
new file mode 100644
index 0000000000..b29f3d573f
--- /dev/null
+++ b/dev-docs/bidders/matomy.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Matomy
+description: Prebid Matomy Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: matomy
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
diff --git a/dev-docs/bidders/memeglobal.md b/dev-docs/bidders/memeglobal.md
new file mode 100644
index 0000000000..a46259ea23
--- /dev/null
+++ b/dev-docs/bidders/memeglobal.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Meme Global
+description: Prebid Meme Global Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: memeglobal
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `tagid` | required | | |
diff --git a/dev-docs/bidders/nginad.md b/dev-docs/bidders/nginad.md
new file mode 100644
index 0000000000..fd3b8fb650
--- /dev/null
+++ b/dev-docs/bidders/nginad.md
@@ -0,0 +1,24 @@
+---
+layout: bidder
+title: NginAd
+description: Prebid NginAd Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: nginad
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `pzoneid` | required | | |
+| `nginadDomain` | required | | |
diff --git a/dev-docs/bidders/pagescience.md b/dev-docs/bidders/pagescience.md
new file mode 100644
index 0000000000..65a669436f
--- /dev/null
+++ b/dev-docs/bidders/pagescience.md
@@ -0,0 +1,28 @@
+---
+layout: bidder
+title: Page Science
+description: Prebid Page Science Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: pagescience
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |
+| `randomKey` | optional | | |
+| `invCode` | optional | | |
+| `member` | optional | | |
+
+Page Science is an aliased bidder for AppNexus
diff --git a/dev-docs/bidders/sekindo.md b/dev-docs/bidders/sekindo.md
new file mode 100644
index 0000000000..f39daac20f
--- /dev/null
+++ b/dev-docs/bidders/sekindo.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Sekindo
+description: Prebid Sekindo Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: sekindoUM
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `spaceId` | required | | |
diff --git a/dev-docs/bidders/smartyads.md b/dev-docs/bidders/smartyads.md
new file mode 100644
index 0000000000..d5d3a09298
--- /dev/null
+++ b/dev-docs/bidders/smartyads.md
@@ -0,0 +1,24 @@
+---
+layout: bidder
+title: SmartyAds
+description: Prebid SmartyAds Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: smartyads
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `banner_id` | required | | |
+| `` | optional | | |
diff --git a/dev-docs/bidders/smartyadstv.md b/dev-docs/bidders/smartyadstv.md
new file mode 100644
index 0000000000..aef7553197
--- /dev/null
+++ b/dev-docs/bidders/smartyadstv.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: StickyAdsTV
+description: Prebid StickyAdsTV Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: stickyadstv
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `zoneId` | required | | |
diff --git a/dev-docs/bidders/underdogmedia.md b/dev-docs/bidders/underdogmedia.md
new file mode 100644
index 0000000000..f757efcdaa
--- /dev/null
+++ b/dev-docs/bidders/underdogmedia.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Underdog Media
+description: Prebid Underdog Media Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: underdogmedia
+
+biddercode_longer_than_12: true
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `siteId` | required | | |
diff --git a/dev-docs/bidders/vertamedia.md b/dev-docs/bidders/vertamedia.md
new file mode 100644
index 0000000000..8413fcd164
--- /dev/null
+++ b/dev-docs/bidders/vertamedia.md
@@ -0,0 +1,24 @@
+---
+layout: bidder
+title: Vertamedia
+description: Prebid Vertamedia Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: vertamedia
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `aid` | required | | |
+| `placementId` | required | | |
diff --git a/dev-docs/bidders/widespace.md b/dev-docs/bidders/widespace.md
new file mode 100644
index 0000000000..b0c980cf7c
--- /dev/null
+++ b/dev-docs/bidders/widespace.md
@@ -0,0 +1,24 @@
+---
+layout: bidder
+title: Widespace
+description: Prebid Widespace Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: widespace
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `sid` | required | | |
+| `cur` | required | | |
diff --git a/dev-docs/bidders/xaxis.md b/dev-docs/bidders/xaxis.md
new file mode 100644
index 0000000000..ed86ce4264
--- /dev/null
+++ b/dev-docs/bidders/xaxis.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: Xaxis
+description: Prebid Xaxis Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: xhb
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `placementId` | required | | |

From 50367da8cd1123a32abf57cf404185d386d74916 Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Wed, 22 Feb 2017 17:33:44 -0500
Subject: [PATCH 27/30] Delete outdated 'Bidder Price & Latency Analysis'

Also, updated a very similar blog post from 2015 to note that its
analysis is out of date.
---
 _posts/2015-08-07-bidder-analysis.md       |   7 +-
 overview/header-bidding-bidder-analysis.md | 160 ---------------------
 2 files changed, 5 insertions(+), 162 deletions(-)
 delete mode 100644 overview/header-bidding-bidder-analysis.md

diff --git a/_posts/2015-08-07-bidder-analysis.md b/_posts/2015-08-07-bidder-analysis.md
index 13f2142bc0..c1dece0280 100644
--- a/_posts/2015-08-07-bidder-analysis.md
+++ b/_posts/2015-08-07-bidder-analysis.md
@@ -9,6 +9,9 @@ permalink: /blog/header-bidding-bidder-analysis
 
 ---
 
+{: .alert.alert-warning :}
+The content on this page is from 2015 and is now obsolete.
+
 While implementing Prebid.js' adaptors for different bidders, we've noticed not all bidders return exact price to the publisher's page. Different bidders also have vastly different response latency. We hope the analysis here can help you make smart decisions when implementing header bidding. 
 
 <!--| Amazon | Estimated at $0.50 increment | 300ms | -->
@@ -28,7 +31,7 @@ While implementing Prebid.js' adaptors for different bidders, we've noticed not
 
 *Note that the above latency estimate was done in New York, US with fast Internet connection. To provide more accurate report, publishers can implement latency trackers through the prebid.js API.
 
-###Live Test:
+### Live Test
 
 {% include live_demo.html %}
 
@@ -36,4 +39,4 @@ While implementing Prebid.js' adaptors for different bidders, we've noticed not
 
 * **Hover over** the timeline bars to discover how long each bidder takes.
 * Ad server is set to only wait for **up to 400ms**. If all bidders respond faster than that, Prebid.js will load the ad server early. If not, Prebid.js will ignore bidders that took too long. 
-* You may notice Javascript cannot initiate all bidder calls at once. To prevent bidders that get installed last to always have less time to respond, Prebid.js helps you keep the auction fair and rotate the order that bidders get called.
\ No newline at end of file
+* You may notice Javascript cannot initiate all bidder calls at once. To prevent bidders that get installed last to always have less time to respond, Prebid.js helps you keep the auction fair and rotate the order that bidders get called.
diff --git a/overview/header-bidding-bidder-analysis.md b/overview/header-bidding-bidder-analysis.md
deleted file mode 100644
index d07a26b1b2..0000000000
--- a/overview/header-bidding-bidder-analysis.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-layout: page
-title: Bidder Price & Latency Analysis
-description: An analysis of header bidding bidders' price granularity and latency.
-
-pid: 80
-
-top_nav_section: overview
-nav_section: studies
-
-permalink: /header-bidding-bidder-analysis.html
-
----
-<div class="bs-docs-section" markdown="1">
-
-# Bidder Price & Latency Analysis
-
-While implementing Prebid.js' adaptors for different bidders, we've noticed not all bidders return exact price to the publisher's page. Different bidders also have vastly different response latency. We hope the analysis here can help you make smart decisions when implementing header bidding. 
-
-<!--| Amazon | Estimated at $0.50 increment | 300ms | -->
-
-{: .table .table-bordered .table-striped }
-|	Bidder |	Price 	|	*Latency (rough estimate)   |
-| :----  |:--------| :-------|
-| AOL | Unknown | Unknown |
-| AppNexus | Exact | 200ms, however async calls have to be made for multiple slots |
-| Casale | Exact | Unknown | 
-| OpenX | Exact | 500ms |
-| Pubmatic | Exact | 400ms |
-| Rubicon | Exact | 400ms |
-| Sonobi | Exact | Unknown |
-| YieldBot | Exact | 300ms |
-
-*Note that the above latency estimate was done in New York, US with fast Internet connection. To provide more accurate report, publishers can implement latency trackers through [Prebid.js Analytics](/overview/ga-analytics.html).
-
-
-<!-- 
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<div id="chart_us"></div>
-<div id="chart_uk"></div>
-<div id="chart_de"></div>
-<!-- <div id="chart_ca"></div> -->
-      
-
-<script>
-var data = {"bg":{"amazon":{"num":17,"latency":187.146240234375},"appnexus":{"num":12,"latency":170.390828450521}},"ca":{"openx":{"num":2,"latency":787.467041015625},"DFP":{"num":29,"latency":374.82201171875},"amazon":{"num":2,"latency":340.38818359375}},"de":{"rubicon":{"num":4,"latency":479.220458984375},"appnexus":{"num":90,"latency":175.364076063368},"openx":{"num":46,"latency":757.2021484375},"amazon":{"num":8,"latency":94.7223815917969},"pubmatic":{"num":92,"latency":149.578621242357}},"sg":{"amazon":{"num":25,"latency":465.864034016927},"openx":{"num":1,"latency":null},"pubmatic":{"num":2,"latency":1678.56201171875}},"uk":{"openx":{"num":10,"latency":900.688452148437},"pubmatic":{"num":2,"latency":457.08984375},"appnexus":{"num":36,"latency":345.634141710069},"amazon":{"num":4,"latency":209.942443847656}},"us":{"Sovrn":{"num":1,"latency":430.9541015625},"appnexus":{"num":296,"latency":126.881093089691},"Amazon":{"num":1,"latency":176.924072265625},"openx":{"num":326,"latency":760.167721567124},"amazon":{"num":216,"latency":128.580746299342},"rubicon":{"num":13,"latency":202.674096679687},"pubmatic":{"num":8,"latency":606.111419677734},"sonobi":{"num":32,"latency":357.45173592403},"AOL":{"num":2,"latency":222.5439453125},"DFP":{"num":7,"latency":175.106759207589},"Openx":{"num":2,"latency":841.119873046875},"aol":{"num":77,"latency":231.124654447115},"sovrn":{"num":13,"latency":244.542292668269},"AppNexus":{"num":2,"latency":101.75},"Pubmatic":{"num":1,"latency":228.56982421875},"Sonobi":{"num":1,"latency":231.3671875}}};
-
-var countries = [{
-	code: 'us',
-	name: 'United States'
-}, {
-	code: 'uk',
-	name: 'United Kindom'
-}, {
-	code: 'de',
-	name: 'Germany'
-}, 
-// {
-// 	code: 'ca',
-// 	name: 'Canada'
-// }
-];
-
-
-
-google.load('visualization', '1', {packages: ['corechart', 'bar']});
-google.setOnLoadCallback(drawCountryCharts);
-
-function drawChart(countryData, country, divId) {
-	var data = new google.visualization.DataTable();
-	data.addColumn('string', 'Bidder');
-	data.addColumn('number', 'Avg Bid Load Time');
-
-	var rows = [];
-	for (var b in countryData) {
-		var v = countryData[b];
-		if ('num' in v && 'latency' in v) {
-			var num = v['num'];
-			var latency = v['latency'];
-			if (num > 2 && latency != null) {
-				rows.push([b, latency]);
-			}
-		}
-	}
-	data.addRows(rows);
-
-	var options = {
-	  title: 'Header Bidding Bidders Latency in ' + country,
-	  hAxis: {
-	  	title: 'Avg Bid Load Time (ms)'
-	  },
-	  vAxis: {
-	    title: 'Bidders'
-	  },
-	  height: rows.length * 50,
-	  legend: { position: "none" }
-	  //width: 500
-	};
-
-	var chart = new google.visualization.BarChart(
-	  document.getElementById(divId));
-
-	chart.draw(data, options);
-}
-
-function drawCountryCharts() {
-	for (var i = 0; i < countries.length; i++) {
-		var c = countries[i];
-		drawChart(data[c.code], c.name, 'chart_' + c.code);
-	}
-	//drawChart(data['us'], 'United States');
-}
-
-function drawMultSeries() {
-      var data = new google.visualization.DataTable();
-      data.addColumn('string', 'Time of Day');
-      data.addColumn('number', 'Motivation Level');
-
-      data.addRows([
-        ['OpenX', 1],
-        ['Pubmatic', 2],
-        ['Rubicon', 3],
-      ]);
-
-      var options = {
-        title: 'Motivation and Energy Level Throughout the Day',
-        hAxis: {
-          // title: 'Time of Day',
-          // format: 'h:mm a',
-          // viewWindow: {
-          //   min: [7, 30, 0],
-          //   max: [17, 30, 0]
-          // }
-        },
-        vAxis: {
-          title: 'Rating (scale of 1-10)'
-        }
-      };
-
-      var chart = new google.visualization.ColumnChart(
-        document.getElementById('chart_div'));
-
-      chart.draw(data, options);
-    }
-
-
-
-
-
-</script>
-
-
-
-
-
-
-
-
-
-</div>
\ No newline at end of file

From 4e17cf786126e616a468fb810c7aa5b7eaf02b0a Mon Sep 17 00:00:00 2001
From: Rich Loveland <rloveland@appnexus.com>
Date: Thu, 23 Feb 2017 16:25:34 -0500
Subject: [PATCH 28/30] Fix many, many broken links

Relates to https://github.com/prebid/prebid.github.io/issues/28 - ran the `htmlproofer` script described therein and found a bunch of things (including some interesting false positives, so the script is not itself without bugs).

In addition:

- Add alt tag to loader.gif
- s/troublshoot/troubleshoot/g
- Remove 2 dangling pages
---
 _includes/head.html                           |  1 -
 _includes/live_demo.html                      |  2 +-
 _layouts/example.html                         |  2 +-
 adops/deals.md                                |  2 +-
 dev-docs/bidder-adaptor.md                    |  6 +-
 dev-docs/bidders.md                           |  4 +-
 dev-docs/examples/adjust-price.md             |  8 +-
 dev-docs/examples/adunit-refresh.md           |  8 +-
 dev-docs/examples/basic-example.md            |  6 +-
 dev-docs/examples/custom-price-bucket.md      |  8 +-
 dev-docs/examples/full-page-refresh.md        |  8 +-
 dev-docs/examples/send-all-bids.md            | 10 +-
 .../how-to-add-a-new-video-bidder-adaptor.md  |  4 +-
 dev-docs/publisher-api-reference.md           |  4 +-
 how-it-works.md                               | 74 ---------------
 overview/how-to-simplify-line-item-setup.md   |  6 +-
 overview/optimal-header-bidding-setup.md      |  2 +-
 what-is-prebid-js.md                          | 92 -------------------
 18 files changed, 40 insertions(+), 207 deletions(-)
 delete mode 100644 how-it-works.md
 delete mode 100644 what-is-prebid-js.md

diff --git a/_includes/head.html b/_includes/head.html
index 437d16f9bd..370068f3c3 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -30,7 +30,6 @@
     }
   </style>
 
-  <script type="text/javascript" src="http://www.parsecdn.com/js/parse-1.5.0.min.js"></script>
   <!-- <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script> -->
   <script src="{{site.github.url}}/assets/js/jquery.min.js"></script>
   <!-- <script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> -->
diff --git a/_includes/live_demo.html b/_includes/live_demo.html
index e620dc2067..678dc31217 100644
--- a/_includes/live_demo.html
+++ b/_includes/live_demo.html
@@ -17,7 +17,7 @@
 	    <div class="col-sm-6 col-xs-6 pb-sm-left">
 	    	<script>function refresh_iframe_ad() {
 	    		$('#demo-iframe').contents()[0].location.reload();
-	    		$('#chart_div').html('<img src="/assets/images/loader.gif">');
+	    		$('#chart_div').html('<img alt="loader gif" src="/assets/images/loader.gif">');
 	    		return false;
 	    	}
 	    	</script>
diff --git a/_layouts/example.html b/_layouts/example.html
index 9d03f1e5cc..9957a7e362 100644
--- a/_layouts/example.html
+++ b/_layouts/example.html
@@ -52,7 +52,7 @@ <h4>This page contains:</h4>
       </p>
 
       <p>
-        For tips and troublshooting info, see:
+        For tips and troubleshooting info, see:
         <ul>
           <li>
             <a href="{{site.github.url}}/dev-docs/toubleshooting-tips.html">Tips for Troubleshooting</a>
diff --git a/adops/deals.md b/adops/deals.md
index 7707d14f5e..1f7d2ac1d9 100644
--- a/adops/deals.md
+++ b/adops/deals.md
@@ -56,7 +56,7 @@ Whether your Ad Ops setup [sends all bids to the ad server](/adops/send-all-bids
 
 ### Step 2: Create Key-values
 
-For each header bidding partner you work with, create a keyword in the format of `hb_deal_BIDDERCODE`, e.g., `hb_deal_pubmatic`. For more examples of the keyword format, see the [API Reference for `pbjs.getAdserverTargeting`](#module_pbjs.getAdserverTargeting).
+For each header bidding partner you work with, create a keyword in the format of `hb_deal_BIDDERCODE`, e.g., `hb_deal_pubmatic`. For more examples of the keyword format, see the [API Reference for `pbjs.getAdserverTargeting`]({{site.github.url}}/dev-docs/publisher-api-reference.html#module_pbjs.getAdserverTargeting).
 
 Note that due to [DFP's character length limit on keys](https://support.google.com/dfp_premium/answer/1628457?hl=en#Key-values), Index Exchange's key is truncated to `hb_deal_indexExchang`.
 <br>
diff --git a/dev-docs/bidder-adaptor.md b/dev-docs/bidder-adaptor.md
index 75d6512fc7..2b38407a9a 100644
--- a/dev-docs/bidder-adaptor.md
+++ b/dev-docs/bidder-adaptor.md
@@ -21,7 +21,7 @@ This page has instructions for writing your own bidder adapter.  The instruction
 
 {: .alert.alert-success :}
 **Adding a Video Bidder Adaptor?**  
-See [How to Add a New Video Bidder Adaptor]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
+See [How to Add a New Video Bidder Adaptor]({{site.github.url}}/dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
 
 * TOC
 {:toc}
@@ -63,7 +63,7 @@ A good example of an adapter that uses this pattern for its implementation is [O
 
 ## Step 3: Design your bid params
 
-Use the `bid.params` object for defining the parameters of your ad request.  You can include tag ID, site ID, ad size, keywords, and other data, such as [video bidding information]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
+Use the `bid.params` object for defining the parameters of your ad request.  You can include tag ID, site ID, ad size, keywords, and other data, such as [video bidding information]({{site.github.url}}/dev-docs/how-to-add-a-new-video-bidder-adaptor.html).
 
 For more information about the kinds of information that can be passed using these parameters, see [the list of bidder parameters]({{site.github.url}}/dev-docs/bidders.html).
 
@@ -198,7 +198,7 @@ For usage examples, see [the working adapters in the repo](https://github.com/pr
 
 ## Further Reading
 
-+ [How to Add a New Video Bidder Adaptor]({{site.github.url}}dev-docs/how-to-add-a-new-video-bidder-adaptor.html)
++ [How to Add a New Video Bidder Adaptor]({{site.github.url}}/dev-docs/how-to-add-a-new-video-bidder-adaptor.html)
 
 + [The bidder adapter sources in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters)
 
diff --git a/dev-docs/bidders.md b/dev-docs/bidders.md
index e1bdb478f2..dfba3b470d 100644
--- a/dev-docs/bidders.md
+++ b/dev-docs/bidders.md
@@ -50,7 +50,7 @@ These parameters in the `bidReponse` object are common across all bidders.
 |   Name |   Type | Description | Example
 | :----  |:--------| :-------| :-------|
 | `bidder` | String | The bidder code. Used by ad server's line items to identify bidders | `appnexus` |
-| `adId` | String |  The unique identifier of a bid creative. It's used by the line item's creative as in [this example](adops.html#creative-setup). | `123` |
+| `adId` | String |  The unique identifier of a bid creative. It's used by the line item's creative as in [this example]({{site.github.url}}/adops/send-all-bids-adops.html#step-3-add-a-creative). | `123` |
 | `pbLg` | String | The low granularity price bucket at 0.50 increment, capped at $5, floored to 2 decimal places. (0.50, 1.00, 1.50, ..., 5.00) | `1.50` |
 | `pbMg` | String | The medium granularity price bucket at 0.10 increment, capped at $20, floored to 2 decimal places. (0.10, 0.20, ..., 19.90, 20.00) | `1.60` |
 | `pbHg` | String | The high granularity price bucket at 0.01 increment, capped at $20, floored to 2 decimal places. (0.01, 0.02, ..., 19.99, 20.00) | `1.61` |
@@ -66,7 +66,7 @@ These parameters in the `bidReponse` object are common across all bidders.
 
 <div class="bs-docs-section" markdown="1">
 
-<h1><a name="{{ page.biddercode }}" href="bidders/{{ page.biddercode }}.html" target="_blank">{{ page.title }}</a></h1>
+<h1><a name="{{ page.biddercode }}" />{{ page.title }}</h1>
 
 <h3>bidder code:</h3>
 
diff --git a/dev-docs/examples/adjust-price.md b/dev-docs/examples/adjust-price.md
index d114a12561..710588b04c 100644
--- a/dev-docs/examples/adjust-price.md
+++ b/dev-docs/examples/adjust-price.md
@@ -9,11 +9,11 @@ nav_section: quick-start
 hide: true
 
 about:
-- <strong>Adjust bidder price for real earnings.</strong>
-- Integration with DFP's GPT single request asynchronous mode.
+- <strong>Adjust bidder price for real earnings</strong>
+- Integration with DFP's GPT single request asynchronous mode
 - One set of line items for all bidders
-- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>).
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
+- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>)
+- Standard price granularity
 
 
 jsfiddle_link: jsfiddle.net/prebid/hn06j4f4/10/embedded/html,result
diff --git a/dev-docs/examples/adunit-refresh.md b/dev-docs/examples/adunit-refresh.md
index a2ff781f6f..0077bfc837 100644
--- a/dev-docs/examples/adunit-refresh.md
+++ b/dev-docs/examples/adunit-refresh.md
@@ -9,11 +9,11 @@ nav_section: quick-start
 hide: true
 
 about:
-- Ability to <strong>refresh individual ad units</strong>. Useful for infinite scrolling ad slots.
-- Integration with DFP's GPT single request asynchronous mode.
+- Ability to <strong>refresh individual ad units</strong>. Useful for infinite scrolling ad slots
+- Integration with DFP's GPT single request asynchronous mode
 - One set of line items for all bidders
-- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>).
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
+- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>)
+- Standard price granularity
 
 jsfiddle_link: jsfiddle.net/prebid/dzrs3gfL/10/embedded/html,result
 code_height: 2900
diff --git a/dev-docs/examples/basic-example.md b/dev-docs/examples/basic-example.md
index 04fe904fa8..33dce1d4d0 100644
--- a/dev-docs/examples/basic-example.md
+++ b/dev-docs/examples/basic-example.md
@@ -8,10 +8,10 @@ nav_section: quick-start
 
 
 about:
-- <a href="/blog/dfp-instant-load">Instant Load</a> integration with DFP GPT single request asynchronous mode.
-- One set of line items for all bidders, or for each bidder. (Both setups work with this example)
+- <a href="/blog/dfp-instant-load">Instant Load</a> integration with DFP GPT single request asynchronous mode
+- One set of line items for all bidders, or for each bidder (Both setups work with this example)
 - Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>).
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
+- Standard price granularity
 
 jsfiddle_link: jsfiddle.net/prebid/bhn3xk2j/4/embedded/html,result
 
diff --git a/dev-docs/examples/custom-price-bucket.md b/dev-docs/examples/custom-price-bucket.md
index 7ae1d95573..978885de7e 100644
--- a/dev-docs/examples/custom-price-bucket.md
+++ b/dev-docs/examples/custom-price-bucket.md
@@ -9,9 +9,9 @@ nav_section: quick-start
 hide: true
 
 about:
-- <strong>Custom keyword targeting setup (for price).</strong>
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
-- Integration with DFP's GPT single request asynchronous mode.
+- <strong>Custom keyword targeting setup (for price)</strong>
+- Standard price granularity
+- Integration with DFP's GPT single request asynchronous mode
 - One set of line items for all bidders
 
 jsfiddle_link: jsfiddle.net/prebid/bp9magow/17/embedded/html,result
@@ -34,7 +34,7 @@ pid: 100
 <div markdown="1">
 #### Line 31 to 59: Customize ad server targeting keywords
 
-In this example, the keywords sent to DFP are changed from the default `hb_pb` to `custom_bid_price_key`. It also customized the bid price from default `pbMg` ([docs here](/dev-docs/publisher-api-reference.html#bidResponse)) to custom logic. The logic is: 
+In this example, the keywords sent to DFP are changed from the default `hb_pb` to `custom_bid_price_key`. It also customized the bid price from default `pbMg` to custom logic. The logic is:
 
 - Send $0.01 granularity price when the bid price is between $0 to $3. 
 - Send $0.10 granularity price when the bid price is between $3 to $5. 
diff --git a/dev-docs/examples/full-page-refresh.md b/dev-docs/examples/full-page-refresh.md
index 419cd9d03c..7640c5c301 100644
--- a/dev-docs/examples/full-page-refresh.md
+++ b/dev-docs/examples/full-page-refresh.md
@@ -9,11 +9,11 @@ nav_section: quick-start
 hide: true
 
 about:
-- Ability to <strong>refresh all ad units</strong>.
-- Integration with DFP's GPT single request asynchronous mode.
+- Ability to <strong>refresh all ad units</strong>
+- Integration with DFP's GPT single request asynchronous mode
 - One set of line items for all bidders
-- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>).
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
+- Standard keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#bidderSettingsDefault">reference</a>)
+- Standard price granularity
 
 jsfiddle_link: jsfiddle.net/prebid/amg49spy/11/embedded/html,result
 code_height: 2662
diff --git a/dev-docs/examples/send-all-bids.md b/dev-docs/examples/send-all-bids.md
index 8ee2d19f50..f6bdab57f8 100644
--- a/dev-docs/examples/send-all-bids.md
+++ b/dev-docs/examples/send-all-bids.md
@@ -9,11 +9,11 @@ nav_section: quick-start
 hide: true
 
 about:
-- One set of line items for EACH bidder.
-- Send all bids mode's keyword targeting setup. <a href="/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids">Reference here</a>
-- Send all bids to the ad server so you can track historical bid prices from various bidders in reporting.
-- Standard price granularity (pbMg see <a href="/dev-docs/publisher-api-reference.html#bidResponse">reference here</a>).
-- Standard integration with DFP's GPT single request asynchronous mode.
+- One set of line items for each bidder
+- Send all bids mode keyword targeting setup (<a href="/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids">reference here</a>)
+- Send all bids to the ad server so you can track historical bid prices from various bidders in reporting
+- Standard price granularity
+- Standard integration with DFP's GPT single request asynchronous mode
 
 jsfiddle_link: jsfiddle.net/prebid/qu68xoz5/3/embedded/html,result
 
diff --git a/dev-docs/how-to-add-a-new-video-bidder-adaptor.md b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
index 7bb8e7daf3..6e0d95fda8 100644
--- a/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
+++ b/dev-docs/how-to-add-a-new-video-bidder-adaptor.md
@@ -19,7 +19,7 @@ At a high level, a bidder adaptor is responsible for:
 
 This page has instructions for writing your own video-enabled bidder adaptor.  The instructions here try to walk you through some of the code you'll need to write for your adaptor.
 
-When in doubt, use an adaptor that already has support for video for reference, such as [the AppNexus AST adaptor in the Github repo](https://github.com/prebid/Prebid.js/blob/master/src/adaptors/appnexusAst.js).  (The code samples and descriptions below are based on it.)
+When in doubt, use an adaptor that already has support for video for reference, such as [the AppNexus AST adaptor in the Github repo](https://github.com/prebid/Prebid.js/blob/master/src/adapters/appnexusAst.js).  (The code samples and descriptions below are based on it.)
 
 * TOC
 {:toc}
@@ -226,7 +226,7 @@ For usage examples of `loadScript`, see [the adapters in the repo](https://githu
 
 ## Further Reading
 
-+ [How to Add a New Bidder Adapter](http://{{site.github.url}}/dev-docs/bidder-adaptor.html)
++ [How to Add a New Bidder Adapter]({{site.github.url}}/dev-docs/bidder-adaptor.html)
 
 + [The bidder adapter sources in the repo](https://github.com/prebid/Prebid.js/tree/master/src/adapters)
 
diff --git a/dev-docs/publisher-api-reference.md b/dev-docs/publisher-api-reference.md
index ea822e48c1..c6fde66865 100644
--- a/dev-docs/publisher-api-reference.md
+++ b/dev-docs/publisher-api-reference.md
@@ -120,7 +120,7 @@ This function returns the bid responses at the given moment.
 | Param               | Type    | Description                                                                                                                     |                                                           |
 |---------------------+---------+---------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------|
 | `bidder`            | String  | The bidder code. Used by ad server's line items to identify bidders                                                             |                                                 `rubicon` |
-| `adId`              | String  | The unique identifier of a bid creative. It's used by the line item's creative as in [this example](adops.html#creative-setup). |                                                     `123` |
+| `adId`              | String  | The unique identifier of a bid creative. It's used by the line item's creative as in [this example]({{site.github.url}}/adops/send-all-bids-adops.html#step-3-add-a-creative). |                                                     `123` |
 | `width`             | Integer | The width of the returned creative size.                                                                                        |                                                       300 |
 | `height`            | Integer | The height of the returned creative size.                                                                                       |                                                       250 |
 | `cpm`               | Float   | The exact bid price from the bidder                                                                                             |                                                      1.59 |
@@ -274,7 +274,7 @@ This function returns the bid responses at the given moment.
 
 ### pbjs.getBidResponsesForAdUnitCode(adUnitCode) ⇒ `Object`
 
-Returns bidResponses for the specified adUnitCode. See full documentation at [pbjs.getBidResponses()](module_pbjs.getBidResponses).
+Returns bidResponses for the specified adUnitCode. See full documentation at [pbjs.getBidResponses()](#module_pbjs.getBidResponses).
 
 **Kind**: static method of [pbjs](#module_pbjs)
 
diff --git a/how-it-works.md b/how-it-works.md
deleted file mode 100644
index a677866017..0000000000
--- a/how-it-works.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-layout: page
-title: How it Works
-head_title: How it Works
-description: An overview of how header bidding with prebid.js works
-pid: 1
-hide: true
-isNavParent: true
-isNavDropdown: false
-
----
-
-<div class="bs-docs-section" markdown="1">
-
-# Overview
-
-At a high level, header bidding involves just a few steps:
-
-1. The Prebid.js library fetches bids from various partners
-
-2. Prebid.js passes information about those bids (including price) to
-   the tag on page, which passes it to the ad server as query string
-   parameters.
-
-3. The ad server has line items targeting those parameters.
-
-Note that the only additional latency introduced by header bidding
-comes during step #1.  Fortunately this latency can be controlled by
-[a timeout setting]({{site.github.url}}/publisher-api.html#ad-server-timeout).
-Furthermore, Prebid.js sends bid requests asynchronously to avoid
-blocking page load.
-
-For more information about how to set up header bidding with
-Prebid.js, see
-[Getting Started]({{site.github.url}}/getting-started.html).
-
-</div>
-
-<div class="bs-docs-section" markdown="1">
-
-# Step by Step
-
-The steps below describe how the process of header bidding with
-Prebid.js works in more detail (Each numbered step is shown in the
-diagram at the bottom of this page):
-
-1. Prebid.js loads asynchronously in the page header and hooks into
-   the ad tag on page to get the placement ID and size.  It can also
-   be used to set a timeout to delay loading the ad tag while the
-   header auction occurs. If the header auction exceeds the timeout,
-   the auction is skipped and the tag on page loads normally.
-
-2. Prebid.js makes an auction request to each of the header bidding
-   partners that you've configured.
-
-3. Each partner holds its own internal auction.
-
-4. Each partner returns bids to Prebid.js which include the creative
-   payload and other information.
-
-5. Prebid.js passes along bid information (including price) to the tag
-   on page, which passes it to the ad server as a set of query string
-   parameters. In the ad server, there are line items targeting those
-   parameter.
-
-6. The ad server evaluates all of the bids and chooses a winner.  The
-   tag on the page loads a creative from the winning bidder.  Note
-   that no additional latency is introduced by creatives from header
-   bidding partners since their creative payloads were already fetched
-   during step #4.
-
-</div>
-
-![Prebid Auction Diagram]({{ site.github.url }}/assets/images/prebid-auction.png)
diff --git a/overview/how-to-simplify-line-item-setup.md b/overview/how-to-simplify-line-item-setup.md
index 9f4ad9fdd7..71a1ffc672 100644
--- a/overview/how-to-simplify-line-item-setup.md
+++ b/overview/how-to-simplify-line-item-setup.md
@@ -59,7 +59,7 @@ There's a reason bidders recommend different set of line items for different cre
 
 Prebid.js can dynamically resize the returned creative to the right size. Here's the setup:
 
-* Submit a few creatives of size 1x1 and make them override the line items' sizes. ([How to do this]({{ site.github.url }}/adops/step-by-step.html#creatives-setup))
+* Submit a few creatives of size 1x1 and make them override the line items' sizes when you [attach creatives to the line item]({{ site.github.url }}/adops/step-by-step.html#step-3-attach-the-creative-to-the-line-item).
 * Your ad unit can accept both 300x250 and 300x600. A bidder bid $6.00 for the 300x600 size and has the highest price. Prebid.js passed the bid in, as well as a generated bid ID. 
 * The $6.00 line item got picked by the line item. 
 * Your ad server randomly choose a 1x1 creative. However, because all creatives have the same content, it does not make a difference.
@@ -102,7 +102,7 @@ This simplifies the setup and the right creative (with adId 65432) will get disp
 
 #### How about reporting?
 
-It's important to understand the fill rates and CPM from different bidders. Prebid.js therefore passes in `hb_bidder`: bidderCode. This enables DFP to report on query strings (After you've done [this step]({{ site.github.url }}/adops/step-by-step.html#query-strings)). You can therefore run queries like:
+It's important to understand the fill rates and CPM from different bidders. Prebid.js therefore passes in `hb_bidder`: bidderCode. This enables DFP to report on query strings.  You can run queries like:
 
 * For bidder X, at what CPM does it fill?
 * For bidder X, what's the fill rate out of all the winning header bidding bids?
@@ -118,4 +118,4 @@ Enjoy the much more simplified line items, creatives, and targeting setup!
 
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/overview/optimal-header-bidding-setup.md b/overview/optimal-header-bidding-setup.md
index c324c5c9d2..a2a3f2bb4b 100644
--- a/overview/optimal-header-bidding-setup.md
+++ b/overview/optimal-header-bidding-setup.md
@@ -145,7 +145,7 @@ The ad server sees the impression and header bidding info immediately after all
 Add the Plugin [Headerbid Expert](https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop) to your browser.
 
 <div class="pb-md-img">
-<a href="https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop" target="_blank"><img src="/assets/images/hb-expert/headerbid-expert-logo.png" style="cursor:pointer">
+<a href="https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop" target="_blank"><img src="/assets/images/hb-expert/headerbid-expert-logo.png" alt="headerbid-expert-logo" style="cursor:pointer">
 </a>
 </div>
 
diff --git a/what-is-prebid-js.md b/what-is-prebid-js.md
deleted file mode 100644
index 2dbf44d6ce..0000000000
--- a/what-is-prebid-js.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-layout: page
-title: What is Prebid.js?
-head_title: What is Prebid.js?
-description: What Prebid.js is, and why it's useful
-pid: 0
-hide: true
-isNavParent: true
-isNavDropdown: false
-
----
-
-<div class="bs-docs-section" markdown="1">
-
-# Overview
-
-Pre-bid auctions (also known as "header auctions" or "header bidding")
-run directly on a publisher's page and allow publishers to access
-external demand that may not be available through their primary ad
-server.
-
-Prebid.js is a 100% free and open source Javascript framework designed
-to make it easier for publishers to run pre-bid auctions and get
-access to more demand with minimal integration hassle.
-
-For more information about how header bidding with Prebid.js works,
-see [How it Works]({{site.github.url}}/how-it-works.html).
-
-</div>
-
-<div class="bs-docs-section" markdown="1">
-
-# Benefits
-
-The benefits of pre-bid auctions include:
-
-- Access to more demand; partners compete on 100% of the publisher's
-  inventory.
-
-- Generally higher CPMs and fill rates.
-
-- More transparency about who is purchasing the publisher's inventory
-  as a result of eliminating "waterfall" methods and estimated CPMs.
-
-- Reduced discrepancies and pass-backs.
-
-- Lower transaction costs.
-
-The benefits of using Prebid.js in particular are:
-
-- 100% free and open source, giving you complete control over how you
-  use it.
-
-- Clean, built-in support for all major bidders as well as major ad
-  servers.
-
-- It solves many problems publishers are facing - high latency, unfair
-  auction mechanics, long development time, and confusing line item
-  and targeting setup.
-
-- Plugging in prebid.js is easy. Adding new header bidding partners is
-  a matter of adding tag IDs to your JSON config.
-
-</div>
-
-<div class="bs-docs-section" markdown="1">
-
-# Bidder Support
-
-Prebid.js has built-in support for most major bidders, including:
-
-- AOL
-- AppNexus
-- Index
-- OpenX
-- Pubmatic
-- Rubicon
-- Yieldbot
-
-</div>
-
-<div class="bs-docs-section" markdown="1">
-
-# Supported Ad Servers
-
-Prebid.js supports major ad servers such as:
-
-- DFP
-- OAS
-- AdTech
-
-</div>

From 25dc8b32806c4376e9ce4fa2ba9053e7eb27ca9b Mon Sep 17 00:00:00 2001
From: Artem Dmitriev <art.dm.ser@gmail.com>
Date: Tue, 28 Feb 2017 15:57:57 +0300
Subject: [PATCH 29/30] Update getintent.md

Video updates to GetIntent documentation.
---
 dev-docs/bidders/getintent.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-docs/bidders/getintent.md b/dev-docs/bidders/getintent.md
index 13abeaf74d..aef5329d71 100644
--- a/dev-docs/bidders/getintent.md
+++ b/dev-docs/bidders/getintent.md
@@ -21,6 +21,24 @@ biddercode_longer_than_12: false
 | Name | Scope | Description | Example |
 | :--- | :---- | :---------- | :------ |
 | `pid` | required | Publisher ID registered in GetIntent system | `123` |
-| `tid` | required | Unique Tag ID | `abc` |
+| `tid` | optional | Unique Tag ID. Required if multiple tags are used on the same page. | `abc` |
 | `cur` | optional | Currency of the ad request. Default is the one configured at publisher settings. | `USD` |
 | `floor` | optional | Floor price for the request. | `0.123` |
+| `video` | optional | Object with video parameters. See the [video section below](#getintent-video). || |
+
+<a name="getintent-video"></a>
+
+#### video
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+| :--- | :---- | :---------- | :------ |
+| `protocols` | optional | The list of the restricted VAST protocol versions. Possible values: `1` – VAST 1.0, `2` – VAST 2.0, `3` – VAST 3.0, `4` – VAST 1.0 Wrapper, `5` – VAST 2.0 Wrapper, `6` – VAST 3.0 Wrapper. | `protocols: [4,5,6]` |
+| `mimes` | optional | Array of Mime Type strings. | `mimes: ["application/javascript"]` |
+| `min_dur` | optional | Minimal video duration. | `min_dur: 30` |
+| `max_dur` | optional | Maximal video duration. | `max_dur: 30` |
+| `min_btr` | optional | Minimal Video bitrate. | `min_btr: 256` |
+| `max_btr` | optional | Maximal Video bitrate. | `max_btr: 512` |
+| `vi_format` | optional | Video inventory format. Possible values: `1` - In-Stream video, `2` - Out-Stream video. | `vi_format: 1` |
+| `api` | optional | API of the inventory. Possible values: `1` - VPAID 1.0, `2` - VPAID 2.0, `3` - MRAID-1, `4` - ORMMA, `5` - MRAID-2. | `api: [3,4]` |
+| `skippable` | optional | Skippability of the inventory. Possible values (case insensitive): `ALLOW` - skippable inventory is allowed, `NOT_ALLOW` - skippable inventory is not allowed, `REQUIRE` - only skippable inventory is allowed, `UNKNOWN` - skippability is unknown (default value). | `skippable: "NOT_ALLOW"` |

From 02d58ee5420dba8a972597558a3c788b437bddb0 Mon Sep 17 00:00:00 2001
From: Lin Rubo <rubo.lin@qq.com>
Date: Wed, 1 Mar 2017 10:57:45 +0800
Subject: [PATCH 30/30] add adbund dev-doc

---
 dev-docs/bidders/adbund.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 dev-docs/bidders/adbund.md

diff --git a/dev-docs/bidders/adbund.md b/dev-docs/bidders/adbund.md
new file mode 100644
index 0000000000..ee310c9e84
--- /dev/null
+++ b/dev-docs/bidders/adbund.md
@@ -0,0 +1,24 @@
+---
+layout: bidder
+title: AdBund
+description: Prebid AdBund Bidder Adaptor
+
+top_nav_section: dev_docs
+nav_section: reference
+
+hide: true
+
+biddercode: adbund
+
+biddercode_longer_than_12: false
+
+
+---
+
+### bid params
+
+{: .table .table-bordered .table-striped }
+| Name | Scope | Description | Example |
+|:-----------|:---------|:------------|:-----------------|
+| `sid` | required | slot id | 110238 |
+| `bidfloor` | required |  | 0.036 |