You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2021/06/29 19:35:59 UTC

[iceberg] branch asf-site updated: Deployed 2060869d5 with MkDocs version: 1.2.1

This is an automated email from the ASF dual-hosted git repository.

blue pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 6050dff  Deployed 2060869d5 with MkDocs version: 1.2.1
6050dff is described below

commit 6050dff9e4342755b6ad79e49088a66b472c410c
Author: Ryan Blue <bl...@apache.org>
AuthorDate: Tue Jun 29 12:35:49 2021 -0700

    Deployed 2060869d5 with MkDocs version: 1.2.1
---
 404.html                                           |  66 +++++------
 api.html => api/index.html                         | 104 +++++++++---------
 aws.html => aws/index.html                         |  90 +++++++--------
 blogs.html => blogs/index.html                     |  90 +++++++--------
 community.html => community/index.html             | 100 +++++++++--------
 configuration.html => configuration/index.html     |  92 ++++++++--------
 css/extra.css                                      |   7 ++
 custom-catalog.html => custom-catalog/index.html   |  90 +++++++--------
 evolution.html => evolution/index.html             |  94 ++++++++--------
 flink.html => flink/index.html                     |  98 ++++++++---------
 getting-started.html => getting-started/index.html | 122 ++++++++++-----------
 hive.html => hive/index.html                       |  94 ++++++++--------
 how-to-release.html => how-to-release/index.html   |  90 +++++++--------
 index.html                                         |  70 ++++++------
 .../index.html                                     | 100 ++++++++---------
 maintenance.html => maintenance/index.html         | 100 ++++++++---------
 nessie.html => nessie/index.html                   |  92 ++++++++--------
 partitioning.html => partitioning/index.html       |  90 +++++++--------
 performance.html => performance/index.html         |  90 +++++++--------
 presto/index.html                                  |  15 +++
 .../index.html                                     |  90 +++++++--------
 .../index.html                                     |  90 +++++++--------
 .../index.html                                     |  90 +++++++--------
 releases.html => releases/index.html               |  90 +++++++--------
 reliability.html => reliability/index.html         |  92 ++++++++--------
 schemas.html => schemas/index.html                 |  92 ++++++++--------
 sitemap.xml                                        |  70 ++++++------
 sitemap.xml.gz                                     | Bin 218 -> 467 bytes
 snapshots.html => snapshots/index.html             |  86 +++++++--------
 .../index.html                                     |  92 ++++++++--------
 spark-ddl.html => spark-ddl/index.html             | 106 +++++++++---------
 .../index.html                                     |  96 ++++++++--------
 spark-queries.html => spark-queries/index.html     |  96 ++++++++--------
 .../index.html                                     |  96 ++++++++--------
 spark-writes.html => spark-writes/index.html       |  96 ++++++++--------
 spec.html => spec/index.html                       |  94 ++++++++--------
 terms.html => terms/index.html                     |  96 ++++++++--------
 trademarks.html => trademarks/index.html           |  90 +++++++--------
 trino.html => trino/index.html                     |  86 +++++++--------
 why-iceberg.html => why-iceberg/index.html         |  86 +++++++--------
 40 files changed, 1727 insertions(+), 1701 deletions(-)

diff --git a/404.html b/404.html
index 642b283..c81f38f 100644
--- a/404.html
+++ b/404.html
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="/index.html">About</a>
+    <a href="/.">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="/community.html">Community</a>
+    <a href="/community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="/releases.html">Releases</a>
+    <a href="/releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="/blogs.html">Blogs</a>
+    <a href="/blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="/trademarks.html">Trademarks</a>
+    <a href="/trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="/how-to-release.html">How to Release</a>
+    <a href="/how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="/configuration.html">Configuration</a>
+    <a href="/configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="/schemas.html">Schemas</a>
+    <a href="/schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="/partitioning.html">Partitioning</a>
+    <a href="/partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="/evolution.html">Table evolution</a>
+    <a href="/evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="/maintenance.html">Maintenance</a>
+    <a href="/maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="/performance.html">Performance</a>
+    <a href="/performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="/reliability.html">Reliability</a>
+    <a href="/reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="/getting-started.html">Getting Started</a>
+    <a href="/getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-configuration.html">Configuration</a>
+    <a href="/spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-ddl.html">DDL</a>
+    <a href="/spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-queries.html">Queries</a>
+    <a href="/spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-writes.html">Writes</a>
+    <a href="/spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-procedures.html">Maintenance Procedures</a>
+    <a href="/spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark-structured-streaming.html">Structured Streaming</a>
+    <a href="/spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spark#time-travel">Time Travel</a>
+    <a href="/spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="/flink.html">Flink</a>
+                        <a href="/flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="/hive.html">Hive</a>
+                        <a href="/hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="/aws.html">AWS</a>
+    <a href="/aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="/nessie.html">Nessie</a>
+    <a href="/nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="/api.html">Java API intro</a>
+    <a href="/api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="/java-api-quickstart.html">Java Quickstart</a>
+    <a href="/java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="/custom-catalog.html">Java Custom Catalog</a>
+    <a href="/custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="/python-quickstart.html">Python Quickstart</a>
+    <a href="/python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="/python-api-intro.html">Python API Intro</a>
+    <a href="/python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="/python-feature-support.html">Python Feature Support</a>
+    <a href="/python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="/terms.html">Definitions</a>
+    <a href="/terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="/spec.html">Spec</a>
+    <a href="/spec/">Spec</a>
 </li>
 
                         
diff --git a/api.html b/api/index.html
similarity index 88%
rename from api.html
rename to api/index.html
index 3049c51..7c28e17 100644
--- a/api.html
+++ b/api/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/api/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Java API intro - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li class="active">
-    <a href="api.html">Java API intro</a>
+    <a href="./">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="nessie.html">
+                        <a rel="prev" href="../nessie/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="java-api-quickstart.html">
+                        <a rel="next" href="../java-api-quickstart/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -444,11 +444,11 @@
 <p>The main purpose of the Iceberg API is to manage table metadata, like schema, partition spec, metadata, and data files that store table data.</p>
 <p>Table metadata and operations are accessed through the <code>Table</code> interface. This interface will return table information.</p>
 <h3 id="table-metadata">Table metadata<a class="headerlink" href="#table-metadata" title="Permanent link">&para;</a></h3>
-<p>The <a href="javadoc/master/index.html?org/apache/iceberg/Table.html"><code>Table</code> interface</a> provides access to the table metadata:</p>
+<p>The <a href="../javadoc/master/?org/apache/iceberg/Table.html"><code>Table</code> interface</a> provides access to the table metadata:</p>
 <ul>
-<li><code>schema</code> returns the current table <a href="schemas.html">schema</a></li>
+<li><code>schema</code> returns the current table <a href="../schemas/">schema</a></li>
 <li><code>spec</code> returns the current table partition spec</li>
-<li><code>properties</code> returns a map of key-value <a href="configuration.html">properties</a></li>
+<li><code>properties</code> returns a map of key-value <a href="../configuration/">properties</a></li>
 <li><code>currentSnapshot</code> returns the current table snapshot</li>
 <li><code>snapshots</code> returns all valid snapshots for the table</li>
 <li><code>snapshot(id)</code> returns a specific snapshot by ID</li>
@@ -477,7 +477,7 @@ Iterable&lt;CombinedScanTask&gt; tasks = scan.planTasks();
 </code></pre>
 <p>Use <code>asOfTime</code> or <code>useSnapshot</code> to configure the table snapshot for time travel queries.</p>
 <h3 id="update-operations">Update operations<a class="headerlink" href="#update-operations" title="Permanent link">&para;</a></h3>
-<p><code>Table</code> also exposes operations that update the table. These operations use a builder pattern, <a href="javadoc/master/index.html?org/apache/iceberg/PendingUpdate.html"><code>PendingUpdate</code></a>, that commits when <code>PendingUpdate#commit</code> is called.</p>
+<p><code>Table</code> also exposes operations that update the table. These operations use a builder pattern, <a href="../javadoc/master/?org/apache/iceberg/PendingUpdate.html"><code>PendingUpdate</code></a>, that commits when <code>PendingUpdate#commit</code> is called.</p>
 <p>For example, updating the table schema is done by calling <code>updateSchema</code>, adding updates to the builder, and finally calling <code>commit</code> to commit the pending changes to the table:</p>
 <pre><code class="language-java">table.updateSchema()
     .addColumn(&quot;count&quot;, Types.LongType.get())
@@ -510,7 +510,7 @@ t.newAppend().appendFile(data).commit();
 t.commitTransaction();
 </code></pre>
 <h2 id="types">Types<a class="headerlink" href="#types" title="Permanent link">&para;</a></h2>
-<p>Iceberg data types are located in the <a href="javadoc/master/index.html?org/apache/iceberg/types/package-summary.html"><code>org.apache.iceberg.types</code> package</a>.</p>
+<p>Iceberg data types are located in the <a href="../javadoc/master/?org/apache/iceberg/types/package-summary.html"><code>org.apache.iceberg.types</code> package</a>.</p>
 <h3 id="primitives">Primitives<a class="headerlink" href="#primitives" title="Permanent link">&para;</a></h3>
 <p>Primitive type instances are available from static methods in each type class. Types without parameters use <code>get</code>, and types like <code>decimal</code> use factory methods:</p>
 <pre><code class="language-java">Types.IntegerType.get()    // int
