sphinx-versioning render from publish.sh - Sun Mar 12 10:15:01 AM UTC 2023 - 587a7609212bf93fef0882e6e533df97bc6c9ca3

Author: zrepl-bot

_sources/pr.rst.txt

@@ -15,3 +15,5 @@ Talks & Presentations
   `Event <https://wiki.freebsd.org/DevSummit/201709>`__
   )
 
+  * Note: The remarks on ``keep_bookmarks`` are irrelevant as of zrepl 0.1 which introduced the zrepl-managed replication cursor bookmark.
+    Read the `Overview <overview-how-replication-works>`_ section to learn more.

master/_sources/configuration/conflict_resolution.rst.txt

@@ -1,5 +1,6 @@
 .. include:: ../global.rst.inc
 
+.. _conflict_resolution-options:
 
 Conflict Resolution Options
 ===========================

master/_sources/configuration/jobs.rst.txt

@@ -30,6 +30,10 @@ Job Type ``push``
       - |snapshotting-spec|
     * - ``pruning``
       - |pruning-spec|
+    * - ``replication``
+      - |replication-options|
+    * - ``conflict_resolution``
+      - |conflict-resolution-options|
 
 Example config: :sampleconf:`/push.yml`
 
@@ -81,6 +85,10 @@ Job Type ``pull``
         | ``manual`` disables periodic pulling, replication then only happens on :ref:`wakeup <cli-signal-wakeup>`.
     * - ``pruning``
       - |pruning-spec|
+    * - ``replication``
+      - |replication-options|
+    * - ``conflict_resolution``
+      - |conflict-resolution-options|
 
 Example config: :sampleconf:`/pull.yml`
 

master/_sources/configuration/replication.rst.txt

@@ -1,5 +1,6 @@
 .. include:: ../global.rst.inc
 
+.. _replication-options:
 
 Replication Options
 ===================

master/configuration/conflict_resolution.html

@@ -190,7 +190,7 @@
 
     <p class="scv-banner scv-sphinx_rtd_theme"><a href="../../stable/configuration/conflict_resolution.html"><b>Warning:</b> This document is for the development version of zrepl. The main version is stable.</a></p>
 <div class="section" id="conflict-resolution-options">
-<h1>Conflict Resolution Options<a class="headerlink" href="#conflict-resolution-options" title="Permalink to this headline">¶</a></h1>
+<span id="id1"></span><h1>Conflict Resolution Options<a class="headerlink" href="#conflict-resolution-options" title="Permalink to this headline">¶</a></h1>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">jobs</span><span class="p">:</span>
 <span class="o">-</span> <span class="nb">type</span><span class="p">:</span> <span class="n">push</span>
   <span class="n">filesystems</span><span class="p">:</span> <span class="o">...</span>

master/configuration/jobs.html

@@ -230,6 +230,12 @@
 <tr class="row-even"><td><code class="docutils literal notranslate"><span class="pre">pruning</span></code></td>
 <td><a class="reference internal" href="prune.html#prune"><span class="std std-ref">pruning specification</span></a></td>
 </tr>
+<tr class="row-odd"><td><code class="docutils literal notranslate"><span class="pre">replication</span></code></td>
+<td><a class="reference internal" href="replication.html#replication-options"><span class="std std-ref">replication options</span></a></td>
+</tr>
+<tr class="row-even"><td><code class="docutils literal notranslate"><span class="pre">conflict_resolution</span></code></td>
+<td><a class="reference internal" href="conflict_resolution.html#conflict-resolution-options"><span class="std std-ref">conflict resolution options</span></a></td>
+</tr>
 </tbody>
 </table>
 <p>Example config: <a class="reference external" href="https://github.com/zrepl/zrepl/blob/master/config/samples/push.yml">config/samples/push.yml</a></p>
@@ -300,6 +306,12 @@
 <tr class="row-odd"><td><code class="docutils literal notranslate"><span class="pre">pruning</span></code></td>
 <td><a class="reference internal" href="prune.html#prune"><span class="std std-ref">pruning specification</span></a></td>
 </tr>
+<tr class="row-even"><td><code class="docutils literal notranslate"><span class="pre">replication</span></code></td>
+<td><a class="reference internal" href="replication.html#replication-options"><span class="std std-ref">replication options</span></a></td>
+</tr>
+<tr class="row-odd"><td><code class="docutils literal notranslate"><span class="pre">conflict_resolution</span></code></td>
+<td><a class="reference internal" href="conflict_resolution.html#conflict-resolution-options"><span class="std std-ref">conflict resolution options</span></a></td>
+</tr>
 </tbody>
 </table>
 <p>Example config: <a class="reference external" href="https://github.com/zrepl/zrepl/blob/master/config/samples/pull.yml">config/samples/pull.yml</a></p>

master/configuration/replication.html

@@ -191,7 +191,7 @@
 
     <p class="scv-banner scv-sphinx_rtd_theme"><a href="../../stable/configuration/replication.html"><b>Warning:</b> This document is for the development version of zrepl. The main version is stable.</a></p>
 <div class="section" id="replication-options">
-<h1>Replication Options<a class="headerlink" href="#replication-options" title="Permalink to this headline">¶</a></h1>
+<span id="id1"></span><h1>Replication Options<a class="headerlink" href="#replication-options" title="Permalink to this headline">¶</a></h1>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">jobs</span><span class="p">:</span>
 <span class="o">-</span> <span class="nb">type</span><span class="p">:</span> <span class="n">push</span>
   <span class="n">filesystems</span><span class="p">:</span> <span class="o">...</span>

master/objects.inv

@@ -179,7 +179,11 @@
 <a class="reference external" href="https://www.youtube.com/watch?v=c1LKeyP1mos&amp;t=2316s">55min Recording</a>,
 <a class="reference external" href="https://docs.google.com/presentation/d/1EmmeEvOXAWJHCVnOS9-TTsxswbcGKmeLWdY_6BH4w0Q/edit?usp=sharing">Slides</a>,
 <a class="reference external" href="https://wiki.freebsd.org/DevSummit/201709">Event</a>
-)</li>
+)<ul>
+<li>Note: The remarks on <code class="docutils literal notranslate"><span class="pre">keep_bookmarks</span></code> are irrelevant as of zrepl 0.1 which introduced the zrepl-managed replication cursor bookmark.
+Read the <a class="reference external" href="overview-how-replication-works">Overview</a> section to learn more.</li>
+</ul>
+</li>
 </ul>
 </div>