Update to support dark mode CSS.

Update documentation files.

81 files changed, 586 insertions, 4782 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index f78d30ce1..f423caabf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,122 +1,242 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    colorator (0.1)
-    ethon (0.9.0)
+    coffee-script-source (1.11.1)
+    colorator (1.1.0)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
+    concurrent-ruby (1.1.3)
+    dnsruby (1.61.2)
+      addressable (~> 2.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    ethon (0.11.0)
       ffi (>= 1.3.0)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.9.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    gemoji (2.1.0)
-    github-pages (83)
-      github-pages-health-check (= 1.1.0)
-      jekyll (= 3.1.6)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.5.1)
-      jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.0.0)
-      jekyll-mentions (= 1.1.2)
+    ffi (1.9.25)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.0)
+    github-pages (193)
+      activesupport (= 4.2.10)
+      github-pages-health-check (= 1.8.1)
+      jekyll (= 3.7.4)
+      jekyll-avatar (= 0.6.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.11.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.9.4)
+      jekyll-mentions (= 1.4.1)
+      jekyll-optional-front-matter (= 0.3.0)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.10.0)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 2.0.0)
-      jekyll-sitemap (= 0.10.0)
-      jemoji (= 0.6.2)
-      kramdown (= 1.11.1)
-      liquid (= 3.0.6)
-      listen (= 3.0.6)
+      jekyll-readme-index (= 0.2.0)
+      jekyll-redirect-from (= 0.14.0)
+      jekyll-relative-links (= 0.5.3)
+      jekyll-remote-theme (= 0.3.1)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.5.0)
+      jekyll-sitemap (= 1.2.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-leap-day (= 0.1.1)
+      jekyll-theme-merlot (= 0.1.1)
+      jekyll-theme-midnight (= 0.1.1)
+      jekyll-theme-minimal (= 0.1.1)
+      jekyll-theme-modernist (= 0.1.1)
+      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-slate (= 0.1.1)
+      jekyll-theme-tactile (= 0.1.1)
+      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-titles-from-headings (= 0.5.1)
+      jemoji (= 0.10.1)
+      kramdown (= 1.17.0)
+      liquid (= 4.0.0)
+      listen (= 3.1.5)
       mercenary (~> 0.3)
-      rouge (= 1.10.1)
+      minima (= 2.5.0)
+      nokogiri (>= 1.8.2, < 2.0)
+      rouge (= 2.2.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.1.0)
+    github-pages-health-check (1.8.1)
       addressable (~> 2.3)
-      net-dns (~> 0.8)
+      dnsruby (~> 1.60)
       octokit (~> 4.0)
-      public_suffix (~> 1.4)
-      typhoeus (~> 0.7)
-    html-pipeline (2.4.1)
-      activesupport (>= 2, < 5)
+      public_suffix (~> 2.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.9.1)
+      activesupport (>= 2)
       nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.1.6)
-      colorator (~> 0.1)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.7.4)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
-      rouge (~> 1.7)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-coffeescript (1.0.1)
+    jekyll-avatar (0.6.0)
+      jekyll (~> 3.0)
+    jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.5.1)
-    jekyll-gist (1.4.0)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.2.0)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.0, < 4.0)
+    jekyll-commonmark-ghpages (0.1.5)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1)
+      rouge (~> 2)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.11.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.0.0)
+    jekyll-github-metadata (2.9.4)
       jekyll (~> 3.1)
