engtat · engtat · May 5, 2017 · Mar 24, 2017 · Mar 29, 2017 · Apr 3, 2017
diff --git a/404.md b/404.md
@@ -5,29 +5,6 @@ description:
 hide: true
 ---
 
-
-
 <div class="text-center">
-<h3><span class="label label-warning">The page you're looking for does not exist. </span></h3>
-<br>
+  <h3><span class="label label-warning">404 - The page you're looking for does not exist. </span></h3>
 </div>
-
-<div class="form-horizontal">
-  <div class="form-group">
-    <label class="col-sm-2 control-label">Site Link</label>
-    <div class="col-sm-10">
-      <input class="form-control" id="site-field" placeholder="http://" autofocus required>
-    </div>
-  </div>
-  <div class="form-group">
-    <label class="col-sm-2 control-label">Email</label>
-    <div class="col-sm-10">
-      <input class="form-control" placeholder="Email" id="email-field" required>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <button class="btn btn-success" id="submit-email" onclick="submitEmail()">Add me in!</button>
-    </div>
-  </div>
-</div>
diff --git a/_config.yml b/_config.yml
@@ -1,27 +1,25 @@
 # name of the software
-name: Prebid.js
+name: Prebid
 # current version of the software
 version: 1.0.0
-# url of the download button
-downloadUrl: https://github.com/prebid/Prebid.js/releases
 # licence of the software
 license: Apache License
 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0
 
 # list of additional links on the right of the top menu
 headerLinks:
   - title: GitHub
-    url: https://github.com/prebid/Prebid.js
+    url: https://github.com/prebid
 
 
 # list if additional links on the footer
 footerLinks:
   - title: GitHub
-    url: https://github.com/prebid/Prebid.js
-  - title: Issues
-    url: https://github.com/prebid/Prebid.js/issues?state=open
- # - title: About Us
- #   url: /about.html
+    url: https://github.com/prebid/
+# - title: Issues
+#   url: https://github.com/prebid/Prebid.js/issues?state=open
+# - title: About Us
+#   url: /about.html
 
 
 # header
@@ -70,10 +68,13 @@ nav_sections:
 
   - top_nav: dev_docs
     code: quick-start
-    name: QUICK START
+    name: DEVELOPER QUICK START
   - top_nav: dev_docs
     code: prebid-video
     name: PREBID VIDEO (BETA)
+  - top_nav: dev_docs
+    code: prebid-server
+    name: PREBID SERVER
   - top_nav: dev_docs
     code: prebid-amp
     name: PREBID FOR AMP (ALPHA)
@@ -108,18 +109,25 @@ nav_sections:
 
   - top_nav: adops
     code: tutorials
-    name: TUTORIALS
+    name: AD OPS TUTORIALS
+  - top_nav: adops
+    code: reference
+    name: REFERENCE
 
   - top_nav: support
     code: support
     name: SUPPORT
 
+  - top_nav: principles
+    code: principles
+    name: PRINCIPLES
+
   - top_nav: download
     code: download
     name: DOWNLOAD
 
 
-port: 80
+port: 8080
 
 exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile']
 

diff --git a/_includes/foot.html b/_includes/foot.html
@@ -37,7 +37,7 @@
       </div>
 
       <p>
-        All demos, instructions, documentation and code included in Prebid.js or on the Prebid.org website are released under the <a href="{{site.licenseUrl}}" target="_blank">{{site.license}}</a>.
+        All demos, instructions, documentation and code included on the Prebid.org website are released under the <a href="{{site.licenseUrl}}" target="_blank">{{site.license}}</a>.
       </p>
 
       <p>

diff --git a/_includes/head.html b/_includes/head.html
@@ -7,6 +7,8 @@
   <meta name="keywords" content="Header Bidding, Advanced Bidding, Header Bid, Pre-bid">
   <meta name="description" content="{{page.description}}" />
 
