make dinstall: skip mediawiki deb for now

[pve-docs.git] / pvesr.adoc

diff --git a/pvesr.adoc b/pvesr.adoc
index 0d8916fdb3194b60892f163d34e603f320cef33b..2bcc4d9486705324f3ea13471e29707ccef39dce 100644 (file)
--- a/pvesr.adoc
+++ b/pvesr.adoc
@@ -88,7 +88,7 @@ Schedule Format
 ---------------
 
 {pve} has a very flexible replication scheduler. It is based on the systemd
 ---------------
 
 {pve} has a very flexible replication scheduler. It is based on the systemd

-time calendar event format.footnote:[see `man 7 sytemd.time` for more information]
+time calendar event format.footnote:[see `man 7 systemd.time` for more information]

 Calendar events may be used to refer to one or more points in time in a
 single expression.
 
 Calendar events may be used to refer to one or more points in time in a
 single expression.
 


@@ -110,8 +110,8 @@ NOTE: Hours are set in 24h format.
 To allow easier and shorter configuration one or more repetition times can
 be set. They indicate that on the start-time(s) itself and the start-time(s)
 plus all multiples of the repetition value replications will be done.  If
 To allow easier and shorter configuration one or more repetition times can
 be set. They indicate that on the start-time(s) itself and the start-time(s)
 plus all multiples of the repetition value replications will be done.  If

-you want to start replication at 8 AM and repeat it every 15 minutes you
-would use: `'8:00/15'`
+you want to start replication at 8 AM and repeat it every 15 minutes until
+9 AM you would use: `'8:00/15'`

 
 Here you see also that if no hour separation (`:`) is used the value gets
 interpreted as minute. If such a separation is used the value on the left
 
 Here you see also that if no hour separation (`:`) is used the value gets
 interpreted as minute. If such a separation is used the value on the left


@@ -145,15 +145,15 @@ Examples:
 [width="100%",options="header"]
 |==============================================================================
 |Schedule String       |Alternative            |Meaning
 [width="100%",options="header"]
 |==============================================================================
 |Schedule String       |Alternative            |Meaning

-|mon,tue,wed,thu,fri   |mon..fri               |All working days at 0:00
-|sat,sun               |sat..sun               |Only on weekend at 0:00
+|mon,tue,wed,thu,fri   |mon..fri               |Every working day at 0:00
+|sat,sun               |sat..sun               |Only on weekends at 0:00

 |mon,wed,fri           |--                     |Only on Monday, Wednesday and Friday at 0:00
 |mon,wed,fri           |--                     |Only on Monday, Wednesday and Friday at 0:00

-|12:05                 |12:05                  |All weekdays at 12:05 PM
-|*/5                   |0/5                    |Every day all five minutes
+|12:05                 |12:05                  |Every day at 12:05 PM
+|*/5                   |0/5                    |Every five minutes

 |mon..wed 30/10                |mon,tue,wed 30/10      |Monday, Tuesday, Wednesday 30, 40 and 50 minutes after every full hour
 |mon..wed 30/10                |mon,tue,wed 30/10      |Monday, Tuesday, Wednesday 30, 40 and 50 minutes after every full hour

-|mon..fri 8..17,22:0/15        |--                     |All working days every 15 minutes between 8 AM and 5 PM plus at 10 PM
+|mon..fri 8..17,22:0/15        |--                     |Every working day every 15 minutes between 8 AM and 6 PM and between 10 PM and 11 PM

 |fri 12..13:5/20       |fri 12,13:5/20         |Friday at 12:05, 12:25, 12:45, 13:05, 13:25 and 13:45
 |fri 12..13:5/20       |fri 12,13:5/20         |Friday at 12:05, 12:25, 12:45, 13:05, 13:25 and 13:45

-|12..22:5/2            |12:5/2                 |Every day starting at 12:05 until 22:05 all 2 hours
+|12,14,16,18,20,22:5   |12/2:5                 |Every day starting at 12:05 until 22:05, every 2 hours

 |*                     |*/1                    |Every minute (minimum interval)
 |==============================================================================
 
 |*                     |*/1                    |Every minute (minimum interval)
 |==============================================================================
 


@@ -220,8 +220,8 @@ issue itself.
 - move both guest configuration files form the origin node A to node B:
 +
 ----
 - move both guest configuration files form the origin node A to node B:
 +
 ----

-# mv /etc/pve/node/A/qemu-server/100.conf /etc/pve/node/B/qemu-server/100.conf
-# mv /etc/pve/node/A/lxc/200.conf /etc/pve/node/B/lxc/200.conf
+# mv /etc/pve/nodes/A/qemu-server/100.conf /etc/pve/nodes/B/qemu-server/100.conf
+# mv /etc/pve/nodes/A/lxc/200.conf /etc/pve/nodes/B/lxc/200.conf

 ----
 
 - Now you can start the guests again:
 ----
 
 - Now you can start the guests again:


@@ -236,6 +236,8 @@ Remember to replace the VMIDs and node names with your respective values.
 Managing Jobs
 -------------
 
 Managing Jobs
 -------------
 

+[thumbnail="screenshot/gui-qemu-add-replication-job.png"]
+

 You can use the web GUI to create, modify and remove replication jobs
 easily. Additionally the command line interface (CLI) tool `pvesr` can be
 used to do this.
 You can use the web GUI to create, modify and remove replication jobs
 easily. Additionally the command line interface (CLI) tool `pvesr` can be
 used to do this.


@@ -244,8 +246,6 @@ You can find the replication panel on all levels (datacenter, node, virtual
 guest) in the web GUI. They differ in what jobs get shown: all, only node
 specific or only guest specific jobs.
 
 guest) in the web GUI. They differ in what jobs get shown: all, only node
 specific or only guest specific jobs.
 

-// TODO insert auto generated images of add web UI dialog
-

 Once adding a new job you need to specify the virtual guest (if not already
 selected) and the target node. The replication
 xref:pvesr_schedule_time_format[schedule] can be set if the default of `all
 Once adding a new job you need to specify the virtual guest (if not already
 selected) and the target node. The replication
 xref:pvesr_schedule_time_format[schedule] can be set if the default of `all


@@ -260,7 +260,7 @@ This ID must only be specified manually if the CLI tool is used.
 Command Line Interface Examples
 -------------------------------
 
 Command Line Interface Examples
 -------------------------------
 

-Create a replication job which will run all 5 min with limited bandwidth of
+Create a replication job which will run every 5 minutes with limited bandwidth of

 10 mbps (megabytes per second) for the guest with guest ID 100.
 
 ----
 10 mbps (megabytes per second) for the guest with guest ID 100.
 
 ----