extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-21 16:03:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs/jobs: add replication- conflict_resolution-options to active job types

Browse Source
This commit is contained in:
InsanePrawn 2023-01-25 00:42:48 +01:00 committed by Christian Schwarz
parent 96db636582
commit 1a72edea5d
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/configuration/conflict_resolution.rst
View File

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

8
docs/configuration/jobs.rst
View File

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

1
docs/configuration/replication.rst
View File

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

2
docs/global.rst.inc
View File

@ -26,6 +26,8 @@
.. |connect-transport| replace:: :ref:`connect specification<transport>` .. |connect-transport| replace:: :ref:`connect specification<transport>`
.. |send-options| replace:: :ref:`send options<job-send-options>`, e.g. for encrypted sends .. |send-options| replace:: :ref:`send options<job-send-options>`, e.g. for encrypted sends
.. |recv-options| replace:: :ref:`recv options<job-recv-options>` .. |recv-options| replace:: :ref:`recv options<job-recv-options>`
.. |replication-options| replace:: :ref:`replication options<replication-options>`
.. |conflict-resolution-options| replace:: :ref:`conflict resolution options<conflict_resolution-options>`
.. |snapshotting-spec| replace:: :ref:`snapshotting specification <job-snapshotting-spec>` .. |snapshotting-spec| replace:: :ref:`snapshotting specification <job-snapshotting-spec>`
.. |pruning-spec| replace:: :ref:`pruning specification <prune>` .. |pruning-spec| replace:: :ref:`pruning specification <prune>`
.. |filter-spec| replace:: :ref:`filter specification<pattern-filter>` .. |filter-spec| replace:: :ref:`filter specification<pattern-filter>`