@@ -519,7 +519,7 @@ Types.DecimalType.of(9, 2) // decimal(9, 2)
 </code></pre>
 <h3 id="nested-types">Nested types<a class="headerlink" href="#nested-types" title="Permanent link">&para;</a></h3>
 <p>Structs, maps, and lists are created using factory methods in type classes.</p>
-<p>Like struct fields, map keys or values and list elements are tracked as nested fields. Nested fields track <a href="evolution.html#correctness">field IDs</a> and nullability.</p>
+<p>Like struct fields, map keys or values and list elements are tracked as nested fields. Nested fields track <a href="../evolution/#correctness">field IDs</a> and nullability.</p>
 <p>Struct fields are created using <code>NestedField.optional</code> or <code>NestedField.required</code>. Map value and list element nullability is set in the map and list factory methods.</p>
 <pre><code class="language-java">// struct&lt;1 id: int, 2 data: optional string&gt;
 StructType struct = Struct.of(
@@ -537,7 +537,7 @@ MapType map = MapType.ofOptional(
 ListType list = ListType.ofRequired(1, IntegerType.get());
 </code></pre>
 <h2 id="expressions">Expressions<a class="headerlink" href="#expressions" title="Permanent link">&para;</a></h2>
-<p>Iceberg&rsquo;s expressions are used to configure table scans. To create expressions, use the factory methods in <a href="javadoc/master/index.html?org/apache/iceberg/expressions/Expressions.html"><code>Expressions</code></a>.</p>
+<p>Iceberg&rsquo;s expressions are used to configure table scans. To create expressions, use the factory methods in <a href="../javadoc/master/?org/apache/iceberg/expressions/Expressions.html"><code>Expressions</code></a>.</p>
 <p>Supported predicate expressions are:</p>
 <ul>
 <li><code>isNull</code></li>
@@ -617,7 +617,7 @@ ListType list = ListType.ofRequired(1, IntegerType.get());
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -625,9 +625,9 @@ ListType list = ListType.ofRequired(1, IntegerType.get());
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/aws.html b/aws/index.html
similarity index 94%
rename from aws.html
rename to aws/index.html
index 411caf2..af53ddc 100644
--- a/aws.html
+++ b/aws/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/aws/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>AWS - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li class="active">
-    <a href="aws.html">AWS</a>
+    <a href="./">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="hive.html">
+                        <a rel="prev" href="../hive/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="nessie.html">
+                        <a rel="next" href="../nessie/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -854,7 +854,7 @@ to run fully managed Apache Flink applications. You can include Iceberg in your
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -862,9 +862,9 @@ to run fully managed Apache Flink applications. You can include Iceberg in your
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/blogs.html b/blogs/index.html
similarity index 89%
rename from blogs.html
rename to blogs/index.html
index 424168f..7029b37 100644
--- a/blogs.html
+++ b/blogs/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/blogs/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Blogs - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="blogs.html">Blogs</a>
+    <a href="./">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="releases.html">
+                        <a rel="prev" href="../releases/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="trademarks.html">
+                        <a rel="next" href="../trademarks/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -486,7 +486,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -494,9 +494,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/community.html b/community/index.html
similarity index 83%
rename from community.html
rename to community/index.html
index 32b8c3f..2fa3e88 100644
--- a/community.html
+++ b/community/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/community/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Community - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="community.html">Community</a>
+    <a href="./">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="index.html">
+                        <a rel="prev" href="..">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="releases.html">
+                        <a rel="next" href="../releases/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -435,9 +435,9 @@
 
 <h1 id="welcome">Welcome!<a class="headerlink" href="#welcome" title="Permanent link">&para;</a></h1>
 <p>Apache Iceberg tracks issues in GitHub and prefers to receive contributions as pull requests.</p>
-<p>Community discussions happen primarily on the dev mailing list or on specific issues.</p>
+<p>Community discussions happen primarily on the dev mailing list, on the #iceberg channel on the ASF&rsquo;s Slack workspace, and on specific Github issues.</p>
 <h2 id="contributing">Contributing<a class="headerlink" href="#contributing" title="Permanent link">&para;</a></h2>
-<p>Iceberg uses Apache&rsquo;s GitHub integration. The code is available at <a href="https://github.com/apache/iceberg">https://github.com/apache/iceberg</a></p>
+<p>The Iceberg Project is hosted on Github at <a href="https://github.com/apache/iceberg">https://github.com/apache/iceberg</a>.</p>
 <p>The Iceberg community prefers to receive contributions as <a href="https://help.github.com/articles/about-pull-requests/">Github pull requests</a>.</p>
 <ul>
 <li><a href="https://github.com/apache/iceberg/pulls">View open pull requests</a></li>
@@ -450,7 +450,11 @@
 <li><a href="https://github.com/apache/iceberg/issues/new">Open a new issue</a></li>
 </ul>
 <h2 id="slack">Slack<a class="headerlink" href="#slack" title="Permanent link">&para;</a></h2>
-<p><a href="https://the-asf.slack.com/archives/CF01LKV9S"><img alt="Slack" src="https://img.shields.io/badge/chat-on%20Slack-brightgreen.svg" /></a></p>
+<p>We use the <a href="https://the-asf.slack.com/archives/CF01LKV9S">#iceberg</a> channel on
+the ASF&rsquo;s Slack workspace. You get can an invitation to join this workspace at
+<a href="https://s.apache.org/slack-invite">https://s.apache.org/slack-invite</a>. Please note that this link occasionally
+breaks when Slack does an upgrade. If you encounter problems using it, please
+let us know by sending an email to <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#100;&#101;&#118;&#64;&#105;&#99;&#101;&#98;&#101;&#114;&#103;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#100;&#101;&#118;&#64;&#105;&#99;&#101;&#98;&#101;&#114;&#103;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>.</p>
 <h2 id="mailing-lists">Mailing Lists<a class="headerlink" href="#mailing-lists" title="Permanent link">&para;</a></h2>
 <p>Iceberg has four mailing lists:</p>
 <ul>
@@ -498,7 +502,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -506,9 +510,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/configuration.html b/configuration/index.html
similarity index 90%
rename from configuration.html
rename to configuration/index.html
index 623438f..4b8ba88 100644
--- a/configuration.html
+++ b/configuration/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/configuration/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Configuration - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li class="active">
-    <a href="configuration.html">Configuration</a>
+    <a href="./">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="how-to-release.html">
+                        <a rel="prev" href="../how-to-release/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="schemas.html">
+                        <a rel="next" href="../schemas/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -706,7 +706,7 @@
 <p><code>HadoopCatalog</code> and <code>HiveCatalog</code> can access the properties in their constructors.
 Any other custom catalog can access the properties by implementing <code>Catalog.initialize(catalogName, catalogProperties)</code>.
 The properties can be manually constructed or passed in from a compute engine like Spark or Flink.
-Spark uses its session properties as catalog properties, see more details in the <a href="spark-configuration.html#catalog-configuration">Spark configuration</a> section.
+Spark uses its session properties as catalog properties, see more details in the <a href="../spark-configuration/#catalog-configuration">Spark configuration</a> section.
 Flink passes in catalog properties through <code>CREATE CATALOG</code> statement, see more details in the <a href="../flink/#creating-catalogs-and-using-catalogs">Flink</a> section.</p>
 <h3 id="lock-catalog-properties">Lock catalog properties<a class="headerlink" href="#lock-catalog-properties" title="Permanent link">&para;</a></h3>
 <p>Here are the catalog properties related to locking. They are used by some catalog implementations to control the locking behavior during commits.</p>
@@ -808,7 +808,7 @@ Hive Metastore before the lock is retried from Iceberg.</p></div>
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -816,9 +816,9 @@ Hive Metastore before the lock is retried from Iceberg.</p></div>
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/css/extra.css b/css/extra.css
index 3d79de0..d5b7a35 100644
--- a/css/extra.css
+++ b/css/extra.css
@@ -92,3 +92,10 @@ pre {
   padding: 0.5em;
   padding-left: 1em;
 }
+
+.spec-img {
+  float: right;
+  max-width: 50%; 
+  min-width: 265px; 
+  margin: 1em 0 1em 2em;
+}
\ No newline at end of file
diff --git a/custom-catalog.html b/custom-catalog/index.html
similarity index 91%
rename from custom-catalog.html
rename to custom-catalog/index.html
index 264906e..0a4ca14 100644
--- a/custom-catalog.html
+++ b/custom-catalog/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/custom-catalog/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Java Custom Catalog - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="./">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="java-api-quickstart.html">
+                        <a rel="prev" href="../java-api-quickstart/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="python-quickstart.html">
+                        <a rel="next" href="../python-quickstart/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -678,7 +678,7 @@ PARTITIONED BY (category);
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -686,9 +686,9 @@ PARTITIONED BY (category);
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/evolution.html b/evolution/index.html
similarity index 87%
rename from evolution.html
rename to evolution/index.html
index 588dc46..d1a58a4 100644
--- a/evolution.html
+++ b/evolution/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/evolution/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Table evolution - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="evolution.html">Table evolution</a>
+    <a href="./">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="partitioning.html">
+                        <a rel="prev" href="../partitioning/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="maintenance.html">
+                        <a rel="next" href="../maintenance/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -460,9 +460,9 @@
 <h2 id="partition-evolution">Partition evolution<a class="headerlink" href="#partition-evolution" title="Permanent link">&para;</a></h2>
 <p>Iceberg table partitioning can be updated in an existing table because queries do not reference partition values directly.</p>
 <p>When you evolve a partition spec, the old data written with an earlier spec remains unchanged. New data is written using the new spec in a new layout. Metadata for each of the partition versions is kept separately. Because of this, when you start writing queries, you get split planning. This is where each partition layout plans files separately using the filter it derives for that specific partition layout. Here&rsquo;s a visual representation of a contrived example: </p>
-<p><img alt="Partition evolution diagram" src="img/partition-spec-evolution.png" />
+<p><img alt="Partition evolution diagram" src="../img/partition-spec-evolution.png" />
 <em>The data for 2008 is partitioned by month. Starting from 2009 the table is updated so that the data is instead partitioned by day. Both partitioning layouts are able to coexist in the same table.</em></p>
-<p>Iceberg uses <a href="partitioning.html">hidden partitioning</a>, so you don&rsquo;t <em>need</em> to write queries for a specific partition layout to be fast. Instead, you can write queries that select the data you need, and Iceberg automatically prunes out files that don&rsquo;t contain matching data.</p>
+<p>Iceberg uses <a href="../partitioning/">hidden partitioning</a>, so you don&rsquo;t <em>need</em> to write queries for a specific partition layout to be fast. Instead, you can write queries that select the data you need, and Iceberg automatically prunes out files that don&rsquo;t contain matching data.</p>
 <p>Partition evolution is a metadata operation and does not eagerly rewrite files.</p>
 <p>Iceberg&rsquo;s Java table API provides <code>updateSpec</code> API to update partition spec. 
 For example, the following code could be used to update the partition spec to add a new partition field that places <code>id</code> column values into 8 buckets and remove an existing partition field <code>category</code>:</p>
@@ -509,7 +509,7 @@ sampleTable.replaceSortOrder()
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -517,9 +517,9 @@ sampleTable.replaceSortOrder()
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/flink.html b/flink/index.html
similarity index 93%
rename from flink.html
rename to flink/index.html
index 4e87661..fac1598 100644
--- a/flink.html
+++ b/flink/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/flink/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Flink - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li class="active">
-                        <a href="flink.html">Flink</a>
+                        <a href="./">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="spark-structured-streaming.html">
+                        <a rel="prev" href="../spark-structured-streaming/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="hive.html">
+                        <a rel="next" href="../hive/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -721,7 +721,7 @@ USE iceberg_db;
 <ul>
 <li><code>PARTITION BY (column1, column2, ...)</code> to configure partitioning, apache flink does not yet support hidden partitioning.</li>
 <li><code>COMMENT 'table document'</code> to set a table description.</li>
-<li><code>WITH ('key'='value', ...)</code> to set <a href="configuration.html">table configuration</a> which will be stored in apache iceberg table properties.</li>
+<li><code>WITH ('key'='value', ...)</code> to set <a href="../configuration/">table configuration</a> which will be stored in apache iceberg table properties.</li>
 </ul>
 <p>Currently, it does not support computed column, primary key and watermark definition etc.</p>
 <h3 id="partitioned-by"><code>PARTITIONED BY</code><a class="headerlink" href="#partitioned-by" title="Permanent link">&para;</a></h3>
@@ -838,7 +838,7 @@ stream.print();
 // Submit and execute this streaming read job.
 env.execute(&quot;Test Iceberg Batch Read&quot;);
 </code></pre>
-<p>There are other options that we could set by Java API, please see the <a href="./javadoc/master/org/apache/iceberg/flink/source/FlinkSource.html">FlinkSource#Builder</a>.</p>
+<p>There are other options that we could set by Java API, please see the <a href="../javadoc/0.11.1/org/apache/iceberg/flink/source/FlinkSource.html">FlinkSource#Builder</a>.</p>
 <h2 id="writing-with-datastream">Writing with DataStream<a class="headerlink" href="#writing-with-datastream" title="Permanent link">&para;</a></h2>
 <p>Iceberg support writing to iceberg table from different DataStream input.</p>
 <h3 id="appending-data">Appending data.<a class="headerlink" href="#appending-data" title="Permanent link">&para;</a></h3>
@@ -872,7 +872,7 @@ FlinkSink.forRowData(input)
 env.execute(&quot;Test Iceberg DataStream&quot;);
 </code></pre>
 <h2 id="inspecting-tables">Inspecting tables.<a class="headerlink" href="#inspecting-tables" title="Permanent link">&para;</a></h2>
-<p>Iceberg does not support inspecting table in flink sql now, we need to use <a href="api.html">iceberg&rsquo;s Java API</a> to read iceberg&rsquo;s meta data to get those table information.</p>
+<p>Iceberg does not support inspecting table in flink sql now, we need to use <a href="../api/">iceberg&rsquo;s Java API</a> to read iceberg&rsquo;s meta data to get those table information.</p>
 <h2 id="rewrite-files-action">Rewrite files action.<a class="headerlink" href="#rewrite-files-action" title="Permanent link">&para;</a></h2>
 <p>Iceberg provides API to rewrite small files into large files by submitting flink batch job. The behavior of this flink action is the same as the spark&rsquo;s <a href="./maintenance/#compact-data-files">rewriteDataFiles</a>.</p>
 <pre><code class="language-java">import org.apache.iceberg.flink.actions.Actions;
@@ -883,7 +883,7 @@ RewriteDataFilesActionResult result = Actions.forTable(table)
         .rewriteDataFiles()
         .execute();
 </code></pre>
-<p>For more doc about options of the rewrite files action, please see <a href="./javadoc/master/org/apache/iceberg/flink/actions/RewriteDataFilesAction.html">RewriteDataFilesAction</a></p>
+<p>For more doc about options of the rewrite files action, please see <a href="../javadoc/0.11.1/org/apache/iceberg/flink/actions/RewriteDataFilesAction.html">RewriteDataFilesAction</a></p>
 <h2 id="future-improvement">Future improvement.<a class="headerlink" href="#future-improvement" title="Permanent link">&para;</a></h2>
 <p>There are some features that we do not yet support in the current flink iceberg integration work:</p>
 <ul>
@@ -913,7 +913,7 @@ RewriteDataFilesActionResult result = Actions.forTable(table)
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -921,9 +921,9 @@ RewriteDataFilesActionResult result = Actions.forTable(table)
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/getting-started.html b/getting-started/index.html
similarity index 80%
rename from getting-started.html
rename to getting-started/index.html
index ba32e42..ff7b304 100644
--- a/getting-started.html
+++ b/getting-started/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/getting-started/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Getting Started - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li class="active">
-    <a href="getting-started.html">Getting Started</a>
+    <a href="./">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="reliability.html">
+                        <a rel="prev" href="../reliability/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="spark-configuration.html">
+                        <a rel="next" href="../spark-configuration/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -432,7 +432,7 @@
 
 <h1 id="getting-started">Getting Started<a class="headerlink" href="#getting-started" title="Permanent link">&para;</a></h1>
 <h2 id="using-iceberg-in-spark-3">Using Iceberg in Spark 3<a class="headerlink" href="#using-iceberg-in-spark-3" title="Permanent link">&para;</a></h2>
-<p>The latest version of Iceberg is <a href="releases.html">0.11.1</a>.</p>
+<p>The latest version of Iceberg is <a href="../releases/">0.11.1</a>.</p>
 <p>To use Iceberg in a Spark shell, use the <code>--packages</code> option:</p>
 <pre><code class="language-sh">spark-shell --packages org.apache.iceberg:iceberg-spark3-runtime:0.11.1
 </code></pre>
@@ -441,7 +441,7 @@
 <p>If you want to include Iceberg in your Spark installation, add the <a href="https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark3-runtime/0.11.1/iceberg-spark3-runtime-0.11.1.jar"><code>iceberg-spark3-runtime</code> Jar</a> to Spark&rsquo;s <code>jars</code> folder.</p>
 </div>
 <h3 id="adding-catalogs">Adding catalogs<a class="headerlink" href="#adding-catalogs" title="Permanent link">&para;</a></h3>
-<p>Iceberg comes with <a href="spark-configuration.html#catalogs">catalogs</a> that enable SQL commands to manage tables and load them by name. Catalogs are configured using properties under <code>spark.sql.catalog.(catalog_name)</code>.</p>
+<p>Iceberg comes with <a href="../spark-configuration/#catalogs">catalogs</a> that enable SQL commands to manage tables and load them by name. Catalogs are configured using properties under <code>spark.sql.catalog.(catalog_name)</code>.</p>
 <p>This command creates a path-based catalog named <code>local</code> for tables under <code>$PWD/warehouse</code> and adds support for Iceberg tables to Spark&rsquo;s built-in catalog:</p>
 <pre><code class="language-sh">spark-sql --packages org.apache.iceberg:iceberg-spark3-runtime:0.11.1\
     --conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions \
@@ -452,28 +452,28 @@
     --conf spark.sql.catalog.local.warehouse=$PWD/warehouse
 </code></pre>
 <h3 id="creating-a-table">Creating a table<a class="headerlink" href="#creating-a-table" title="Permanent link">&para;</a></h3>
-<p>To create your first Iceberg table in Spark, use the <code>spark-sql</code> shell or <code>spark.sql(...)</code> to run a <a href="spark-ddl.html#create-table"><code>CREATE TABLE</code></a> command:</p>
+<p>To create your first Iceberg table in Spark, use the <code>spark-sql</code> shell or <code>spark.sql(...)</code> to run a <a href="../spark-ddl/#create-table"><code>CREATE TABLE</code></a> command:</p>
 <pre><code class="language-sql">-- local is the path-based catalog defined above
 CREATE TABLE local.db.table (id bigint, data string) USING iceberg
 </code></pre>
 <p>Iceberg catalogs support the full range of SQL DDL commands, including:</p>
 <ul>
-<li><a href="spark-ddl.html#create-table"><code>CREATE TABLE ... PARTITIONED BY</code></a></li>
-<li><a href="spark-ddl.html#create-table-as-select"><code>CREATE TABLE ... AS SELECT</code></a></li>
-<li><a href="spark-ddl.html#alter-table"><code>ALTER TABLE</code></a></li>
-<li><a href="spark-ddl.html#drop-table"><code>DROP TABLE</code></a></li>
+<li><a href="../spark-ddl/#create-table"><code>CREATE TABLE ... PARTITIONED BY</code></a></li>
+<li><a href="../spark-ddl/#create-table-as-select"><code>CREATE TABLE ... AS SELECT</code></a></li>
+<li><a href="../spark-ddl/#alter-table"><code>ALTER TABLE</code></a></li>
+<li><a href="../spark-ddl/#drop-table"><code>DROP TABLE</code></a></li>
 </ul>
 <h3 id="writing">Writing<a class="headerlink" href="#writing" title="Permanent link">&para;</a></h3>
-<p>Once your table is created, insert data using <a href="spark-writes.html#insert-into"><code>INSERT INTO</code></a>:</p>
+<p>Once your table is created, insert data using <a href="../spark-writes/#insert-into"><code>INSERT INTO</code></a>:</p>
 <pre><code class="language-sql">INSERT INTO local.db.table VALUES (1, 'a'), (2, 'b'), (3, 'c');
 INSERT INTO local.db.table SELECT id, data FROM source WHERE length(data) = 1;
 </code></pre>
-<p>Iceberg also adds row-level SQL updates to Spark, <a href="spark-writes.html#merge-into"><code>MERGE INTO</code></a> and <a href="spark-writes.html#delete-from"><code>DELETE FROM</code></a>:</p>
+<p>Iceberg also adds row-level SQL updates to Spark, <a href="../spark-writes/#merge-into"><code>MERGE INTO</code></a> and <a href="../spark-writes/#delete-from"><code>DELETE FROM</code></a>:</p>
 <pre><code class="language-sql">MERGE INTO local.db.target t USING (SELECT * FROM updates) u ON t.id = u.id
 WHEN MATCHED THEN UPDATE SET t.count = t.count + u.count
 WHEN NOT MATCHED THEN INSERT *
 </code></pre>
-<p>Iceberg supports writing DataFrames using the new <a href="spark-writes.html#writing-with-dataframes">v2 DataFrame write API</a>:</p>
+<p>Iceberg supports writing DataFrames using the new <a href="../spark-writes/#writing-with-dataframes">v2 DataFrame write API</a>:</p>
 <pre><code class="language-scala">spark.table(&quot;source&quot;).select(&quot;id&quot;, &quot;data&quot;)
      .writeTo(&quot;local.db.table&quot;).append()
 </code></pre>
@@ -484,7 +484,7 @@ WHEN NOT MATCHED THEN INSERT *
 FROM local.db.table
 GROUP BY data
 </code></pre>
-<p>SQL is also the recommended way to <a href="spark-queries.html#inspecting-tables">inspect tables</a>. To view all of the snapshots in a table, use the <code>snapshots</code> metadata table:</p>
+<p>SQL is also the recommended way to <a href="../spark-queries/#inspecting-tables">inspect tables</a>. To view all of the snapshots in a table, use the <code>snapshots</code> metadata table:</p>
 <pre><code class="language-sql">SELECT * FROM local.db.table.snapshots
 </code></pre>
 <pre><code>+-------------------------+----------------+-----------+-----------+----------------------------------------------------+-----+
@@ -496,17 +496,17 @@ GROUP BY data
 | ...                     | ...            | ...       | ...       | ...                                                | ... |
 +-------------------------+----------------+-----------+-----------+----------------------------------------------------+-----+
 </code></pre>
-<p><a href="spark-queries.html#querying-with-dataframes">DataFrame reads</a> are supported and can now reference tables by name using <code>spark.table</code>:</p>
+<p><a href="../spark-queries/#querying-with-dataframes">DataFrame reads</a> are supported and can now reference tables by name using <code>spark.table</code>:</p>
 <pre><code class="language-scala">val df = spark.table(&quot;local.db.table&quot;)
 df.count()
 </code></pre>
 <h3 id="next-steps">Next steps<a class="headerlink" href="#next-steps" title="Permanent link">&para;</a></h3>
 <p>Next, you can learn more about Iceberg tables in Spark:</p>
 <ul>
-<li><a href="spark-ddl.html">DDL commands</a>: <code>CREATE</code>, <code>ALTER</code>, and <code>DROP</code></li>
-<li><a href="spark-queries.html">Querying data</a>: <code>SELECT</code> queries and metadata tables</li>
-<li><a href="spark-writes.html">Writing data</a>: <code>INSERT INTO</code> and <code>MERGE INTO</code></li>
-<li><a href="spark-procedures.html">Maintaining tables</a> with stored procedures</li>
+<li><a href="../spark-ddl/">DDL commands</a>: <code>CREATE</code>, <code>ALTER</code>, and <code>DROP</code></li>
+<li><a href="../spark-queries/">Querying data</a>: <code>SELECT</code> queries and metadata tables</li>
+<li><a href="../spark-writes/">Writing data</a>: <code>INSERT INTO</code> and <code>MERGE INTO</code></li>
+<li><a href="../spark-procedures/">Maintaining tables</a> with stored procedures</li>
 </ul></div>
         
         
@@ -529,7 +529,7 @@ df.count()
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -537,9 +537,9 @@ df.count()
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/hive.html b/hive/index.html
similarity index 93%
rename from hive.html
rename to hive/index.html
index 4b60b7b..a6db7c1 100644
--- a/hive.html
+++ b/hive/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/hive/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Hive - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li class="active">
-                        <a href="hive.html">Hive</a>
+                        <a href="./">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="flink.html">
+                        <a rel="prev" href="../flink/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="aws.html">
+                        <a rel="next" href="../aws/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -576,8 +576,8 @@ SET iceberg.catalog.glue.lock.table=myGlueLockTable;
 <h2 id="ddl-commands">DDL Commands<a class="headerlink" href="#ddl-commands" title="Permanent link">&para;</a></h2>
 <h3 id="create-external-table">CREATE EXTERNAL TABLE<a class="headerlink" href="#create-external-table" title="Permanent link">&para;</a></h3>
 <p>The <code>CREATE EXTERNAL TABLE</code> command is used to overlay a Hive table &ldquo;on top of&rdquo; an existing Iceberg table. 
-Iceberg tables are created using either a <a href="javadoc/master/index.html?org/apache/iceberg/catalog/Catalog.html"><code>Catalog</code></a>,
-or an implementation of the <a href="javadoc/master/index.html?org/apache/iceberg/Tables.html"><code>Tables</code></a> interface,
+Iceberg tables are created using either a <a href="../javadoc/master/?org/apache/iceberg/catalog/Catalog.html"><code>Catalog</code></a>,
+or an implementation of the <a href="../javadoc/master/?org/apache/iceberg/Tables.html"><code>Tables</code></a> interface,
 and Hive needs to be configured accordingly to operate on these different types of table.</p>
 <h4 id="hive-catalog-tables">Hive catalog tables<a class="headerlink" href="#hive-catalog-tables" title="Permanent link">&para;</a></h4>
 <p>As described before, tables created by the <code>HiveCatalog</code> with Hive engine feature enabled are directly visible by the Hive engine, so there is no need to create an overlay.</p>
@@ -916,7 +916,7 @@ The conversion applies on both creating Iceberg table and writing to Iceberg tab
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -924,9 +924,9 @@ The conversion applies on both creating Iceberg table and writing to Iceberg tab
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/how-to-release.html b/how-to-release/index.html
similarity index 90%
rename from how-to-release.html
rename to how-to-release/index.html
index ffd0e25..1c3a083 100644
--- a/how-to-release.html
+++ b/how-to-release/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/how-to-release/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>How to Release - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="how-to-release.html">How to Release</a>
+    <a href="./">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="trademarks.html">
+                        <a rel="prev" href="../trademarks/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="configuration.html">
+                        <a rel="next" href="../configuration/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -586,7 +586,7 @@ Thanks to everyone for contributing!
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -594,9 +594,9 @@ Thanks to everyone for contributing!
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/index.html b/index.html
index 07ded57..2b041c5 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
+    <link rel="canonical" href="https://iceberg.apache.org/">
     <link rel="shortcut icon" href="img/favicon.ico">
 
     
@@ -76,37 +76,37 @@
                         
                             
 <li class="active">
-    <a href="index.html">About</a>
+    <a href=".">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="spec/">Spec</a>
 </li>
 
                         
@@ -387,7 +387,7 @@
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="community.html">
+                        <a rel="next" href="community/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
diff --git a/java-api-quickstart.html b/java-api-quickstart/index.html
similarity index 88%
rename from java-api-quickstart.html
rename to java-api-quickstart/index.html
index ad3b3df..7f841d1 100644
--- a/java-api-quickstart.html
+++ b/java-api-quickstart/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/java-api-quickstart/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Java Quickstart - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="./">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="api.html">
+                        <a rel="prev" href="../api/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="custom-catalog.html">
+                        <a rel="next" href="../custom-catalog/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -439,7 +439,7 @@
 
 <h1 id="java-api-quickstart">Java API Quickstart<a class="headerlink" href="#java-api-quickstart" title="Permanent link">&para;</a></h1>
 <h2 id="create-a-table">Create a table<a class="headerlink" href="#create-a-table" title="Permanent link">&para;</a></h2>
-<p>Tables are created using either a <a href="javadoc/master/index.html?org/apache/iceberg/catalog/Catalog.html"><code>Catalog</code></a> or an implementation of the <a href="javadoc/master/index.html?org/apache/iceberg/Tables.html"><code>Tables</code></a> interface.</p>
+<p>Tables are created using either a <a href="../javadoc/master/?org/apache/iceberg/catalog/Catalog.html"><code>Catalog</code></a> or an implementation of the <a href="../javadoc/master/?org/apache/iceberg/Tables.html"><code>Tables</code></a> interface.</p>
 <h3 id="using-a-hive-catalog">Using a Hive catalog<a class="headerlink" href="#using-a-hive-catalog" title="Permanent link">&para;</a></h3>
 <p>The Hive catalog connects to a Hive MetaStore to keep track of Iceberg tables. This example uses Spark&rsquo;s Hadoop configuration to get a Hive catalog:</p>
 <pre><code class="language-java">import org.apache.iceberg.hive.HiveCatalog;
@@ -501,9 +501,9 @@ Table table = tables.create(schema, spec, table_location);
 <p>Spark uses both <code>HiveCatalog</code> and <code>HadoopTables</code> to load tables. Hive is used when the identifier passed to <code>load</code> or <code>save</code> is not a path, otherwise Spark assumes it is a path-based table.</p>
 <p>To read and write to tables from Spark see:</p>
 <ul>
-<li><a href="./spark.md#reading-an-iceberg-table">Reading a table in Spark</a></li>
-<li><a href="./spark.md#appending-data">Appending to a table in Spark</a></li>
-<li><a href="./spark.md#overwriting-data">Overwriting data in a table in Spark</a></li>
+<li><a href="../spark-queries/#querying-with-sql">SQL queries in Spark</a></li>
+<li><a href="../spark-writes/#insert-into"><code>INSERT INTO</code> in Spark</a></li>
+<li><a href="../spark-writes/#merge-into"><code>MERGE INTO</code> in Spark</a></li>
 </ul>
 <h2 id="schemas">Schemas<a class="headerlink" href="#schemas" title="Permanent link">&para;</a></h2>
 <h3 id="create-a-schema">Create a schema<a class="headerlink" href="#create-a-schema" title="Permanent link">&para;</a></h3>
@@ -546,7 +546,7 @@ PartitionSpec spec = PartitionSpec.builderFor(schema)
       .identity(&quot;level&quot;)
       .build();
 </code></pre>
-<p>For more information on the different partition transforms that Iceberg offers, visit <a href="spec.html#partitioning">this page</a>.</p></div>
+<p>For more information on the different partition transforms that Iceberg offers, visit <a href="../spec/#partitioning">this page</a>.</p></div>
         
         
     </div>
@@ -568,7 +568,7 @@ PartitionSpec spec = PartitionSpec.builderFor(schema)
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -576,9 +576,9 @@ PartitionSpec spec = PartitionSpec.builderFor(schema)
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/maintenance.html b/maintenance/index.html
similarity index 86%
rename from maintenance.html
rename to maintenance/index.html
index bb547a3..67677c0 100644
--- a/maintenance.html
+++ b/maintenance/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/maintenance/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Maintenance - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="maintenance.html">Maintenance</a>
+    <a href="./">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="evolution.html">
+                        <a rel="prev" href="../evolution/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="performance.html">
+                        <a rel="next" href="../performance/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -440,7 +440,7 @@
 <h2 id="recommended-maintenance">Recommended Maintenance<a class="headerlink" href="#recommended-maintenance" title="Permanent link">&para;</a></h2>
 <h3 id="expire-snapshots">Expire Snapshots<a class="headerlink" href="#expire-snapshots" title="Permanent link">&para;</a></h3>
 <p>Each write to an Iceberg table creates a new <em>snapshot</em>, or version, of a table. Snapshots can be used for time-travel queries, or the table can be rolled back to any valid snapshot.</p>
-<p>Snapshots accumulate until they are expired by the <a href="javadoc/master/org/apache/iceberg/Table.html#expireSnapshots--"><code>expireSnapshots</code></a> operation. Regularly expiring snapshots is recommended to delete data files that are no longer needed, and to keep the size of table metadata small.</p>
+<p>Snapshots accumulate until they are expired by the <a href="../javadoc/0.11.1/org/apache/iceberg/Table.html#expireSnapshots--"><code>expireSnapshots</code></a> operation. Regularly expiring snapshots is recommended to delete data files that are no longer needed, and to keep the size of table metadata small.</p>
 <p>This example expires snapshots that are older than 1 day:</p>
 <pre><code class="language-java">Table table = ...
 long tsToExpire = System.currentTimeMillis() - (1000 * 60 * 60 * 24); // 1 day
@@ -448,7 +448,7 @@ table.expireSnapshots()
      .expireOlderThan(tsToExpire)
      .commit();
 </code></pre>
-<p>See the <a href="javadoc/master/org/apache/iceberg/ExpireSnapshots.html"><code>ExpireSnapshots</code> Javadoc</a> to see more configuration options.</p>
+<p>See the <a href="../javadoc/0.11.1/org/apache/iceberg/ExpireSnapshots.html"><code>ExpireSnapshots</code> Javadoc</a> to see more configuration options.</p>
 <p>There is also a Spark action that can run table expiration in parallel for large tables:</p>
 <pre><code class="language-java">Actions.forTable(table)
     .expireSnapshots()
@@ -492,7 +492,7 @@ Actions.forTable(table)
     .removeOrphanFiles()
     .execute();
 </code></pre>
-<p>See the <a href="./javadoc/master/org/apache/iceberg/RemoveOrphanFilesAction.html">RemoveOrphanFilesAction Javadoc</a> to see more configuration options.</p>
+<p>See the <a href="../javadoc/0.11.1/org/apache/iceberg/actions/RemoveOrphanFilesAction.html">RemoveOrphanFilesAction Javadoc</a> to see more configuration options.</p>
 <p>This action may take a long time to finish if you have lots of files in data and metadata directories. It is recommended to execute this periodically, but you may not need to execute this often.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
@@ -519,7 +519,7 @@ Actions.forTable(table).rewriteDataFiles()
     .execute();
 </code></pre>
 <p>The <code>files</code> metadata table is useful for inspecting data file sizes and determining when to compact partitons.</p>
-<p>See the <a href="./javadoc/master/org/apache/iceberg/RewriteDataFilesAction.html"><code>RewriteDataFilesAction</code> Javadoc</a> to see more configuration options.</p>
+<p>See the <a href="../javadoc/0.11.1/org/apache/iceberg/actions/RewriteDataFilesAction.html"><code>RewriteDataFilesAction</code> Javadoc</a> to see more configuration options.</p>
 <h3 id="rewrite-manifests">Rewrite manifests<a class="headerlink" href="#rewrite-manifests" title="Permanent link">&para;</a></h3>
 <p>Iceberg uses metadata in its manifest list and manifest files speed up query planning and to prune unnecessary data files. The metadata tree functions as an index over a table&rsquo;s data.</p>
 <p>Manifests in the metadata tree are automatically compacted in the order they are added, which makes queries faster when the write pattern aligns with read filters. For example, writing hourly-partitioned data as it arrives is aligned with time range query filters.</p>
@@ -531,7 +531,7 @@ table.rewriteManifests()
     .clusterBy(file -&gt; file.partition().get(0, Integer.class))
     .commit();
 </code></pre>
-<p>See the <a href="./javadoc/master/org/apache/iceberg/RewriteManifestsAction.html"><code>RewriteManifestsAction</code> Javadoc</a> to see more configuration options.</p></div>
+<p>See the <a href="../javadoc/0.11.1/org/apache/iceberg/actions/RewriteManifestsAction.html"><code>RewriteManifestsAction</code> Javadoc</a> to see more configuration options.</p></div>
         
         
     </div>
@@ -553,7 +553,7 @@ table.rewriteManifests()
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -561,9 +561,9 @@ table.rewriteManifests()
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/nessie.html b/nessie/index.html
similarity index 90%
rename from nessie.html
rename to nessie/index.html
index 55b2dca..7e10d19 100644
--- a/nessie.html
+++ b/nessie/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/nessie/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Nessie - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="nessie.html">Nessie</a>
+    <a href="./">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="aws.html">
+                        <a rel="prev" href="../aws/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="api.html">
+                        <a rel="next" href="../api/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -474,7 +474,7 @@ conf.set(&quot;spark.sql.catalog.nessie.ref&quot;, &quot;main&quot;)
 conf.set(&quot;spark.sql.catalog.nessie.catalog-impl&quot;, &quot;org.apache.iceberg.nessie.NessieCatalog&quot;)
 conf.set(&quot;spark.sql.catalog.nessie&quot;, &quot;org.apache.iceberg.spark.SparkCatalog&quot;)
 </code></pre>
-<p>This is how it looks in Flink via the Python API (additional details can be found <a href="flink.html">here</a>):</p>
+<p>This is how it looks in Flink via the Python API (additional details can be found <a href="../flink/">here</a>):</p>
 <pre><code class="language-python">import os
 from pyflink.datastream import StreamExecutionEnvironment
 from pyflink.table import StreamTableEnvironment
@@ -560,7 +560,7 @@ for different examples of Nessie and Iceberg in action together.</p>
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -568,9 +568,9 @@ for different examples of Nessie and Iceberg in action together.</p>
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/partitioning.html b/partitioning/index.html
similarity index 89%
rename from partitioning.html
rename to partitioning/index.html
index 0f25def..90f6551 100644
--- a/partitioning.html
+++ b/partitioning/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/partitioning/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Partitioning - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="partitioning.html">Partitioning</a>
+    <a href="./">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="schemas.html">
+                        <a rel="prev" href="../schemas/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="evolution.html">
+                        <a rel="next" href="../evolution/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -502,7 +502,7 @@ WHERE event_time BETWEEN '2018-12-01 10:00:00' AND '2018-12-01 12:00:00'
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -510,9 +510,9 @@ WHERE event_time BETWEEN '2018-12-01 10:00:00' AND '2018-12-01 12:00:00'
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/performance.html b/performance/index.html
similarity index 87%
rename from performance.html
rename to performance/index.html
index 183b8fa..b1a109f 100644
--- a/performance.html
+++ b/performance/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/performance/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Performance - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="performance.html">Performance</a>
+    <a href="./">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="maintenance.html">
+                        <a rel="prev" href="../maintenance/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="reliability.html">
+                        <a rel="next" href="../reliability/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -473,7 +473,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -481,9 +481,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/presto/index.html b/presto/index.html
new file mode 100644
index 0000000..331eeb9
--- /dev/null
+++ b/presto/index.html
@@ -0,0 +1,15 @@
+
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Redirecting...</title>
+    <link rel="canonical" href="../trino/">
+    <meta name="robots" content="noindex">
+    <script>var anchor=window.location.hash.substr(1);location.href="../trino/"+(anchor?"#"+anchor:"")</script>
+    <meta http-equiv="refresh" content="0; url=../trino/">
+</head>
+<body>
+Redirecting...
+</body>
+</html>
diff --git a/python-api-intro.html b/python-api-intro/index.html
similarity index 89%
rename from python-api-intro.html
rename to python-api-intro/index.html
index 6998bb5..0af7259 100644
--- a/python-api-intro.html
+++ b/python-api-intro/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/python-api-intro/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Python API Intro - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="./">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="python-quickstart.html">
+                        <a rel="prev" href="../python-quickstart/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="python-feature-support.html">
+                        <a rel="next" href="../python-feature-support/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -565,7 +565,7 @@ list_var = ListType.of_required(1, IntegerType.get());
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -573,9 +573,9 @@ list_var = ListType.of_required(1, IntegerType.get());
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/python-feature-support.html b/python-feature-support/index.html
similarity index 88%
rename from python-feature-support.html
rename to python-feature-support/index.html
index eea5d98..23ec6fd 100644
--- a/python-feature-support.html
+++ b/python-feature-support/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/python-feature-support/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Python Feature Support - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="./">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="python-api-intro.html">
+                        <a rel="prev" href="../python-api-intro/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="terms.html">
+                        <a rel="next" href="../terms/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -606,7 +606,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -614,9 +614,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/python-quickstart.html b/python-quickstart/index.html
similarity index 86%
rename from python-quickstart.html
rename to python-quickstart/index.html
index a5481fe..34cc855 100644
--- a/python-quickstart.html
+++ b/python-quickstart/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/python-quickstart/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Python Quickstart - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="./">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="custom-catalog.html">
+                        <a rel="prev" href="../custom-catalog/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="python-api-intro.html">
+                        <a rel="next" href="../python-api-intro/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -484,7 +484,7 @@ pprint(int(tbl.current_snapshot().summary.get(&quot;total-records&quot;)))
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -492,9 +492,9 @@ pprint(int(tbl.current_snapshot().summary.get(&quot;total-records&quot;)))
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/releases.html b/releases/index.html
similarity index 92%
rename from releases.html
rename to releases/index.html
index aad849e..22494b7 100644
--- a/releases.html
+++ b/releases/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/releases/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Releases - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="releases.html">Releases</a>
+    <a href="./">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="community.html">
+                        <a rel="prev" href="../community/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="blogs.html">
+                        <a rel="next" href="../blogs/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -606,7 +606,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -614,9 +614,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/reliability.html b/reliability/index.html
similarity index 87%
rename from reliability.html
rename to reliability/index.html
index e984443..0a1bd0f 100644
--- a/reliability.html
+++ b/reliability/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/reliability/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Reliability - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="reliability.html">Reliability</a>
+    <a href="./">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="performance.html">
+                        <a rel="prev" href="../performance/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="getting-started.html">
+                        <a rel="next" href="../getting-started/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -432,7 +432,7 @@
 <h1 id="reliability">Reliability<a class="headerlink" href="#reliability" title="Permanent link">&para;</a></h1>
 <p>Iceberg was designed to solve correctness problems that affect Hive tables running in S3.</p>
 <p>Hive tables track data files using both a central metastore for partitions and a file system for individual files. This makes atomic changes to a table&rsquo;s contents impossible, and eventually consistent stores like S3 may return incorrect results due to the use of listing files to reconstruct the state of a table. It also requires job planning to make many slow listing calls: O(n) with the number of partitions.</p>
-<p>Iceberg tracks the complete list of data files in each <a href="terms.html#snapshot">snapshot</a> using a persistent tree structure. Every write or delete produces a new snapshot that reuses as much of the previous snapshot&rsquo;s metadata tree as possible to avoid high write volumes.</p>
+<p>Iceberg tracks the complete list of data files in each <a href="../terms/#snapshot">snapshot</a> using a persistent tree structure. Every write or delete produces a new snapshot that reuses as much of the previous snapshot&rsquo;s metadata tree as possible to avoid high write volumes.</p>
 <p>Valid snapshots in an Iceberg table are stored in the table metadata file, along with a reference to the current snapshot. Commits replace the path of the current table metadata file using an atomic operation. This ensures that all updates to table data and metadata are atomic, and is the basis for <a href="https://en.wikipedia.org/wiki/Isolation_(database_systems)#Serializable">serializable isolation</a>.</p>
 <p>This results in improved reliability guarantees:</p>
 <ul>
@@ -480,7 +480,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -488,9 +488,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/schemas.html b/schemas/index.html
similarity index 85%
rename from schemas.html
rename to schemas/index.html
index 620b99b..9c5699e 100644
--- a/schemas.html
+++ b/schemas/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/schemas/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Schemas - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="schemas.html">Schemas</a>
+    <a href="./">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="configuration.html">
+                        <a rel="prev" href="../configuration/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="partitioning.html">
+                        <a rel="next" href="../partitioning/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -516,7 +516,7 @@
 </tr>
 </tbody>
 </table>
-<p>Iceberg tracks each field in a table schema using an ID that is never reused in a table. See <a href="evolution.html#correctness">correctness guarantees</a> for more information.</p></div>
+<p>Iceberg tracks each field in a table schema using an ID that is never reused in a table. See <a href="../evolution/#correctness">correctness guarantees</a> for more information.</p></div>
         
         
     </div>
@@ -538,7 +538,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -546,9 +546,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/sitemap.xml b/sitemap.xml
index d0f66fa..e5bfae3 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,177 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/api/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/aws/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/blogs/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/community/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/configuration/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/custom-catalog/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/evolution/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/flink/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/getting-started/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/hive/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/how-to-release/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/java-api-quickstart/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/maintenance/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/nessie/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/partitioning/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/performance/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/python-api-intro/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/python-feature-support/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/python-quickstart/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/releases/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/reliability/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/schemas/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/snapshots/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-configuration/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-ddl/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-procedures/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-queries/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-structured-streaming/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spark-writes/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/spec/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/terms/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/trademarks/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/trino/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
+         <loc>https://iceberg.apache.org/why-iceberg/</loc>
          <lastmod>2021-06-29</lastmod>
          <changefreq>daily</changefreq>
     </url>
diff --git a/sitemap.xml.gz b/sitemap.xml.gz
index 9e94d55..f94fae8 100644
Binary files a/sitemap.xml.gz and b/sitemap.xml.gz differ
diff --git a/snapshots.html b/snapshots/index.html
similarity index 85%
rename from snapshots.html
rename to snapshots/index.html
index f8001f0..8b976e2 100644
--- a/snapshots.html
+++ b/snapshots/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/snapshots/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Snapshots - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -441,7 +441,7 @@
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -449,9 +449,9 @@
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/spark-configuration.html b/spark-configuration/index.html
similarity index 90%
rename from spark-configuration.html
rename to spark-configuration/index.html
index 5a78ec2..1cf2a0b 100644
--- a/spark-configuration.html
+++ b/spark-configuration/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/spark-configuration/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Configuration - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="./">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="getting-started.html">
+                        <a rel="prev" href="../getting-started/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="spark-ddl.html">
+                        <a rel="next" href="../spark-ddl/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -503,7 +503,7 @@ spark.sql.catalog.hadoop_prod.warehouse = hdfs://nn:8020/warehouse/path
 </tr>
 </tbody>
 </table>
-<p>Additional properties can be found in common <a href="configuration.html#catalog-properties">catalog configuration</a>.</p>
+<p>Additional properties can be found in common <a href="../configuration/#catalog-properties">catalog configuration</a>.</p>
 <h3 id="using-catalogs">Using catalogs<a class="headerlink" href="#using-catalogs" title="Permanent link">&para;</a></h3>
 <p>Catalog names are used in SQL queries to identify a table. In the examples above, <code>hive_prod</code> and <code>hadoop_prod</code> can be used to prefix database and table names that will be loaded from those catalogs.</p>
 <pre><code class="language-sql">SELECT * FROM hive_prod.db.table -- load db.table from catalog hive_prod
@@ -672,7 +672,7 @@ df.write
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -680,9 +680,9 @@ df.write
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/spark-ddl.html b/spark-ddl/index.html
similarity index 90%
rename from spark-ddl.html
rename to spark-ddl/index.html
index c316f55..40bf7a5 100644
--- a/spark-ddl.html
+++ b/spark-ddl/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/spark-ddl/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>DDL - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="spark-ddl.html">DDL</a>
+    <a href="./">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="spark-configuration.html">
+                        <a rel="prev" href="../spark-configuration/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="spark-queries.html">
+                        <a rel="next" href="../spark-queries/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -446,11 +446,11 @@
  -->
 
 <h1 id="spark-ddl">Spark DDL<a class="headerlink" href="#spark-ddl" title="Permanent link">&para;</a></h1>
-<p>To use Iceberg in Spark, first configure <a href="spark-configuration.html">Spark catalogs</a>.</p>
+<p>To use Iceberg in Spark, first configure <a href="../spark-configuration/">Spark catalogs</a>.</p>
 <p>Iceberg uses Apache Spark&rsquo;s DataSourceV2 API for data source and catalog implementations. Spark DSv2 is an evolving API with different levels of support in Spark versions. Spark 2.4 does not support SQL DDL.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>Spark 2.4 can&rsquo;t create Iceberg tables with DDL, instead use Spark 3.x or the <a href="java-api-quickstart.html">Iceberg API</a>.</p>
+<p>Spark 2.4 can&rsquo;t create Iceberg tables with DDL, instead use Spark 3.x or the <a href="../java-api-quickstart/">Iceberg API</a>.</p>
 </div>
 <h2 id="create-table"><code>CREATE TABLE</code><a class="headerlink" href="#create-table" title="Permanent link">&para;</a></h2>
 <p>Spark 3.0 can create tables in any Iceberg catalog with the clause <code>USING iceberg</code>:</p>
@@ -459,13 +459,13 @@
     data string)
 USING iceberg
 </code></pre>
-<p>Iceberg will convert the column type in Spark to corresponding Iceberg type. Please check the section of <a href="spark-writes.html#spark-type-to-iceberg-type">type compatibility on creating table</a> for details.</p>
+<p>Iceberg will convert the column type in Spark to corresponding Iceberg type. Please check the section of <a href="../spark-writes/#spark-type-to-iceberg-type">type compatibility on creating table</a> for details.</p>
 <p>Table create commands, including CTAS and RTAS, support the full range of Spark create clauses, including:</p>
 <ul>
 <li><code>PARTITION BY (partition-expressions)</code> to configure partitioning</li>
 <li><code>LOCATION '(fully-qualified-uri)'</code> to set the table location</li>
 <li><code>COMMENT 'table documentation'</code> to set a table description</li>
-<li><code>TBLPROPERTIES ('key'='value', ...)</code> to set <a href="configuration.html">table configuration</a></li>
+<li><code>TBLPROPERTIES ('key'='value', ...)</code> to set <a href="../configuration/">table configuration</a></li>
 </ul>
 <p>Create commands may also set the default format with the <code>USING</code> clause. This is only supported for <code>SparkCatalog</code> because Spark handles the <code>USING</code> clause differently for the built-in catalog.</p>
 <h3 id="partitioned-by"><code>PARTITIONED BY</code><a class="headerlink" href="#partitioned-by" title="Permanent link">&para;</a></h3>
@@ -477,7 +477,7 @@ USING iceberg
 USING iceberg
 PARTITIONED BY (category)
 </code></pre>
-<p>The <code>PARTITIONED BY</code> clause supports transform expressions to create <a href="partitioning.html">hidden partitions</a>.</p>
+<p>The <code>PARTITIONED BY</code> clause supports transform expressions to create <a href="../partitioning/">hidden partitions</a>.</p>
 <pre><code class="language-sql">CREATE TABLE prod.db.sample (
     id bigint,
     data string,
@@ -533,7 +533,7 @@ The new table properties in the <code>REPLACE TABLE</code> command will be merge
 <li>Widening the type of <code>int</code>, <code>float</code>, and <code>decimal</code> fields</li>
 <li>Making required columns optional</li>
 </ul>
-<p>In addition, <a href="spark-configuration.html#sql-extensions">SQL extensions</a> can be used to add support for partition evolution and setting a table&rsquo;s write order</p>
+<p>In addition, <a href="../spark-configuration/#sql-extensions">SQL extensions</a> can be used to add support for partition evolution and setting a table&rsquo;s write order</p>
 <h3 id="alter-table-rename-to"><code>ALTER TABLE ... RENAME TO</code><a class="headerlink" href="#alter-table-rename-to" title="Permanent link">&para;</a></h3>
 <pre><code class="language-sql">ALTER TABLE prod.db.sample RENAME TO prod.db.new_name
 </code></pre>
@@ -542,7 +542,7 @@ The new table properties in the <code>REPLACE TABLE</code> command will be merge
     'read.split.target-size'='268435456'
 )
 </code></pre>
-<p>Iceberg uses table properties to control table behavior. For a list of available properties, see <a href="configuration.html">Table configuration</a>.</p>
+<p>Iceberg uses table properties to control table behavior. For a list of available properties, see <a href="../configuration/">Table configuration</a>.</p>
 <p><code>UNSET</code> is used to remove properties:</p>
 <pre><code class="language-sql">ALTER TABLE prod.db.sample UNSET TBLPROPERTIES ('read.split.target-size')
 </code></pre>
@@ -609,7 +609,7 @@ ALTER TABLE prod.db.sample ALTER COLUMN measurement COMMENT 'unit is kilobytes p
 ALTER TABLE prod.db.sample DROP COLUMN point.z
 </code></pre>
 <h2 id="alter-table-sql-extensions"><code>ALTER TABLE</code> SQL extensions<a class="headerlink" href="#alter-table-sql-extensions" title="Permanent link">&para;</a></h2>
-<p>These commands are available in Spark 3.x when using Iceberg <a href="spark-configuration.html#sql-extensions">SQL extensions</a>.</p>
+<p>These commands are available in Spark 3.x when using Iceberg <a href="../spark-configuration/#sql-extensions">SQL extensions</a>.</p>
 <h3 id="alter-table-add-partition-field"><code>ALTER TABLE ... ADD PARTITION FIELD</code><a class="headerlink" href="#alter-table-add-partition-field" title="Permanent link">&para;</a></h3>
 <p>Iceberg supports adding new partition fields to a spec using <code>ADD PARTITION FIELD</code>:</p>
 <pre><code class="language-sql">ALTER TABLE prod.db.sample ADD PARTITION FIELD catalog -- identity transform
@@ -685,7 +685,7 @@ ALTER TABLE prod.db.sample WRITE ORDERED BY category ASC NULLS LAST, id DESC NUL
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -693,9 +693,9 @@ ALTER TABLE prod.db.sample WRITE ORDERED BY category ASC NULLS LAST, id DESC NUL
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/spark-procedures.html b/spark-procedures/index.html
similarity index 92%
rename from spark-procedures.html
rename to spark-procedures/index.html
index d6fb6f5..8febe91 100644
--- a/spark-procedures.html
+++ b/spark-procedures/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/spark-procedures/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Maintenance Procedures - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-queries.html">Queries</a>
+    <a href="../spark-queries/">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="./">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="../spark-queries/#time-travel">Time Travel</a>
 </li>
 
                         
@@ -230,13 +230,13 @@
                 
                 
                     <li >
-                        <a href="flink.html">Flink</a>
+                        <a href="../flink/">Flink</a>
                     </li>
                 
                 
                 
                     <li >
-                        <a href="hive.html">Hive</a>
+                        <a href="../hive/">Hive</a>
                     </li>
                 
                 
@@ -247,13 +247,13 @@
                         
                             
 <li >
-    <a href="aws.html">AWS</a>
+    <a href="../aws/">AWS</a>
 </li>
 
                         
                             
 <li >
-    <a href="nessie.html">Nessie</a>
+    <a href="../nessie/">Nessie</a>
 </li>
 
                         
@@ -274,37 +274,37 @@
                         
                             
 <li >
-    <a href="api.html">Java API intro</a>
+    <a href="../api/">Java API intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="java-api-quickstart.html">Java Quickstart</a>
+    <a href="../java-api-quickstart/">Java Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="custom-catalog.html">Java Custom Catalog</a>
+    <a href="../custom-catalog/">Java Custom Catalog</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-quickstart.html">Python Quickstart</a>
+    <a href="../python-quickstart/">Python Quickstart</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-api-intro.html">Python API Intro</a>
+    <a href="../python-api-intro/">Python API Intro</a>
 </li>
 
                         
                             
 <li >
-    <a href="python-feature-support.html">Python Feature Support</a>
+    <a href="../python-feature-support/">Python Feature Support</a>
 </li>
 
                         
@@ -319,13 +319,13 @@
                         
                             
 <li >
-    <a href="terms.html">Definitions</a>
+    <a href="../terms/">Definitions</a>
 </li>
 
                         
                             
 <li >
-    <a href="spec.html">Spec</a>
+    <a href="../spec/">Spec</a>
 </li>
 
                         
@@ -382,12 +382,12 @@
 
             <ul class="nav navbar-nav navbar-right">
                     <li >
-                        <a rel="prev" href="spark-writes.html">
+                        <a rel="prev" href="../spark-writes/">
                             <i class="fas fa-arrow-left"></i> Previous
                         </a>
                     </li>
                     <li >
-                        <a rel="next" href="spark-structured-streaming.html">
+                        <a rel="next" href="../spark-structured-streaming/">
                             Next <i class="fas fa-arrow-right"></i>
                         </a>
                     </li>
@@ -443,7 +443,7 @@
  -->
 
 <h1 id="spark-procedures">Spark Procedures<a class="headerlink" href="#spark-procedures" title="Permanent link">&para;</a></h1>
-<p>To use Iceberg in Spark, first configure <a href="spark-configuration.html">Spark catalogs</a>. Stored procedures are only available when using <a href="spark-configuration.html#sql-extensions">Iceberg SQL extensions</a> in Spark 3.x.</p>
+<p>To use Iceberg in Spark, first configure <a href="../spark-configuration/">Spark catalogs</a>. Stored procedures are only available when using <a href="../spark-configuration/#sql-extensions">Iceberg SQL extensions</a> in Spark 3.x.</p>
 <h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">&para;</a></h2>
 <p>Procedures can be used from any configured Iceberg catalog with <code>CALL</code>. All procedures are in the namespace <code>system</code>.</p>
 <p><code>CALL</code> supports passing arguments by name (recommended) or by position. Mixing position and named arguments is not supported.</p>
@@ -680,7 +680,7 @@
 <pre><code class="language-sql">CALL catalog_name.system.cherrypick_snapshot(snapshot_id =&gt; 1, table =&gt; 'my_table' )
 </code></pre>
 <h2 id="metadata-management">Metadata management<a class="headerlink" href="#metadata-management" title="Permanent link">&para;</a></h2>
-<p>Many <a href="maintenance.html">maintenance actions</a> can be performed using Iceberg stored procedures.</p>
+<p>Many <a href="../maintenance/">maintenance actions</a> can be performed using Iceberg stored procedures.</p>
 <h3 id="expire_snapshots"><code>expire_snapshots</code><a class="headerlink" href="#expire_snapshots" title="Permanent link">&para;</a></h3>
 <p>Each write/update/delete/upsert/compaction in Iceberg produces a new snapshot while keeping the old data and metadata
 around for snapshot isolation and time travel. The <code>expire_snapshots</code> procedure can be used to remove older snapshots
@@ -818,7 +818,7 @@ the <code>expire_snapshots</code> procedure will never remove files which are st
 <h3 id="rewrite_manifests"><code>rewrite_manifests</code><a class="headerlink" href="#rewrite_manifests" title="Permanent link">&para;</a></h3>
 <p>Rewrite manifests for a table to optimize scan planning.</p>
 <p>Data files in manifests are sorted by fields in the partition spec. This procedure runs in parallel using a Spark job.</p>
-<p>See the <a href="./javadoc/master/org/apache/iceberg/actions/RewriteManifestsAction.html"><code>RewriteManifestsAction</code> Javadoc</a>
+<p>See the <a href="../javadoc/0.11.1/org/apache/iceberg/actions/RewriteManifestsAction.html"><code>RewriteManifestsAction</code> Javadoc</a>
 to see more configuration options.</p>
 <p><strong>Note</strong> this procedure invalidates all cached Spark plans that reference the affected table.</p>
 <h4 id="usage_7">Usage<a class="headerlink" href="#usage_7" title="Permanent link">&para;</a></h4>
@@ -1027,7 +1027,7 @@ Existing data files are added to the Iceberg table&rsquo;s metadata and can be r
       </footer>
     
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap-3.0.3.min.js"></script>
+    <script src="../js/bootstrap-3.0.3.min.js"></script>
 
     
     <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/highlight.min.js"></script>
@@ -1035,9 +1035,9 @@ Existing data files are added to the Iceberg table&rsquo;s metadata and can be r
     <script>hljs.initHighlightingOnLoad();</script>
     
 
-    <script>var base_url = "."</script>
+    <script>var base_url = ".."</script>
     
-    <script src="js/base.js"></script>
+    <script src="../js/base.js"></script>
 
     <div class="modal" id="mkdocs_keyboard_modal" tabindex="-1" role="dialog" aria-labelledby="keyboardModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/spark-queries.html b/spark-queries/index.html
similarity index 92%
rename from spark-queries.html
rename to spark-queries/index.html
index 6d27d09..e598f79 100644
--- a/spark-queries.html
+++ b/spark-queries/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="A table format for large, slow-moving tabular data">
     
-    
-    <link rel="shortcut icon" href="img/favicon.ico">
+    <link rel="canonical" href="https://iceberg.apache.org/spark-queries/">
+    <link rel="shortcut icon" href="../img/favicon.ico">
 
     
     <title>Queries - Apache Iceberg</title>
@@ -19,16 +19,16 @@
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3.3.0/build/web/hack.min.css">
     <link href='//rsms.me/inter/inter.css' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,600,700&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-    <link href="css/bootstrap-custom.min.css" rel="stylesheet">
-    <link href="css/base.min.css" rel="stylesheet">
-    <link href="css/cinder.min.css" rel="stylesheet">
+    <link href="../css/bootstrap-custom.min.css" rel="stylesheet">
+    <link href="../css/base.min.css" rel="stylesheet">
+    <link href="../css/cinder.min.css" rel="stylesheet">
 
     
         
         <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.0/build/styles/github.min.css">
         
     
-    <link href="css/extra.css" rel="stylesheet">
+    <link href="../css/extra.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -60,7 +60,7 @@
             <!-- Main title -->
 
             
-              <a class="navbar-brand" href=".">Apache Iceberg</a>
+              <a class="navbar-brand" href="..">Apache Iceberg</a>
             
         </div>
 
@@ -76,37 +76,37 @@
                         
                             
 <li >
-    <a href="index.html">About</a>
+    <a href="..">About</a>
 </li>
 
                         
                             
 <li >
-    <a href="community.html">Community</a>
+    <a href="../community/">Community</a>
 </li>
 
                         
                             
 <li >
-    <a href="releases.html">Releases</a>
+    <a href="../releases/">Releases</a>
 </li>
 
                         
                             
 <li >
-    <a href="blogs.html">Blogs</a>
+    <a href="../blogs/">Blogs</a>
 </li>
 
                         
                             
 <li >
-    <a href="trademarks.html">Trademarks</a>
+    <a href="../trademarks/">Trademarks</a>
 </li>
 
                         
                             
 <li >
-    <a href="how-to-release.html">How to Release</a>
+    <a href="../how-to-release/">How to Release</a>
 </li>
 
                         
@@ -121,43 +121,43 @@
                         
                             
 <li >
-    <a href="configuration.html">Configuration</a>
+    <a href="../configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="schemas.html">Schemas</a>
+    <a href="../schemas/">Schemas</a>
 </li>
 
                         
                             
 <li >
-    <a href="partitioning.html">Partitioning</a>
+    <a href="../partitioning/">Partitioning</a>
 </li>
 
                         
                             
 <li >
-    <a href="evolution.html">Table evolution</a>
+    <a href="../evolution/">Table evolution</a>
 </li>
 
                         
                             
 <li >
-    <a href="maintenance.html">Maintenance</a>
+    <a href="../maintenance/">Maintenance</a>
 </li>
 
                         
                             
 <li >
-    <a href="performance.html">Performance</a>
+    <a href="../performance/">Performance</a>
 </li>
 
                         
                             
 <li >
-    <a href="reliability.html">Reliability</a>
+    <a href="../reliability/">Reliability</a>
 </li>
 
                         
@@ -172,49 +172,49 @@
                         
                             
 <li >
-    <a href="getting-started.html">Getting Started</a>
+    <a href="../getting-started/">Getting Started</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-configuration.html">Configuration</a>
+    <a href="../spark-configuration/">Configuration</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-ddl.html">DDL</a>
+    <a href="../spark-ddl/">DDL</a>
 </li>
 
                         
                             
 <li class="active">
-    <a href="spark-queries.html">Queries</a>
+    <a href="./">Queries</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-writes.html">Writes</a>
+    <a href="../spark-writes/">Writes</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-procedures.html">Maintenance Procedures</a>
+    <a href="../spark-procedures/">Maintenance Procedures</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark-structured-streaming.html">Structured Streaming</a>
+    <a href="../spark-structured-streaming/">Structured Streaming</a>
 </li>
 
                         
                             
 <li >
-    <a href="spark#time-travel">Time Travel</a>
+    <a href="#time-travel">Time Travel</a>
 </li>
 
... 2507 lines suppressed ...