-      octokit (~> 4.0)
-    jekyll-mentions (1.1.2)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.4.1)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.3.0)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.10.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (2.0.0)
-      jekyll (~> 3.1)
-    jekyll-sitemap (0.10.0)
-    jekyll-watch (1.4.0)
-      listen (~> 3.0, < 3.1)
-    jemoji (0.6.2)
-      gemoji (~> 2.0)
+    jekyll-readme-index (0.2.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.14.0)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.5.3)
+      jekyll (~> 3.3)
+    jekyll-remote-theme (0.3.1)
+      jekyll (~> 3.5)
+      rubyzip (>= 1.2.1, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.5.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.2.0)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.5.3)
+      jekyll (~> 3.5)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
+    jekyll-watch (2.1.2)
+      listen (~> 3.0)
+    jemoji (0.10.1)
+      gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (>= 3.0)
-    json (1.8.3)
-    kramdown (1.11.1)
-    liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+      jekyll (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    mini_portile2 (2.3.0)
+    minima (2.5.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.11.3)
     multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    pkg-config (1.1.7)
-    public_suffix (1.5.3)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rouge (1.10.1)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (2.2.1)
+    ruby-enum (0.7.2)
+      i18n
+    ruby_dep (1.5.0)
+    rubyzip (1.2.2)
     safe_yaml (1.0.4)
-    sass (3.4.22)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    terminal-table (1.6.0)
-    thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    sass (3.7.2)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -125,4 +245,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   1.10.6
+   1.16.0
diff --git a/css/cups.css b/css/cups.css
index 15f143770..983de2b5c 100644
--- a/css/cups.css
+++ b/css/cups.css
@@ -382,6 +382,26 @@ div.body dd {
   margin-bottom: 0.5em;
 }
 
+/* Dark mode overrides */
+@media (prefers-color-scheme: dark) {
+  body {
+    background: black;
+    color: #eee;
+  }
+  A:link, A:link:visited, A:visited, A:link:hover, A:visited:hover {
+    color: #327DCC;
+    text-decoration: underline;
+  }
+  PRE {
+    background: #333;
+    border-left-color: #666;
+    color: #ccc;
+  }
+  DIV.table TABLE TH {
+    background: #333;
+  }
+}
+
 /* iPhone/iPod touch overrides */
 @media only screen and (min-device-width: 320px) and (max-device-width: 480px),
        only screen and (min-device-width: 320px) and (max-device-width: 568px) {
diff --git a/doc/accounting.html b/doc/accounting.html
index ea37a556d..a0ad0563d 100644
--- a/doc/accounting.html
+++ b/doc/accounting.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Printer Accounting Basics</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Printer Accounting Basics
+layout: sub
+---
 
 <H1 CLASS="title">Printer Accounting Basics</H1>
 
@@ -50,6 +47,3 @@ can be used to easily determine that information.</P>
 <H2 CLASS="title"><A NAME="PAGELOG">Page Logging</A></H2>
 
 <P>CUPS can log every page that is printed on a system to the <VAR><A HREF="man-cupsd-logs.html">page_log</A></VAR> file. Page logging must be enabled by setting the <CODE>PageLogFormat</CODE> directive in the <VAR><A HREF="man-cupsd.conf.html">cupsd.conf</A></VAR> file and is only available for drivers that provide page accounting information, typically all PostScript and CUPS raster devices. Raw queues and queues using third-party solutions such as Foomatic generally do not have useful page accounting information available.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/admin.html b/doc/admin.html
index 47fee815d..e98b5e66a 100644
--- a/doc/admin.html
+++ b/doc/admin.html
@@ -1,11 +1,8 @@
-<!DOCTYPE html>
-<html>
-  <!-- SECTION: Getting Started -->
-  <head>
-    <title>Command-Line Printer Administration</title>
-    <link rel="stylesheet" type="text/css" href="../cups-printable.css">
-  </head>
-  <body>
+---
+title: Command-Line Printer Administration
+layout: sub
+---
+
     <h1 class="title">Command-Line Printer Administration</h1>
 
     <p>This help document describes how to configure and manage destinations with CUPS.</p>
@@ -210,5 +207,3 @@ lpadmin -p bar -o printer-is-shared=true</pre>
     <p>To disable debug logging, run the same command with the <code>--no-debug-logging</code> option:</p>
 
     <pre class="command">cupsctl --no-debug-logging</pre>
-  </body>
-</html>
diff --git a/doc/api-admin.html b/doc/api-admin.html
index e5ae81819..896841d8b 100644
--- a/doc/api-admin.html
+++ b/doc/api-admin.html
@@ -1,452 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Administration APIs</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  Administrative API header for CUPS.
-
-  Copyright © 2016 by Apple Inc.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: Administrative APIs
+layout: sub
+---
 
 <h1 class='title'>Administrative APIs</h1>
 
@@ -697,5 +252,3 @@ being provided by the <a href="#cupsEnumDests"><code>cupsEnumDests</code></a> an
 typedef void (*cups_device_cb_t)(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, void *user_data);
 </p>
     </div>
-  </body>
-</html>
diff --git a/doc/api-filter.html b/doc/api-filter.html
index 299e5e1d2..092163ecf 100644
--- a/doc/api-filter.html
+++ b/doc/api-filter.html
@@ -1,452 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Filter and Backend Programming</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  Filter and backend programming header for CUPS.
-
-  Copyright © 2008-2016 by Apple Inc.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: Filter and Backend Programming
+layout: sub
+---
 
 <h1 class='title'>Filter and Backend Programming</h1>
 
@@ -1746,5 +1301,3 @@ typedef void (*cups_sc_walk_func_t)(const char *oid, const char *data, int datal
         <tr><th>CUPS_SC_STATUS_TOO_BIG </th>        <td class="description">Response too big</td></tr>
 </tbody></table>
     </div>
-  </body>
-</html>
diff --git a/doc/api-ppd.html b/doc/api-ppd.html
index f90465553..f785d1058 100644
--- a/doc/api-ppd.html
+++ b/doc/api-ppd.html
@@ -1,452 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>PPD API (DEPRECATED)</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  PPD API header for CUPS.
-
-  Copyright © 2008-2012 by Apple Inc.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: PPD API (DEPRECATED)
+layout: sub
+---
 
 <h1 class='title'>PPD API (DEPRECATED)</h1>
 
@@ -2119,5 +1674,3 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <tr><th>PPD_UI_PICKONE </th>        <td class="description">Pick one from a list</td></tr>
 </tbody></table>
     </div>
-  </body>
-</html>
diff --git a/doc/api-raster.html b/doc/api-raster.html
index 706cbd56c..b40179b15 100644
--- a/doc/api-raster.html
+++ b/doc/api-raster.html
@@ -1,452 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Raster API</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  Raster API documentation for CUPS.
-
-  Copyright © 2008-2010 by Apple Inc.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: Raster API
+layout: sub
+---
 
 <h1 class='title'>Raster API</h1>
 
@@ -1420,5 +975,3 @@ factor not applied) </td></tr>
         <tr><th>CUPS_ORIENT_90 </th>        <td class="description">Rotate the page counter-clockwise</td></tr>
 </tbody></table>
     </div>
-  </body>
-</html>
diff --git a/doc/cgi.html b/doc/cgi.html
index 34c6debb3..82d0c0f96 100644
--- a/doc/cgi.html
+++ b/doc/cgi.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Using CGI Programs</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Using CGI Programs
+layout: sub
+---
 
 <H1 CLASS="title">Using CGI Programs</H1>
 
@@ -77,6 +74,3 @@ following exceptions:</P>
 	<LI>Limited HTTP field support; only the Content-Length (CONTENT_LENGTH), Content-Type (CONTENT_TYPE), Cookie (HTTP_COOKIE), Referrer (HTTP_REFERRER), and User-Agent (HTTP_USER_AGENT) fields are placed in environment variables at this time</LI>
 
 </UL>
-
-</BODY>
-</HTML>
diff --git a/doc/cupspm.html b/doc/cupspm.html
index 982643b20..cc35ed599 100644
--- a/doc/cupspm.html
+++ b/doc/cupspm.html
@@ -1,177 +1,8 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>CUPS Programming Manual</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Michael R Sweet">
-    <meta name="copyright" content="Copyright &#xa9; 2007-2018 by Apple Inc. All Rights Reserved.">
-    <meta name="version" content="2.3.0">
-    <style type="text/css"><!--
-body, p, h1, h2, h3, h4 {
-  font-family: sans-serif;
-}
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
+---
+title: CUPS Programming Manual
+layout: sub
+---
+
     <h1 class="title">CUPS Programming Manual</h1>
     <p>Michael R Sweet</p>
     <p>Copyright &#xa9; 2007-2018 by Apple Inc. All Rights Reserved.</p>
@@ -6593,5 +6424,3 @@ are server-oriented...</p>
         <tr><th>IPP_TAG_ZERO </th>        <td class="description">Zero tag - used for separators</td></tr>
 </tbody></table>
     </div>
-  </body>
-</html>
diff --git a/doc/encryption.html b/doc/encryption.html
index 55f4eaf6f..007a25745 100644
--- a/doc/encryption.html
+++ b/doc/encryption.html
@@ -1,11 +1,8 @@
-<!doctype html>
-<html>
-<!-- SECTION: Getting Started -->
-  <head>
-    <title>Managing Encryption</title>
-    <link rel="STYLESHEET" type="text/css" href="../cups-printable.css">
-  </head>
-  <body>
+---
+title: Managing Encryption
+layout: sub
+---
+
     <h1 class="title">Managing Encryption</h1>
     <p>CUPS supports TLS encryption in two ways:</p>
     <ol>
@@ -51,5 +48,3 @@ SSLOptions AllowRC4 AllowSSL3
     <h3>Other Platforms</h3>
     <p>Other platforms only use the <var>client.conf</var> file and PEM-encoded certificates (<i>hostname</i>.crt) and private keys (<i>hostname</i>.key) in the <var>/etc/cups/ssl</var> and <var>~/.cups/ssl</var> directories. If present, the <var>/etc/cups/ssl/site.crt</var> file defines a site-wide CA certificate that is used to validate server and printer certificates. Certificates for known servers and printers are stored by CUPS in the corresponding <var>ssl</var> directory so they can be validated for subsequent connections.</p>
     <p>CUPS also supports certificates created and managed by the popular <a href="https://letsencrypt.org/">Let's Encrypt</a> certificate service, which are stored in the <var>/etc/letsencrypt/live</var> directory.</p>
-  </body>
-</html>
diff --git a/doc/firewalls.html b/doc/firewalls.html
index 34f14cd21..f41148dd2 100644
--- a/doc/firewalls.html
+++ b/doc/firewalls.html
@@ -1,11 +1,8 @@
-<!DOCTYPE html>
-<html>
-<!-- SECTION: Getting Started -->
-  <head>
-    <title>Firewalls</title>
-    <link rel="stylesheet" type="text/css" href="../cups-printable.css">
-  </head>
-  <body>
+---
+title: Firewalls
+layout: sub
+---
+
     <h1 class="title">Firewalls</h1>
 
     <p>This help document describes the ports that CUPS uses so that firewall administrators can allow traffic used for printing.</p>
@@ -70,5 +67,3 @@
         <tr><td>9100-9102</td><td>TCP</td><td>Raw print data stream (AppSocket/JetDirect).</td></tr>
       </tbody>
     </table></div>
-  </body>
-</html>
diff --git a/doc/glossary.html b/doc/glossary.html
index 6bd6137c9..fa7241100 100644
--- a/doc/glossary.html
+++ b/doc/glossary.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Glossary</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Glossary
+layout: sub
+---
 
 <H1 CLASS="title">Glossary</H1>
 
@@ -211,6 +208,3 @@
 	<DD>Unicode Transfer Format 8-Bit
 
 </DL>
-
-</BODY>
-</HTML>
diff --git a/doc/kerberos.html b/doc/kerberos.html
index 9d5a9ee24..2f5ed2ebe 100644
--- a/doc/kerberos.html
+++ b/doc/kerberos.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Using Kerberos Authentication</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Using Kerberos Authentication
+layout: sub
+---
 
 <H1 CLASS="title">Using Kerberos Authentication</H1>
 
@@ -82,6 +79,3 @@ http://server.example.com:631/admin
 <P>When doing printing tasks that require authentication, CUPS requests single-use "tickets" from your login session to authenticate who you are. These tickets give CUPS a username of the form "user@REALM", which is then truncated to just "user" for purposes of user and group checks.</P>
 
 <P>In order to support printing to a shared printer, CUPS runs the IPP or SMB backend as the owner of the print job so it can obtain the necessary credentials when the job is de-spooled to the server.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/license.html b/doc/license.html
index 9c98b279a..19023e12c 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Apache License Version 2.0</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Apache License Version 2.0
+layout: sub
+---
 
 <h1>Apache License</h1>
 
@@ -186,6 +183,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 </pre>
-
-</BODY>
-</HTML>
diff --git a/doc/man-backend.html b/doc/man-backend.html
index c2c75ae91..12356c4bc 100644
--- a/doc/man-backend.html
+++ b/doc/man-backend.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>backend(7)</title>
-</head>
-<body>
+---
+title: backend(7)
+layout: sub
+---
+
 <h1 class="title">backend(7)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 backend - cups backend transmission interfaces
@@ -174,6 +171,3 @@ for more information.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cancel.html b/doc/man-cancel.html
index 8048ce9d3..7c5cb0400 100644
--- a/doc/man-cancel.html
+++ b/doc/man-cancel.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cancel(1)</title>
-</head>
-<body>
+---
+title: cancel(1)
+layout: sub
+---
+
 <h1 class="title">cancel(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cancel - cancel jobs
@@ -84,6 +81,3 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the <i>-
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-classes.conf.html b/doc/man-classes.conf.html
index d3be116c3..5c2965538 100644
--- a/doc/man-classes.conf.html
+++ b/doc/man-classes.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>classes.conf(5)</title>
-</head>
-<body>
+---
+title: classes.conf(5)
+layout: sub
+---
+
 <h1 class="title">classes.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 classes.conf - class configuration file for cups
@@ -25,6 +22,3 @@ The name, location, and format of this file are an implementation detail that wi
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-client.conf.html b/doc/man-client.conf.html
index 879213735..6c52effd8 100644
--- a/doc/man-client.conf.html
+++ b/doc/man-client.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>client.conf(5)</title>
-</head>
-<body>
+---
+title: client.conf(5)
+layout: sub
+---
+
 <h1 class="title">client.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 client.conf - client configuration file for cups
@@ -83,6 +80,3 @@ On Linux and other systems using GNU TLS, the <i>/etc/cups/ssl/site.crl</i> file
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups-config.html b/doc/man-cups-config.html
index 821ade723..8927484ad 100644
--- a/doc/man-cups-config.html
+++ b/doc/man-cups-config.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cups-config(1)</title>
-</head>
-<body>
+---
+title: cups-config(1)
+layout: sub
+---
+
 <h1 class="title">cups-config(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cups-config - get cups api, compiler, directory, and link information.
@@ -95,6 +92,3 @@ Compile a simple one-file CUPS filter:
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups-files.conf.html b/doc/man-cups-files.conf.html
index bc2900777..894c67d04 100644
--- a/doc/man-cups-files.conf.html
+++ b/doc/man-cups-files.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cups-files.conf(5)</title>
-</head>
-<body>
+---
+title: cups-files.conf(5)
+layout: sub
+---
+
 <h1 class="title">cups-files.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cups-files.conf - file and directory configuration file for cups
@@ -210,6 +207,3 @@ command is used instead.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups-lpd.html b/doc/man-cups-lpd.html
index 97ad2d34d..8c0f335b5 100644
--- a/doc/man-cups-lpd.html
+++ b/doc/man-cups-lpd.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cups-lpd(8)</title>
-</head>
-<body>
+---
+title: cups-lpd(8)
+layout: sub
+---
+
 <h1 class="title">cups-lpd(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cups-lpd - receive print jobs and report printer status to lpd clients
@@ -109,6 +106,3 @@ CUPS Online Help (<a href="http://localhost:631/help)">http://localhost:631/help
 RFC 2569
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups-snmp.conf.html b/doc/man-cups-snmp.conf.html
index 72f1067c7..fde2c01e1 100644
--- a/doc/man-cups-snmp.conf.html
+++ b/doc/man-cups-snmp.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>snmp.conf(5)</title>
-</head>
-<body>
+---
+title: snmp.conf(5)
+layout: sub
+---
+
 <h1 class="title">snmp.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 snmp.conf - snmp configuration file for cups
@@ -51,6 +48,3 @@ The default is 120 seconds (2 minutes).
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups-snmp.html b/doc/man-cups-snmp.html
index fdb4721f8..189467e12 100644
--- a/doc/man-cups-snmp.html
+++ b/doc/man-cups-snmp.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cups-snmp(8)</title>
-</head>
-<body>
+---
+title: cups-snmp(8)
+layout: sub
+---
+
 <h1 class="title">cups-snmp(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 snmp - cups snmp backend
@@ -52,6 +49,3 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cups.html b/doc/man-cups.html
index 458980b8e..175d22fd3 100644
--- a/doc/man-cups.html
+++ b/doc/man-cups.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cups(1)</title>
-</head>
-<body>
+---
+title: cups(1)
+layout: sub
+---
+
 <h1 class="title">cups(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cups - a standards-based, open source printing system
@@ -114,6 +111,3 @@ CUPS Web Site (<a href="http://www.CUPS.org)">http://www.CUPS.org)</a>,
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsaccept.html b/doc/man-cupsaccept.html
index 89b9aec82..989ce36b8 100644
--- a/doc/man-cupsaccept.html
+++ b/doc/man-cupsaccept.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsaccept(8)</title>
-</head>
-<body>
+---
+title: cupsaccept(8)
+layout: sub
+---
+
 <h1 class="title">cupsaccept(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsaccept/cupsreject - accept/reject jobs sent to a destination
@@ -79,6 +76,3 @@ Also, printer and class names are <i>not</i> case-sensitive.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsctl.html b/doc/man-cupsctl.html
index fab73129c..15c2e95c0 100644
--- a/doc/man-cupsctl.html
+++ b/doc/man-cupsctl.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsctl(8)</title>
-</head>
-<body>
+---
+title: cupsctl(8)
+layout: sub
+---
+
 <h1 class="title">cupsctl(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsctl - configure cupsd.conf options
@@ -89,6 +86,3 @@ You cannot set the Listen or Port directives using <b>cupsctl</b>.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsd-helper.html b/doc/man-cupsd-helper.html
index afb16cc49..0cee81143 100644
--- a/doc/man-cupsd-helper.html
+++ b/doc/man-cupsd-helper.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsd-helper(8)</title>
-</head>
-<body>
+---
+title: cupsd-helper(8)
+layout: sub
+---
+
 <h1 class="title">cupsd-helper(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd-helper - cupsd helper programs
@@ -79,6 +76,3 @@ archives to further reduce their size.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsd-logs.html b/doc/man-cupsd-logs.html
index e90dd405b..956ea0a8a 100644
--- a/doc/man-cupsd-logs.html
+++ b/doc/man-cupsd-logs.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsd-logs(5)</title>
-</head>
-<body>
+---
+title: cupsd-logs(5)
+layout: sub
+---
+
 <h1 class="title">cupsd-logs(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd-logs - cupsd log files (access_log, error_log, and page_log)
@@ -179,6 +176,3 @@ The format of this field is identical to the data-time field in the <i>access_lo
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsd.conf.html b/doc/man-cupsd.conf.html
index b1b0ac0b5..0e8be938f 100644
--- a/doc/man-cupsd.conf.html
+++ b/doc/man-cupsd.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsd.conf(5)</title>
-</head>
-<body>
+---
+title: cupsd.conf(5)
+layout: sub
+---
+
 <h1 class="title">cupsd.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd.conf - server configuration file for cups
@@ -620,6 +617,3 @@ Require authentication for accesses from outside the 10. network:
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsd.html b/doc/man-cupsd.html
index 90cc08374..8d2662384 100644
--- a/doc/man-cupsd.html
+++ b/doc/man-cupsd.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsd(8)</title>
-</head>
-<body>
+---
+title: cupsd(8)
+layout: sub
+---
+
 <h1 class="title">cupsd(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd - cups scheduler
@@ -118,6 +115,3 @@ in the foreground with a test configuration file called
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsenable.html b/doc/man-cupsenable.html
index 4511b246e..e9f3cd769 100644
--- a/doc/man-cupsenable.html
+++ b/doc/man-cupsenable.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsenable(8)</title>
-</head>
-<body>
+---
+title: cupsenable(8)
+layout: sub
+---
+
 <h1 class="title">cupsenable(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsdisable, cupsenable - stop/start printers and classes
@@ -87,6 +84,3 @@ This differs from the System V versions which require the root user to execute t
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupsfilter.html b/doc/man-cupsfilter.html
index cf61739b5..23781dc7a 100644
--- a/doc/man-cupsfilter.html
+++ b/doc/man-cupsfilter.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupsfilter(8)</title>
-</head>
-<body>
+---
+title: cupsfilter(8)
+layout: sub
+---
+
 <h1 class="title">cupsfilter(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsfilter - convert a file to another format using cups filters
@@ -121,6 +118,3 @@ The following command will generate a PDF preview of job 42 for a printer named
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-cupstestppd.html b/doc/man-cupstestppd.html
index 7287079b4..6bd6ce805 100644
--- a/doc/man-cupstestppd.html
+++ b/doc/man-cupstestppd.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>cupstestppd(1)</title>
-</head>
-<body>
+---
+title: cupstestppd(1)
+layout: sub
+---
+
 <h1 class="title">cupstestppd(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupstestppd - test conformance of ppd files
@@ -122,6 +119,3 @@ CUPS Online Help (<a href="http://localhost:631/help)">http://localhost:631/help
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-filter.html b/doc/man-filter.html
index 229e29eb3..a250ad831 100644
--- a/doc/man-filter.html
+++ b/doc/man-filter.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>filter(7)</title>
-</head>
-<body>
+---
+title: filter(7)
+layout: sub
+---
+
 <h1 class="title">filter(7)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 filter - cups file conversion filter interface
@@ -181,6 +178,3 @@ program to use the appropriate filters to do the conversions you need.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ippfind.html b/doc/man-ippfind.html
index 2e2ebb1e9..7e9af191a 100644
--- a/doc/man-ippfind.html
+++ b/doc/man-ippfind.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ippfind(1)</title>
-</head>
-<body>
+---
+title: ippfind(1)
+layout: sub
+---
+
 <h1 class="title">ippfind(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ippfind - find internet printing protocol printers
@@ -202,6 +199,3 @@ Similarly, to send a PostScript test page to every PostScript printer, run:
 <a href="man-ipptool.html?TOPIC=Man+Pages"><b>ipptool</b>(1)</a>
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2013-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ipptool.html b/doc/man-ipptool.html
index a19d1b202..f4877288c 100644
--- a/doc/man-ipptool.html
+++ b/doc/man-ipptool.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ipptool(1)</title>
-</head>
-<body>
+---
+title: ipptool(1)
+layout: sub
+---
+
 <h1 class="title">ipptool(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ipptool - perform internet printing protocol requests
@@ -226,6 +223,3 @@ PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http:
 RFC 8011 (<a href="http://tools.ietf.org/html/rfc8011)">http://tools.ietf.org/html/rfc8011)</a>,
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ipptoolfile.html b/doc/man-ipptoolfile.html
index 8f2e65177..4b6dc3225 100644
--- a/doc/man-ipptoolfile.html
+++ b/doc/man-ipptoolfile.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ipptoolfile(5)</title>
-</head>
-<body>
+---
+title: ipptoolfile(5)
+layout: sub
+---
+
 <h1 class="title">ipptoolfile(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ipptoolfile - ipptool file format
@@ -533,6 +530,3 @@ PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp)">http
 RFC 8011 (<a href="http://tools.ietf.org/html/rfc8011">http://tools.ietf.org/html/rfc8011</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lp.html b/doc/man-lp.html
index b79136137..003ffd1ea 100644
--- a/doc/man-lp.html
+++ b/doc/man-lp.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lp(1)</title>
-</head>
-<body>
+---
+title: lp(1)
+layout: sub
+---
+
 <h1 class="title">lp(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lp - print files
@@ -198,6 +195,3 @@ Print a presentation document 2-up to a printer called "bar":
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpadmin.html b/doc/man-lpadmin.html
index c7658f21b..f15fcf427 100644
--- a/doc/man-lpadmin.html
+++ b/doc/man-lpadmin.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpadmin(8)</title>
-</head>
-<body>
+---
+title: lpadmin(8)
+layout: sub
+---
+
 <h1 class="title">lpadmin(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpadmin - configure cups printers and classes
@@ -190,6 +187,3 @@ Create an IPP Everywhere print queue:
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpc.html b/doc/man-lpc.html
index cddf8c447..7a97f3a78 100644
--- a/doc/man-lpc.html
+++ b/doc/man-lpc.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpc(8)</title>
-</head>
-<body>
+---
+title: lpc(8)
+layout: sub
+---
+
 <h1 class="title">lpc(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpc - line printer control program
@@ -49,6 +46,3 @@ command or another CUPS-compatible client with that functionality.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpinfo.html b/doc/man-lpinfo.html
index 8ed50e16c..2b1a39334 100644
--- a/doc/man-lpinfo.html
+++ b/doc/man-lpinfo.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpinfo(8)</title>
-</head>
-<body>
+---
+title: lpinfo(8)
+layout: sub
+---
+
 <h1 class="title">lpinfo(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpinfo - show available devices or drivers
@@ -110,6 +107,3 @@ List drivers matching "HP LaserJet":
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpmove.html b/doc/man-lpmove.html
index 228afb97d..39da31dbe 100644
--- a/doc/man-lpmove.html
+++ b/doc/man-lpmove.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpmove(8)</title>
-</head>
-<body>
+---
+title: lpmove(8)
+layout: sub
+---
+
 <h1 class="title">lpmove(8)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpmove - move a job or all jobs to a new destination
@@ -70,6 +67,3 @@ Move all jobs from "oldprinter" to "newprinter":
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpoptions.html b/doc/man-lpoptions.html
index e8213c43b..69a64e908 100644
--- a/doc/man-lpoptions.html
+++ b/doc/man-lpoptions.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpoptions(1)</title>
-</head>
-<body>
+---
+title: lpoptions(1)
+layout: sub
+---
+
 <h1 class="title">lpoptions(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpoptions - display or set printer options and defaults
@@ -106,6 +103,3 @@ The <b>lpoptions</b> command is unique to CUPS.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpq.html b/doc/man-lpq.html
index ecba7ee4c..90538cdb9 100644
--- a/doc/man-lpq.html
+++ b/doc/man-lpq.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpq(1)</title>
-</head>
-<body>
+---
+title: lpq(1)
+layout: sub
+---
+
 <h1 class="title">lpq(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpq - show printer queue status
@@ -56,6 +53,3 @@ Jobs queued on the default destination will be shown if no printer or class is s
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpr.html b/doc/man-lpr.html
index 9d1541465..160b3839f 100644
--- a/doc/man-lpr.html
+++ b/doc/man-lpr.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpr(1)</title>
-</head>
-<body>
+---
+title: lpr(1)
+layout: sub
+---
+
 <h1 class="title">lpr(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpr - print files
@@ -155,6 +152,3 @@ Print a presentation document 2-up to a printer called "foo":
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lprm.html b/doc/man-lprm.html
index 25f801749..eb33a4bc4 100644
--- a/doc/man-lprm.html
+++ b/doc/man-lprm.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lprm(1)</title>
-</head>
-<body>
+---
+title: lprm(1)
+layout: sub
+---
+
 <h1 class="title">lprm(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lprm - cancel print jobs
@@ -77,6 +74,3 @@ Cancel all jobs:
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-lpstat.html b/doc/man-lpstat.html
index 876de1f2d..cfefdd2c7 100644
--- a/doc/man-lpstat.html
+++ b/doc/man-lpstat.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>lpstat(1)</title>
-</head>
-<body>
+---
+title: lpstat(1)
+layout: sub
+---
+
 <h1 class="title">lpstat(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 lpstat - print cups status information
@@ -128,6 +125,3 @@ Also, printer and class names are <i>not</i> case-sensitive.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-mailto.conf.html b/doc/man-mailto.conf.html
index ddfb2753e..7a0f561a8 100644
--- a/doc/man-mailto.conf.html
+++ b/doc/man-mailto.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>mailto.conf(5)</title>
-</head>
-<body>
+---
+title: mailto.conf(5)
+layout: sub
+---
+
 <h1 class="title">mailto.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 mailto.conf - configuration file for cups email notifier
@@ -37,6 +34,3 @@ If multiple lines are present, only the last one is used.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-mime.convs.html b/doc/man-mime.convs.html
index 2228aaccb..2894ad393 100644
--- a/doc/man-mime.convs.html
+++ b/doc/man-mime.convs.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>mime.convs(5)</title>
-</head>
-<body>
+---
+title: mime.convs(5)
+layout: sub
+---
+
 <h1 class="title">mime.convs(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 mime.convs - mime type conversion file for cups
@@ -50,6 +47,3 @@ Define a filter that converts PostScript documents to CUPS Raster format:
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-mime.types.html b/doc/man-mime.types.html
index 290dfa7b0..d151adda2 100644
--- a/doc/man-mime.types.html
+++ b/doc/man-mime.types.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>mime.types(5)</title>
-</head>
-<body>
+---
+title: mime.types(5)
+layout: sub
+---
+
 <h1 class="title">mime.types(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 mime.types - mime type description file for cups
@@ -92,6 +89,3 @@ Define two MIME media types for raster data, with one being a subset with higher
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-notifier.html b/doc/man-notifier.html
index 08353d032..d4d26ff83 100644
--- a/doc/man-notifier.html
+++ b/doc/man-notifier.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>notifier(7)</title>
-</head>
-<body>
+---
+title: notifier(7)
+layout: sub
+---
+
 <h1 class="title">notifier(7)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 notifier - cups notification interface
@@ -32,6 +29,3 @@ Notifiers inherit the environment and can use the logging mechanism documented i
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdc.html b/doc/man-ppdc.html
index 725574858..d51951b55 100644
--- a/doc/man-ppdc.html
+++ b/doc/man-ppdc.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdc(1)</title>
-</head>
-<body>
+---
+title: ppdc(1)
+layout: sub
+---
+
 <h1 class="title">ppdc(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdc - cups ppd compiler (deprecated)
@@ -86,6 +83,3 @@ The default is to use the line feed character alone.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdcfile.html b/doc/man-ppdcfile.html
index f6ddef6b1..afe2a3cda 100644
--- a/doc/man-ppdcfile.html
+++ b/doc/man-ppdcfile.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdcfile(5)</title>
-</head>
-<body>
+---
+title: ppdcfile(5)
+layout: sub
+---
+
 <h1 class="title">ppdcfile(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdcfile - cups ppd compiler source file format
@@ -90,6 +87,3 @@ This man page provides a quick reference to the supported keywords and should be
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdhtml.html b/doc/man-ppdhtml.html
index aa76ff7b2..e15a03179 100644
--- a/doc/man-ppdhtml.html
+++ b/doc/man-ppdhtml.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdhtml(1)</title>
-</head>
-<body>
+---
+title: ppdhtml(1)
+layout: sub
+---
+
 <h1 class="title">ppdhtml(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdhtml - cups html summary generator (deprecated)
@@ -40,6 +37,3 @@ Multiple <i>-I</i> options can be supplied to add additional directories.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdi.html b/doc/man-ppdi.html
index 0c83f630e..796e744b9 100644
--- a/doc/man-ppdi.html
+++ b/doc/man-ppdi.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdi(1)</title>
-</head>
-<body>
+---
+title: ppdi(1)
+layout: sub
+---
+
 <h1 class="title">ppdi(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdi - import ppd files (deprecated)
@@ -47,6 +44,3 @@ If no source file is specified, the filename <i>ppdi.drv</i> is used.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdmerge.html b/doc/man-ppdmerge.html
index e88435c40..a3740701d 100644
--- a/doc/man-ppdmerge.html
+++ b/doc/man-ppdmerge.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdmerge(1)</title>
-</head>
-<body>
+---
+title: ppdmerge(1)
+layout: sub
+---
+
 <h1 class="title">ppdmerge(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdmerge - merge ppd files (deprecated)
@@ -44,6 +41,3 @@ Merging of different device PPDs will yield unpredictable results.
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-ppdpo.html b/doc/man-ppdpo.html
index 034563775..fa7b587dd 100644
--- a/doc/man-ppdpo.html
+++ b/doc/man-ppdpo.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>ppdpo(1)</title>
-</head>
-<body>
+---
+title: ppdpo(1)
+layout: sub
+---
+
 <h1 class="title">ppdpo(1)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 ppdpo - ppd message catalog generator (deprecated)
@@ -46,6 +43,3 @@ The supported extensions are <i>.po</i> or <i>.po.gz</i> for GNU gettext format
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-printers.conf.html b/doc/man-printers.conf.html
index 7b60a8cbe..a5ca02fa1 100644
--- a/doc/man-printers.conf.html
+++ b/doc/man-printers.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>printers.conf(5)</title>
-</head>
-<body>
+---
+title: printers.conf(5)
+layout: sub
+---
+
 <h1 class="title">printers.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 printers.conf - printer configuration file for cups
@@ -25,6 +22,3 @@ The name, location, and format of this file are an implementation detail that wi
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/man-subscriptions.conf.html b/doc/man-subscriptions.conf.html
index ea4af7c55..791856279 100644
--- a/doc/man-subscriptions.conf.html
+++ b/doc/man-subscriptions.conf.html
@@ -1,11 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Man Pages -->
-<head>
-	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
-	<title>subscriptions.conf(5)</title>
-</head>
-<body>
+---
+title: subscriptions.conf(5)
+layout: sub
+---
+
 <h1 class="title">subscriptions.conf(5)</h1>
 <h2 class="title"><a name="NAME">Name</a></h2>
 subscriptions.conf - subscription configuration file for cups
@@ -25,6 +22,3 @@ The name, location, and format of this file are an implementation detail that wi
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2018 by Apple Inc.
-
-</body>
-</html>
diff --git a/doc/network.html b/doc/network.html
index 1ba087329..0c4bf7f0a 100644
--- a/doc/network.html
+++ b/doc/network.html
@@ -1,11 +1,8 @@
-<!DOCTYPE html>
-<html>
-<!-- SECTION: Getting Started -->
-  <head>
-    <title>Using Network Printers</title>
-    <link rel="stylesheet" type="text/css" href="../cups-printable.css">
-  </head>
-  <body>
+---
+title: Using Network Printers
+layout: sub
+---
+
     <h1 class="title">Using Network Printers</h1>
 
     <p>This help document describes how to discover, configure, and use TCP/IP network printers with CUPS.</p>
@@ -338,5 +335,3 @@ HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: HP LaserJet 4000 Series</pre>
     <p>The hrDeviceType line should show hrDevicePrinter; if not, then your printer or print server doesn't identify itself as a printer. The hrDeviceDescr line should provide a human-readable string for the make and model of the printer, although in some cases you'll just see something less useful like "Axis OfficeBASIC Parallel Print Server".</p>
 
     <p>Once you have collected the snmpwalk output, you should go to the  <a href="https://github.com/apple/cups/issues">CUPS Issue Tracker</a> page to submit a feature request to support your printer or print server. Be sure to attach those two log files you created - they will help us to identify the SNMP values we need to look for.</p>
-  </body>
-</html>
diff --git a/doc/old-license.html b/doc/old-license.html
index 9bbc729ed..23d1b9970 100644
--- a/doc/old-license.html
+++ b/doc/old-license.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Software License Agreement</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Software License Agreement
+layout: sub
+---
 
 <H1 CLASS="title">Software License Agreement</H1>
 
@@ -1070,6 +1067,3 @@ Ty Coon, President of Vice
 </PRE>
 
 <P>That's all there is to it!
-
-</BODY>
-</HTML>
diff --git a/doc/options.html b/doc/options.html
index 9d612fcc9..da5805735 100644
--- a/doc/options.html
+++ b/doc/options.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Command-Line Printing and Options</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Command-Line Printing and Options
+layout: sub
+---
 
 <H1 CLASS="title">Command-Line Printing and Options</H1>
 
@@ -545,6 +542,3 @@ lpr -o mirror filename
 
 <P>This is typically used when printing on T-shirt transfer
 media or sometimes on transparencies.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/overview.html b/doc/overview.html
index a5240fce8..8a5f873e4 100644
--- a/doc/overview.html
+++ b/doc/overview.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Overview of CUPS</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Overview of CUPS
+layout: sub
+---
 
 <H1 CLASS="title">Overview of CUPS</H1>
 
@@ -60,6 +57,3 @@ Printer for Default Options</VAR> button to update the options automatically.</P
 <P>Once you have added the printer, you can print to it from any application.
 You can also choose <VAR>Print Test Page</VAR> from the maintenance menu to print
 a simple test page and verify that everything is working properly.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/policies.html b/doc/policies.html
index 8a0fc313d..25d67ecfe 100644
--- a/doc/policies.html
+++ b/doc/policies.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Managing Operation Policies</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Managing Operation Policies
+layout: sub
+---
 
 <H1 CLASS="title">Managing Operation Policies</H1>
 
@@ -612,6 +609,3 @@ lpadmin -p LaserJet4000 -o printer-op-policy=lab999
 </PRE>
 
 <P>To make the same change in the web interface, go to the printer's web page, for example "http://localhost:631/printers/LaserJet4000", and choose <VAR>Set Default Options</VAR> from the <VAR>Administration</VAR> menu button. Click on the <VAR>Policies</VAR> link and choose the desired policy from the pull-down list. Click on <VAR>Set Default Options</VAR> to change the policy for the printer.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/postscript-driver.html b/doc/postscript-driver.html
index 9abddf61c..ec9722012 100644
--- a/doc/postscript-driver.html
+++ b/doc/postscript-driver.html
@@ -1,453 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Developing PostScript Printer Drivers</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  PostScript printer driver documentation for CUPS.
-
-  Copyright © 2007-2012 by Apple Inc.
-  Copyright © 1997-2007 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: Developing PostScript Printer Drivers
+layout: sub
+---
 
 <h1 class='title'>Developing PostScript Printer Drivers</h1>
 
@@ -756,5 +310,3 @@ information file.</P>
 <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APPrinterPreset "name/text" "*option choice ..."
 </pre>
     </div>
-  </body>
-</html>
diff --git a/doc/ppd-compiler.html b/doc/ppd-compiler.html
index 5943fd22f..be4f5e385 100644
--- a/doc/ppd-compiler.html
+++ b/doc/ppd-compiler.html
@@ -1,453 +1,8 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Introduction to the PPD Compiler</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  PPD compiler documentation for CUPS.
-
-  Copyright © 2007-2012 by Apple Inc.
-  Copyright © 1997-2007 by Easy Software Products.
+---
+title: Introduction to the PPD Compiler
+layout: sub
+---
 
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
 
 <h1 class='title'>Introduction to the PPD Compiler</h1>
 
@@ -1378,5 +933,3 @@ ppdc -l de -d ppd/de mydrivers.drv
 
 <p>to generate German PPD files.</p>
     </div>
-  </body>
-</html>
diff --git a/doc/raster-driver.html b/doc/raster-driver.html
index 03f6f3da9..53cbb0ac9 100644
--- a/doc/raster-driver.html
+++ b/doc/raster-driver.html
@@ -1,453 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Programming -->
-  <head>
-    <title>Developing Raster Printer Drivers</title>
-    <meta name="keywords" content="Programming">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  Raster printer driver documentation for CUPS.
-
-  Copyright © 2007-2018 by Apple Inc.
-  Copyright © 1997-2007 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: Developing Raster Printer Drivers
+layout: sub
+---
 
 <h1 class='title'>Developing Raster Printer Drivers</h1>
 
@@ -672,5 +226,3 @@ h3.title {
 <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APPrinterPreset "name/text" "*option choice ..."
 </pre>
     </div>
-  </body>
-</html>
diff --git a/doc/ref-ppdcfile.html b/doc/ref-ppdcfile.html
index 6c84abd9a..086c99f5a 100644
--- a/doc/ref-ppdcfile.html
+++ b/doc/ref-ppdcfile.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: References -->
-<HEAD>
-	<TITLE>PPD Compiler Driver Information File Reference</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: PPD Compiler Driver Information File Reference
+layout: sub
+---
 
 <H1 CLASS="title">PPD Compiler Driver Information File Reference</H1>
 
@@ -2444,6 +2441,3 @@ supported keywords for each type.</p>
 	macOS.</LI>
 
 </UL>
-
-</BODY>
-</HTML>
diff --git a/doc/security.html b/doc/security.html
index 6bd2fdfa6..86ed9d11f 100644
--- a/doc/security.html
+++ b/doc/security.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Server Security</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Server Security
+layout: sub
+---
 
 <H1 CLASS="title">Server Security</H1>
 
@@ -118,6 +115,3 @@ variety of denial of service attacks:</P>
 <H2 CLASS="title"><A NAME="ENCRYPTION">Encryption Issues</A></H2>
 
 <P>CUPS supports 128-bit TLS encryption of network connections via the GNU TLS library, macOS Security framework, and Windows Schannel APIs. Secure deployment of TLS depends on proper certificate management and software maintenance.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/sharing.html b/doc/sharing.html
index a46f393bf..847d59df2 100644
--- a/doc/sharing.html
+++ b/doc/sharing.html
@@ -1,10 +1,7 @@
-<html>
-<!-- SECTION: Getting Started -->
-<head>
-	<title>Printer Sharing</title>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Printer Sharing
+layout: sub
+---
 
 <H1 CLASS="title">Printer Sharing</H1>
 
@@ -105,7 +102,3 @@ lpadmin -p <em>printer</em> -E -v ipp://<em>server</em>/printers/<em>printer</em
 <p>The <var>printer</var> name is the name of the printer on the server machine.
 The <var>server</var> name is the hostname or IP address of the server machine.
 Repeat the <b>lpadmin</b> command for each remote printer you wish to use.</p>
-
-
-</body>
-</html>
diff --git a/doc/spec-banner.html b/doc/spec-banner.html
index 855a569ef..22df15253 100644
--- a/doc/spec-banner.html
+++ b/doc/spec-banner.html
@@ -1,20 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- SECTION: Specifications -->
-<head>
-	<title>CUPS Banner File Format</title>
-	<meta name='keywords' content='job-sheets'>
-	<link rel='stylesheet' type='text/css' href='../cups-printable.css'>
-</head>
-<body>
-<!--
-  Banner file format specification for CUPS.
-
-  Copyright © 2008-2011 by Apple Inc.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: CUPS Banner File Format
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Banner File Format</H1>
 
@@ -145,7 +132,3 @@ following values are supported:</p>
 	<li><code>time-at-processing</code>: The current date and time</li>
 
 </ul>
-
-
-</body>
-</html>
diff --git a/doc/spec-command.html b/doc/spec-command.html
index 67d54264d..68cf26f18 100644
--- a/doc/spec-command.html
+++ b/doc/spec-command.html
@@ -1,21 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- SECTION: Specifications -->
-<head>
-	<title>CUPS Command File Format</title>
-	<meta name='keywords' content='Programming, CUPS Command File Format'>
-	<link rel='stylesheet' type='text/css' href='../cups-printable.css'>
-</head>
-<body>
-<!--
-  CUPS command file format specification for CUPS.
-
-  Copyright © 2007-2018 by Apple Inc.
-  Copyright © 1997-2006 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: CUPS Command File Format
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Command File Format</H1>
 
@@ -207,7 +193,3 @@ device-dependent.</p>
 #CUPS-COMMAND
 SetAlignment 1 14
 </pre>
-
-
-</body>
-</html>
diff --git a/doc/spec-design.html b/doc/spec-design.html
index 73d07b8f4..c4552ff4d 100644
--- a/doc/spec-design.html
+++ b/doc/spec-design.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<!-- SECTION: Specifications -->
-<HEAD>
-	<TITLE>CUPS Design Description</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: CUPS Design Description
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Design Description</H1>
 
@@ -178,7 +174,3 @@ CUPS_SERVERBIN/notifier/foo recipient user-data
 <H3>CUPS PPD Compiler Library (libcupsppdc)</H3>
 
 <P>The CUPS PPD compiler library provides access to driver information files and is used by the PPD compiler tools as well as the <A HREF="man-cups-driverd.html">cups-driverd(8)</A> helper program to generate PPD files and message catalogs for localization.</P>
-
-
-</BODY>
-</HTML>
diff --git a/doc/spec-ipp.html b/doc/spec-ipp.html
index 3574cd658..eb48971d5 100644
--- a/doc/spec-ipp.html
+++ b/doc/spec-ipp.html
@@ -1,21 +1,7 @@
-<!DOCTYPE HTML>
-<html>
-<!-- SECTION: Specifications -->
-<head>
-	<title>CUPS Implementation of IPP</title>
-	<meta name='keywords' content='Programming, Internet Printing Protocol'>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</head>
-<body>
-<!--
-  IPP specification for CUPS.
-
-  Copyright © 2007-2016 by Apple Inc.
-  Copyright © 1997-2007 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: CUPS Implementation of IPP
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Implementation of IPP</H1>
 
@@ -1900,6 +1886,3 @@ CUPS-Get-PPDs Response:
 <h4>member-uris (1setof uri)</h4>
 
 <p>The "member-uris" attribute specifies the "printer-uri-supported" values for each member printer and class. Each URI corresponds to the same element of the "member-names" attribute.
-
-</body>
-</html>
diff --git a/doc/spec-pdf.html b/doc/spec-pdf.html
deleted file mode 100644
index db6210994..000000000
--- a/doc/spec-pdf.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: CUPS PDF Format
----
-
-<H1 CLASS="title">CUPS PDF Format</H1>
-
-<P>CUPS PDF files (application/vnd.cups-pdf) are device-dependent PDF files that contain a job ticket information.</P>
-
diff --git a/doc/spec-postscript.html b/doc/spec-postscript.html
deleted file mode 100644
index a6a1a7606..000000000
--- a/doc/spec-postscript.html
+++ /dev/null
@@ -1,135 +0,0 @@
----
-title: Generating PostScript for CUPS
----
-<!--
-  CUPS PostScript file specification for CUPS.
-
-  Copyright © 2007-2012 by Apple Inc.
-  Copyright © 2006 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
-
-<H1 CLASS="title">Generating PostScript for CUPS</H1>
-
-<h2 class='title'><a name='INTRODUCTION'>Introduction</a></h2>
-
-<p>This document describes how to generate PostScript output for
-CUPS and is largely based on the <a
-href="http://partners.adobe.com/public/developer/en/ps/5001.DSC_Spec.pdf">
-Adobe TechNote #5001: PostScript Language Document Structuring
-Conventions Specification Version 3.0</a>. While CUPS can
-generally print any PostScript file, following the rules in the
-Adobe TechNote and this document will ensure that your PostScript
-output will work reliably.</p>
-
-<blockquote><b>Note:</b> While PostScript is currently the
-de-facto standard print job file format/language for UNIX-based
-applications, it is slowly being phased out in favor of Adobe's
-Portable Document Format ("PDF") which offers many advantages
-over PostScript. macOS uses PDF as the primary print job file
-format and Linux is making the transition. Both PostScript and
-PDF are complex formats, and we highly recommend using high-level
-toolkits whenever possible to create your print jobs.</blockquote>
-
-<h3>Anatomy of a PostScript File</h3>
-
-<p>PostScript files are ASCII text files starting with a header
-line (<tt>%!PS-Adobe-3.0</tt>) followed by a combination of
-comment lines starting with the percent sign (<tt>%</tt>) and
-PostScript code lines. The lines themselves should not exceed 255
-characters to conform to the DSC. The following short PostScript
-file produces a box with a smiley face in it:</p>
-
-<pre class="command">
-%!PS-Adobe-3.0
-%%BoundingBox: 36 36 576 756
-%%Pages: 1
-%%LanguageLevel: 2
-%%EndComments
-%%BeginSetup
-% this is where fonts would be embedded
-%%EndSetup
-%%Page: (1) 1
-%%BeginPageSetup
-% this is where page-specific features would be specified
-%%EndPageSetup
-% Draw a black box around the page
-0 setgray
-1 setlinewidth
-36 36 540 720 rectstroke
-
-% Draw a two inch blue circle in the middle of the page
-0 0 1 setrgbcolor
-306 396 144 0 360 arc closepath fill
-
-% Draw two half inch yellow circles for eyes
-1 1 0 setrgbcolor
-252 432 36 0 360 arc closepath fill
-360 432 36 0 360 arc closepath fill
-
-% Draw the smile
-1 setlinecap
-18 setlinewidth
-306 396 99 200 340 arc stroke
-
-% Print it!
-showpage
-%%EOF
-</pre>
-
-<div class="figure"><table summary="Sample PostScript File Output">
-<caption>Figure 1: <a name="FIGURE_1">Sample PostScript File Output</a></caption>
-<tr><td align="center"><img src="../images/smiley.jpg"
-width="445" height="570" alt="Sample PostScript File Output"></td></tr>
-</table></div>
-
-
-<h2><a name='OPTIONS'>Embedding Printer Options</a></h2>
-
-<p>There are two main strategies for embedding printer options in PostScript
-files. The first is to list CUPS options using the <code>%cupsJobTicket</code>
-comment:</p>
-
-<pre>
-%!PS-Adobe-3.0
-%cupsJobTicket: media=A4 sides=two-sided-long-edge
-%cupsJobTicket: PrinterOption=foo PrinterOption2=bar
-...
-%%EndComments
-</pre>
-
-<p>CUPS options apply to the entire job. To apply options to individual pages,
-use the <code>%%IncludeFeature</code> comment instead:</p>
-
-<pre>
-%%Page: label 123
-%%BeginPageSetup
-%%IncludeFeature: *PageSize A4
-%%IncludeFeature: *PrinterOption Foo
-%%IncludeFeature: *PrinterOption2 Bar
-%%EndPageSetup
-...
-</pre>
-
-
-<h2><a name='FONTS'>Embedding Fonts and Text</a></h2>
-
-<p>Always embed the fonts used by your print job, and for best performance
-embed the fonts and character encodings in the setup section of the PostScript
-file. Type 1 and Type 3 fonts are supported by all PostScript printers, while
-Type 42 (TrueType) and CID fonts are supported by most level 2 and all level 3
-PostScript printers. Binary font files should always be converted to the
-corresponding ASCII (hex) encoding to avoid problems when printing over
-interfaces that do not support binary PostScript.</p>
-
-
-<h2><a name='IMAGES'>Embedding Images</a></h2>
-
-<p>The <code>image</code> operator should be used to embed images in PostScript
-files. Always use ASCII hex or Base-85 encoding for the image data to avoid
-problems when printing over interfaces that do not support binary PostScript.
-In most cases, the Base-85 encoding and compression filters can be used to
-embed images with very little, if any, increase in data size.</p>
-
diff --git a/doc/spec-ppd.html b/doc/spec-ppd.html
index 40e56ee2d..70e6a9b94 100644
--- a/doc/spec-ppd.html
+++ b/doc/spec-ppd.html
@@ -1,453 +1,7 @@
-<!doctype html>
-<html>
-<!-- SECTION: Specifications -->
-  <head>
-    <title>CUPS PPD Extensions</title>
-    <meta name="keywords" content="Specifications">
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="Mini-XML v2.11">
-    <meta name="author" content="Unknown">
-    <meta name="copyright" content="Unknown">
-    <meta name="version" content="0.0">
-    <style type="text/css"><!--
-BODY {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-KBD {
-  font-family: monaco, courier, monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monaco, courier, monospace;
-}
-
-BLOCKQUOTE {
-  border-left: solid 2px #777;
-  margin: 1em 0;
-  padding: 10px;
-}
-
-BLOCKQUOTE OL LI {
-  margin-left: -1em;
-}
-
-PRE.command, PRE.example {
-  background: #eee;
-  margin: 0 36pt;
-  padding: 10px;
-}
-
-P.compact {
-  margin: 0;
-}
-
-P.example {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-DL.man DD {
-  margin-left: 5em;
-}
-
-DL.man DT {
-  margin-left: 0;
-}
-
-PRE.man {
-  margin: 0;
-}
-
-PRE.command EM, PRE.example EM {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
-}
-
-P.command {
-  font-family: monaco, courier, monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-A IMG {
-  border: none;
-}
-
-A:link:hover IMG {
-  background: #f0f0f0;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-A:link, A:visited {
-  font-weight: inherit;
-  text-decoration: none;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.data, TD.data, TR.data TD {
-  margin-top: 10pt;
-  padding: 5pt;
-  border-bottom: solid 1pt #999999;
-}
-
-TR.data TH {
-  border-bottom: solid 1pt #999999;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-}
-
-DIV.table TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #cccccc;
-  padding: 5pt 10pt 0;
-}
-
-DIV.table TABLE TH {
-  background: #cccccc;
-  border: none;
-  border-bottom: solid thin #999999;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  text-align: right;
-  vertical-align: top;
-}
-
-TH.sublabel {
-  text-align: right;
-  font-weight: normal;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: black;
-  border: thin solid black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-H1.title {
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-DIV.indent, TABLE.indent {
-  margin-top: 2em;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.indent {
-  border-collapse: collapse;
-}
-
-TABLE.indent TD, TABLE.indent TH {
-  padding: 0;
-}
-
-TABLE.list {
-  border-collapse: collapse;
-  margin-left: auto;
-  margin-right: auto;
-  width: 90%;
-}
-
-TABLE.list TH {
-  background: white;
-  border-bottom: solid thin #cccccc;
-  color: #444444;
-  padding-top: 10pt;
-  padding-left: 5pt;
-  text-align: left;
-  vertical-align: bottom;
-  white-space: nowrap;
-}
-
-TABLE.list TH A {
-  color: #4444cc;
-}
-
-TABLE.list TD {
-  border-bottom: solid thin #eeeeee;
-  padding-top: 5pt;
-  padding-left: 5pt;
-}
-
-TABLE.list TR:nth-child(even) {
-  background: #f8f8f8;
-}
-
-TABLE.list TR:nth-child(odd) {
-  background: #f4f4f4;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 36pt;
-  font-family: monaco, courier, monospace;
-}
-
-DIV.summary TABLE {
-  border: solid thin #999999;
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 10px;
-}
-
-DIV.summary TABLE TD, DIV.summary TABLE TH {
-  border: solid thin #999999;
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-DIV.summary TABLE THEAD TH {
-  background: #eeeeee;
-}
-
-/* API documentation styles... */
-div.body h1 {
-  font-size: 250%;
-  font-weight: bold;
-  margin: 0;
-}
-div.body h2 {
-  font-size: 250%;
-  margin-top: 1.5em;
-}
-div.body h3 {
-  font-size: 150%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h4 {
-  font-size: 110%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.body h5 {
-  font-size: 100%;
-  margin-bottom: 0.5em;
-  margin-top: 1.5em;
-}
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
-  font-size: 110%;
-}
-div.contents h2 {
-  font-size: 100%;
-}
-div.contents ul.contents {
-  font-size: 80%;
-}
-.class {
-  border-bottom: solid 2px gray;
-}
-.constants {
-}
-.description {
-  margin-top: 0.5em;
-}
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
-.function {
-  border-bottom: solid 2px gray;
-  margin-bottom: 0;
-}
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
-blockquote {
-  border: solid thin gray;
-  box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
-  padding: 0px 10px;
-  page-break-inside: avoid;
-}
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
-  font-family: monospace;
-  font-size: 90%;
-  hyphens: manual;
-  -webkit-hyphens: manual;
-  page-break-inside: avoid;
-}
-p.code, pre, ul.code li {
-  padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
-}
-a:link, a:visited {
-  text-decoration: none;
-}
-span.info {
-  background: black;
-  border: solid thin black;
-  color: white;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-h3 span.info, h4 span.info {
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  float: right;
-  padding: 3px 6px;
-}
-ul.code, ul.contents, ul.subcontents {
-  list-style-type: none;
-  margin: 0;
-  padding-left: 0;
-}
-ul.code li {
-  margin: 0;
-}
-ul.contents > li {
-  margin-top: 1em;
-}
-ul.contents li ul.code, ul.contents li ul.subcontents {
-  padding-left: 2em;
-}
-table.list {
-  border-collapse: collapse;
-  width: 100%;
-}
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
-table.list th {
-  border-right: 2px solid gray;
-  font-family: monospace;
-  padding: 5px 10px 5px 2px;
-  text-align: right;
-  vertical-align: top;
-}
-table.list td {
-  padding: 5px 2px 5px 10px;
-  text-align: left;
-  vertical-align: top;
-}
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
-  border-bottom: solid 2px black;
-}
---></style>
-  </head>
-  <body>
-<!--
-  PPD extension documentation for CUPS.
-
-  Copyright © 2007-2011 by Apple Inc.
-  Copyright © 1997-2007 by Easy Software Products.
-
-  Licensed under Apache License v2.0.  See the file "LICENSE" for more
-  information.
--->
+---
+title: CUPS PPD Extensions
+layout: sub
+---
 
 <H1 CLASS="title">CUPS PPD Extensions</H1>
 
@@ -2658,5 +2212,3 @@ the device.</p>
 
 </ul>
     </div>
-  </body>
-</html>
diff --git a/doc/spec-raster.html b/doc/spec-raster.html
index 50fca220a..2cd71800e 100644
--- a/doc/spec-raster.html
+++ b/doc/spec-raster.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<!-- SECTION: Specifications -->
-<HEAD>
-	<TITLE>CUPS Raster Format</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: CUPS Raster Format
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Raster Format</H1>
 
@@ -715,6 +711,3 @@
 	<li>Added ICC and CIE color spaces.</li>
 
 </ul>
-
-</BODY>
-</HTML>
diff --git a/doc/spec-stp.html b/doc/spec-stp.html
index 06c099b55..b4b4e351a 100644
--- a/doc/spec-stp.html
+++ b/doc/spec-stp.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<!-- SECTION: Specifications -->
-<HEAD>
-	<TITLE>CUPS Software Test Plan</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: CUPS Software Test Plan
+layout: sub
+---
 
 <H1 CLASS="title">CUPS Software Test Plan</H1>
 
@@ -128,6 +124,3 @@ properly cancel a job or all jobs.</P>
 
 <P>This test verifies that the <CODE>lpinfo</CODE> command
 returns a list of available printer drivers and devices.</P>
-
-</BODY>
-</HTML>
diff --git a/doc/translation.html b/doc/translation.html
index a4ada4a70..ab419d30d 100644
--- a/doc/translation.html
+++ b/doc/translation.html
@@ -1,10 +1,7 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Translating and Customizing CUPS</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
+---
+title: Translating and Customizing CUPS
+layout: sub
+---
 
 <H1 CLASS="title">Translating and Customizing CUPS</H1>
 
@@ -34,7 +31,7 @@ files and directories:</P>
 
 	<LI><VAR>templates/*.tmpl</VAR> - the web interface
 	template files</LI>
-	
+
 </UL>
 
 <P>With the exception of the message catalogs and desktop file,
@@ -847,6 +844,3 @@ shows the supported <CODE>OP</CODE> values.</P>
 </TR>
 </TBODY>
 </TABLE></DIV>
-
-</BODY>
-</HTML>