diff --git a/docs/configuration/conflict_resolution.rst b/docs/configuration/conflict_resolution.rst index cb7ab1e..a33b887 100644 --- a/docs/configuration/conflict_resolution.rst +++ b/docs/configuration/conflict_resolution.rst @@ -1,5 +1,6 @@ .. include:: ../global.rst.inc +.. _conflict_resolution-options: Conflict Resolution Options =========================== diff --git a/docs/configuration/jobs.rst b/docs/configuration/jobs.rst index bab5a13..523e534 100644 --- a/docs/configuration/jobs.rst +++ b/docs/configuration/jobs.rst @@ -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 `. * - ``pruning`` - |pruning-spec| + * - ``replication`` + - |replication-options| + * - ``conflict_resolution`` + - |conflict-resolution-options| Example config: :sampleconf:`/pull.yml` diff --git a/docs/configuration/replication.rst b/docs/configuration/replication.rst index e58f526..190e53a 100644 --- a/docs/configuration/replication.rst +++ b/docs/configuration/replication.rst @@ -1,5 +1,6 @@ .. include:: ../global.rst.inc +.. _replication-options: Replication Options =================== diff --git a/docs/global.rst.inc b/docs/global.rst.inc index 6752723..5cfa17a 100644 --- a/docs/global.rst.inc +++ b/docs/global.rst.inc @@ -26,6 +26,8 @@ .. |connect-transport| replace:: :ref:`connect specification` .. |send-options| replace:: :ref:`send options`, e.g. for encrypted sends .. |recv-options| replace:: :ref:`recv options` +.. |replication-options| replace:: :ref:`replication options` +.. |conflict-resolution-options| replace:: :ref:`conflict resolution options` .. |snapshotting-spec| replace:: :ref:`snapshotting specification ` .. |pruning-spec| replace:: :ref:`pruning specification ` .. |filter-spec| replace:: :ref:`filter specification`