+  <link rel="shortcut icon" type="image/png" href="/favicon.png"/>
+
   {% if page.head_title %}
     <title>{{page.head_title}}</title>
   {% else %}

diff --git a/_includes/main_nav.html b/_includes/main_nav.html
@@ -12,57 +12,91 @@
         </button>
         <a class="navbar-brand" href="{{site.github.url}}/">{{site.name}}</a>
       </div>
-      <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
-        <ul class="nav navbar-nav">
-
-          <li {% if page.top_nav_section == 'overview' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/overview/intro.html">Overview
-            </a>
-          </li>          
 
-          <li {% if page.top_nav_section == 'dev_docs' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/dev-docs/getting-started.html">Dev Docs
-            </a>
-          </li>          
+      <nav class="collapse navbar-collapse" id="bs-example-navbar-collapse-1" role="navigation">
+        <ul class="nav navbar-nav">
 
-          <li {% if page.top_nav_section == 'adops' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/adops.html">Adops
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+              About
+              <span class="caret" />
             </a>
+            <ul class="dropdown-menu">
+              <li><a href="{{site.github.url}}/overview/intro.html">What is Prebid?</a></li>
+              <li><a href="{{site.github.url}}/principles.html">Principles</a></li>
+              <li><a href="{{site.github.url}}/dev-docs/faq.html">FAQ</a></li>
+              <li><a href="{{site.github.io}}/blog.html">Blog</a></li>
+            </ul>
           </li>
 
-          <li {% if page.top_nav_section == faq' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/dev-docs/faq.html">FAQ</a>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+              Docs
+              <span class="caret" />
+            </a>
+            <ul class="dropdown-menu">
+              <li class="dropdown-submenu">
+                <a href="{{site.github.url}}/overview/getting-started.html">Prebid.js for web</a>
+                <ul class="dropdown-menu">
+                  <li><a href="{{site.github.url}}/dev-docs/docs-by-format.html">Docs by Format</a></li>
+                  <li><a href="{{site.github.url}}/adops/docs-by-ad-server.html">Docs by Ad Server</a></li>
+                  <li><a href="{{site.github.url}}/dev-docs/examples/basic-example.html">Examples</a></li>
+                </ul>
+              </li>
+              <li><a href="{{site.github.url}}/dev-docs/get-started-with-prebid-server.html">Prebid Server</a></li>
+              <li><a href="#">Prebid Mobile for apps <sup><font color="#AAA">Coming soon</font></sup></a></li>
+              <li><a href="{{site.github.url}}/adops.html">For Ad Ops</a></li>
+              <li><a href="{{site.github.url}}/dev-docs/getting-started.html">For Developers</a></li>
+            </ul>
           </li>
 
-          <li {% if page.top_nav_section == 'support' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/support/support.html">Support
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+              Tools &amp; Analytics
+              <span class="caret" />
             </a>
+            <ul class="dropdown-menu">
+              <li><a href="https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop">Chrome Extension</a></li>
+              <li><a href="{{site.github.url}}/dev-docs/integrate-with-the-prebid-analytics-api.html">Analytics</a></li>
+              <li><a href="{{site.github.url}}/download.html">Download</a></li>
+            </ul>
           </li>
 
-          <li {% if page.top_nav_section == 'beta' %}class="active"{% endif %}>
-            <a href="{{site.github.url}}/blog.html">Blog</a>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+              Support
+              <span class="caret" />
+            </a>
+            <ul class="dropdown-menu">
+              <li><a href="{{site.github.url}}/support/">Get Help</a></li>
+              <li><a href="{{site.github.url}}/dev-docs/prebid-troubleshooting-guide.html">Troubleshooting</a></li>
+              <li><a href="http://stackoverflow.com/questions/tagged/prebid.js">Stack Overflow</a></li>
+              <li><a href="https://reddit.com/r/adops">Ad Ops Reddit</a></li>
+              <li><a href="https://redditadops.slack.com/messages/C0HVALS8P"><strong>#headerbidding</strong> channel (Reddit Ad Ops Slack)</a></li>
+            </ul>
           </li>
 
-          <li {% if page.top_nav_section == 'download' %}class="active"{% endif %}>
-            <!-- <a href="https://github.com/prebid/Prebid.js/releases">Download
-            </a> -->
-            <a href="{{site.github.url}}/download.html">Download
-            <!-- <span class="badge">New</span> -->
-            <span class="label label-warning">Beta</span>
-
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+              Contribute
+              <span class="caret" />
             </a>
-          </li>  
+            <ul class="dropdown-menu" role="menu">
+              <li class="dropdown-submenu">
+                <a href="#">Repos</a>
+                <ul class="dropdown-menu">
+                  <li><a href="https://github.com/prebid/Prebid.js/">Prebid.js</a></li>
+                  <li><a href="https://github.com/prebid/prebid-server">Prebid Server</a></li>
+                  <li><a href="#">Prebid Mobile <sup><font color="#AAA">Coming soon</font></sup></a></li>
+                </ul>
+              </li>
+              <li><a href="{{site.github.io}}/dev-docs/bidder-adaptor.html">Add an Adapter</a></li>
+              <li><a href="{{site.github.url}}/dev-docs/release-notes.html">Release Notes</a></li>
+            </ul>
+          </li>
 
         </ul>
 
-        <ul class="nav navbar-nav navbar-right">
-        {% for p in site.headerLinks %}
-          <li>
-            <a href="{{p.url}}">{{p.title}}</a>
-          </li>
-        {% endfor %}
-        </ul>
-
       </nav>
     </div>
   </header>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -7,8 +7,8 @@
 
   <div class="bs-docs-header" id="content">
     <div class="container">
-      <h1>Prebid.js Blog</h1>
-      <p>A collection of helpful tips for implementing header bidding with prebid.js.</p>
+      <h1>Prebid.org Blog</h1>
+      <p>A collection of helpful tips for implementing header bidding with.</p>
     </div>
   </div>
 

diff --git a/adops/docs-by-ad-server.md b/adops/docs-by-ad-server.md
@@ -0,0 +1,32 @@
+---
+layout: page
+title: Docs by Ad Server
+head_title: Docs by Ad Server
+description: Prebid implementation docs, broken out by Ad Server
+pid: 0
+top_nav_section: adops
+nav_section: reference
+---
+
+<div class="bs-docs-section" markdown="1">
+
+# Docs by Ad Server
+{:.no_toc}
+
+This page has all of our Ad Ops setup docs, broken out by ad server.
+
+For code samples and other on-page implementation docs, see [our docs for developers]({{site.github.url}}/dev-docs/getting-started.html).
+
+* TOC
+{:toc}
+
+{: .table .table-bordered .table-striped }
+| Server       | Page                                                                                                                                    |
+|--------------+-----------------------------------------------------------------------------------------------------------------------------------------|
+| **DFP**      | [Step by step guide to DFP setup]({{site.github.url}}/adops/step-by-step.html)                                                          |
+|              | [Send all bids to the ad server]({{site.github.url}}/adops/send-all-bids-adops.html)                                                    |
+|              | [Setting up Prebid for AMP in DFP]({{site.github.url}}/adops/setting-up-prebid-for-amp-in-dfp.html)                                     |
+|              | [Setting up Prebid Video in DFP]({{site.github.url}}/adops/setting-up-prebid-video-in-dfp.html)                                         |
+| **AppNexus** | [Setting up Prebid with the AppNexus Publisher Ad Server]({{site.github.url}}/adops/setting-up-prebid-with-the-appnexus-ad-server.html) |
+
+</div>
diff --git a/adops/setting-up-prebid-for-amp-in-dfp.md b/adops/setting-up-prebid-for-amp-in-dfp.md
@@ -9,6 +9,8 @@ top_nav_section: adops
 nav_section: tutorials
 ---
 
+<div class="bs-docs-section" markdown="1">
+
 # Setting up Prebid for AMP in DFP
 {: .no_toc}
 
@@ -89,3 +91,5 @@ Note that you can always get the latest version of the creative code below from
 
 + [Show Prebid Ads on AMP Pages]({{site.github.url}}/dev-docs/show-prebid-ads-on-amp-pages.html)
 + [How Prebid on AMP Works]({{site.github.url}}/dev-docs/how-prebid-on-amp-works.html)
+
+</div>
diff --git a/adops/setting-up-prebid-video-in-dfp.md b/adops/setting-up-prebid-video-in-dfp.md
@@ -9,6 +9,8 @@ top_nav_section: adops
 nav_section: tutorials
 ---
 
+<div class="bs-docs-section" markdown="1">
+
 # Setting up Prebid Video in DFP (Beta)
 {: .no_toc}
 
@@ -74,3 +76,5 @@ setups and DFP video ads.
 + [Add Key-Values to a Master Video Ad Tag](https://support.google.com/dfp_premium/answer/1080597)
 
 + [DFP Macros](https://support.google.com/dfp_premium/answer/1242718)
+
+</div>
diff --git a/adops/setting-up-prebid-with-the-appnexus-ad-server.md b/adops/setting-up-prebid-with-the-appnexus-ad-server.md
@@ -42,14 +42,14 @@ If you are only sending the winning bid to the ad server, set up your keys like
 | Key         | Value (string) |
 |-------------+----------------|
 | `hb_pb`     | `0.1`          |
-| `hb_bidder` | `"appnexus"`   |
+| `hb_bidder` | `"rubicon"`   |
 
-Otherwise, if you are [sending all bids to the ad server]({{site.github.url}}/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids), you'll have to create a key for each bidder (e.g., `hb_pb_appnexus`, `hb_pb_partner1`, `hb_pb_partner2`, etc.), and all of the price bucket values for that key.
+Otherwise, if you are [sending all bids to the ad server]({{site.github.url}}/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids), you'll have to create a key for each bidder (e.g., `hb_pb_rubicon`, `hb_pb_partner1`, `hb_pb_partner2`, etc.), and all of the price bucket values for that key.
 
 {: .table .table-bordered .table-striped }
 | Key              | Value (string) |
 |------------------+----------------|
-| `hb_pb_appnexus` | `0.1`          |
+| `hb_pb_rubicon` | `0.1`          |
 
 Depending on the price granularity you want, you may find one of the following CSV files helpful.  Each file has the buckets for that granularity level predefined.  You can avoid manually setting up key-value targeting by uploading the appropriate CSV file on the [key-values screen](https://wiki.appnexus.com/x/-PQdBQ):
 
@@ -79,7 +79,7 @@ Follow the creative setup instructions in [Add Creatives](https://wiki.appnexus.
 - The creative content should be the HTML and JavaScript shown below.
 
 {: .alert.alert-success :}
-If you are using "send all bids" mode, the macro in the call to `renderAd` below should match the header bidding partner associated with that creative, e.g., `'#{HB_ADID_APPNEXUS}'`, `'#{HB_ADID_PARTNER}'`, etc.
+If you are using "send all bids" mode, the macro in the call to `renderAd` below should match the header bidding partner associated with that creative, e.g., `'#{HB_ADID_RUBICON}'`, `'#{HB_ADID_PARTNER}'`, etc.
 
 {% highlight html %}
 <script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ @@
           </div>
           <p>
-            All demos, instructions, documentation and code included in Prebid.js or on the Prebid.org website are released under the <a href="{{site.licenseUrl}}" target="_blank">{{site.license}}</a>.
+            All demos, instructions, documentation and code included on the Prebid.org website are released under the <a href="{{site.licenseUrl}}" target="_blank">{{site.license}}</a>.
           </p>
           <p>
@@ Expand Down @@