Merge remote-tracking branch 'upstream/master'

_data/sidebar.yml

@@ -85,31 +85,39 @@
 
 - sbSecId: 0
   title: Contributing
-  link: /contributing/contribute.html
+  link: /policies/contribute.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 0
   title: Prebid.org IP Policy
-  link: /overview/ip-policy.html
+  link: /policies/ip-policy.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 0
   title: Privacy Policy
-  link: /privacy.html
+  link: /policies/privacy.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 2
+
+- sbSecId: 0
+  title: Antitrust Policy
+  link: /policies/antitrust.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 0
   title: Cookies
-  link: /cookies.html
+  link: /policies/cookies.html
   isHeader: 0
   isSectionHeader: 0
   subgroup: 2
@@ -146,7 +154,7 @@
   subgroup: 0
 
 - sbSecId: 1
-  title: Getting Started
+  title: Getting Started for Developers
   link: /dev-docs/getting-started.html
   isHeader: 0
   isSectionHeader: 0
@@ -210,6 +218,14 @@
   sectionTitle:
   subgroup: 1
 
+- sbSecId: 1
+  title: Running without an ad server
+  link: /dev-docs/examples/no-adserver.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 1
+
 - sbSecId: 1
   title: Legacy Browser Example
   link: /dev-docs/examples/legacy-browser-example.html
@@ -1324,63 +1340,56 @@
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Guide to Prebid in Ad Manager'
+  title: 'Line Item Setup'
   link: /adops/step-by-step.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Ad Manager Send All Bids'
-  link: /adops/send-all-bids-adops.html
+  title: 'Creative Setup: Banner/Outstream/AMP'
+  link: /adops/gam-creative-banner-sbs.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up for AMP in GAM'
-  link: /adops/setting-up-prebid-for-amp-in-dfp.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 2
-
-- sbSecId: 3
-  title: 'Setting up Multi-Format in GAM'
-  link: /adops/setting-up-prebid-multi-format-in-dfp.html
+  title: 'Creative Setup: Native'
+  link: /adops/gam-native.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up Native in GAM'
-  link: /adops/gam-native.html
+  title: 'Creative Setup: Video'
+  link: /adops/setting-up-prebid-video-in-dfp.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up Video in GAM'
-  link: /adops/setting-up-prebid-video-in-dfp.html
+  title: "Freewheel"
+  link:
   isHeader: 0
   isSectionHeader: 0
+  isCatHeader: 1
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up Long-Form Video in GAM'
-  link: /adops/setting-up-prebid-ott-video-in-gam.html
+  title: 'Setting up Long-Form Video'
+  link: /adops/setting-up-prebid-video-in-freewheel.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: "Freewheel"
+  title: "AppNexus Publisher"
   link:
   isHeader: 0
   isSectionHeader: 0
@@ -1389,15 +1398,15 @@
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up Long-Form Video'
-  link: /adops/setting-up-prebid-video-in-freewheel.html
+  title: 'Setting up Prebid'
+  link: /adops/setting-up-prebid-with-the-appnexus-ad-server.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: "AppNexus Publisher"
+  title: "Smart Ad Server"
   link:
   isHeader: 0
   isSectionHeader: 0
@@ -1407,14 +1416,14 @@
 
 - sbSecId: 3
   title: 'Setting up Prebid'
-  link: /adops/setting-up-prebid-with-the-appnexus-ad-server.html
+  link: /adops/setting-up-prebidjs-with-Smart-Ad-Server.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 2
 
 - sbSecId: 3
-  title: "Smart Ad Server"
+  title: "Other Ad Servers"
   link:
   isHeader: 0
   isSectionHeader: 0
@@ -1423,8 +1432,8 @@
   subgroup: 2
 
 - sbSecId: 3
-  title: 'Setting up Prebid'
-  link: /adops/setting-up-prebidjs-with-Smart-Ad-Server.html
+  title: 'General Ad Server Setup'
+  link: /adops/adops-general-sbs.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1455,14 +1464,6 @@
   sectionTitle:
   subgroup: 3
 
-- sbSecId: 3
-  title: Reduce Header Bidding Latency With Prebid.js
-  link: /overview/how-to-reduce-latency-of-header-bidding.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 3
-
 #--------------Prebid Video--------------|
 
 - sbSecId: 4
@@ -1804,14 +1805,6 @@
   sectionTitle:
   subgroup: 2
 
-- sbSecId: 4
-  title: 'Radiant'
-  link: /examples/video/outstream/pb-ve-outstream-radiant.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 2
-
 - sbSecId: 4
   title: 'No Server'
   link: /examples/video/outstream/pb-ve-outstream-no-server.html

_includes/adops/adops-creative-declaration.html

@@ -1,10 +1,9 @@
 As of August 2020, privacy regulations have changed such that new creatives entered
 in GAM may require a <a href="https://support.google.com/admanager/answer/9972771?hl=en">declaration of the ad technology provider</a>. The first step
 is to note the domain you serve the creative from. The examples above offer the
-use of the jsdelvr.com CDN. However, you may obtain the creative from a managed
+use of the jsdelvr CDN. However, you may obtain the creative from a managed
 service or you may host it yourself. If you receive a warning from ad manager
 about "declaring self-created ad technology", you should be able to work around
-this by editing the creative and filling out the "Associated Ad Technology Provid
-ers" section as shown in this screen capture:
+this by editing the creative and filling out the "Associated ad technology providers" section as shown in this screen capture:
 
 <p><img src="/assets/images/ad-ops/dfp-creative-setup/dfp-creative-declaration.png" alt="Creative Declaration" class="pb-lg-img" /></p>