diff --git a/doc/Pacemaker_Administration/en-US/Book_Info.xml b/doc/Pacemaker_Administration/en-US/Book_Info.xml
index 5acc7868e7..e330c74a9c 100644
--- a/doc/Pacemaker_Administration/en-US/Book_Info.xml
+++ b/doc/Pacemaker_Administration/en-US/Book_Info.xml
@@ -1,34 +1,34 @@
%BOOK_ENTITIES;
]>
Pacemaker Administration
Managing Pacemaker Clusters
2
- 0
+ 1
This document has instructions and tips for system administrators who
need to manage high-availability clusters using Pacemaker.
diff --git a/doc/Pacemaker_Administration/en-US/Revision_History.xml b/doc/Pacemaker_Administration/en-US/Revision_History.xml
index 3d8a310735..ca611d8310 100644
--- a/doc/Pacemaker_Administration/en-US/Revision_History.xml
+++ b/doc/Pacemaker_Administration/en-US/Revision_History.xml
@@ -1,87 +1,100 @@
%BOOK_ENTITIES;
]>
Revision History
1-0
Tue Jan 23 2018
AndrewBeekhof
andrew@beekhof.net
KenGaillot
kgaillot@redhat.com
Move administration-oriented information from
Pacemaker Explained into its own
book
1-1
Mon Jan 28 2019
KenGaillot
kgaillot@redhat.com
JanPokorný
jpokorny@redhat.com
Add "Troubleshooting" chapter, minor
clarifications and reformatting
1-2
Mon May 13 2019
KenGaillot
kgaillot@redhat.com
Overhaul configuration how-to
1-3
Tue Oct 15 2019
KenGaillot
kgaillot@redhat.com
Add Tools chapter
2-0
Tue Nov 5 2019
ChrisLumens
clumens@redhat.com
Update for crm_mon changes in 2.0.3
+
+ 2-1
+ Sun Dec 22 2019
+
+ FerencWagner
+ wferi@debian.org
+
+
+
+ Update log example to how it would look with current changes
+
+
+
diff --git a/doc/Pacemaker_Development/en-US/Book_Info.xml b/doc/Pacemaker_Development/en-US/Book_Info.xml
index 9dea3e8473..c5b9319cd3 100644
--- a/doc/Pacemaker_Development/en-US/Book_Info.xml
+++ b/doc/Pacemaker_Development/en-US/Book_Info.xml
@@ -1,35 +1,35 @@
%BOOK_ENTITIES;
]>
Pacemaker Development
Working with the Pacemaker Code Base
2
- 4
+ 5
This document has guidelines and tips for developers
interested in editing Pacemaker source code and
submitting changes for inclusion in the project.
diff --git a/doc/Pacemaker_Development/en-US/Pacemaker_Development.ent b/doc/Pacemaker_Development/en-US/Pacemaker_Development.ent
index a2647c3f8b..5c02713e9d 100644
--- a/doc/Pacemaker_Development/en-US/Pacemaker_Development.ent
+++ b/doc/Pacemaker_Development/en-US/Pacemaker_Development.ent
@@ -1,4 +1,4 @@
-
+
diff --git a/doc/Pacemaker_Development/en-US/Revision_History.xml b/doc/Pacemaker_Development/en-US/Revision_History.xml
index 163867f785..4c5f0f5060 100644
--- a/doc/Pacemaker_Development/en-US/Revision_History.xml
+++ b/doc/Pacemaker_Development/en-US/Revision_History.xml
@@ -1,112 +1,124 @@
%BOOK_ENTITIES;
]>
Revision History
1-0
Tue Jul 26 2016
AndrewBeekhof
andrew@beekhof.net
KenGaillot
kgaillot@redhat.com
Convert coding guidelines and developer FAQ
to Publican document
1-1
Mon Aug 29 2016
KenGaillot
kgaillot@redhat.com
Add Python coding guidelines, and
more about licensing
2-0
Fri Jan 12 2018
KenGaillot
kgaillot@redhat.com
Drop support for Python 2.6
2-1
Tue Sep 18 2018
JanPokorný
poki@redhat.com
Start documenting notable evolutionary
points
2-2
Fri Dec 7 2018
KenGaillot
kgaillot@redhat.com
Update FAQ and C guidelines
2-3
Mon May 13 2019
KenGaillot
kgaillot@redhat.com
JanPokorný
poki@redhat.com
Update copyright notice policy, and some external references
2-4
Fri 17 May 2019
JanPokorný
poki@redhat.com
Start capturing hacking howto
for advanced contributors
+
+ 2-5
+ Thu 5 Mar 2020
+
+ JanPokorný
+ poki@redhat.com
+
+
+ Use crm_str
+
+
+
diff --git a/doc/Pacemaker_Explained/en-US/Book_Info.xml b/doc/Pacemaker_Explained/en-US/Book_Info.xml
index f2a81eb5de..f010c2a619 100644
--- a/doc/Pacemaker_Explained/en-US/Book_Info.xml
+++ b/doc/Pacemaker_Explained/en-US/Book_Info.xml
@@ -1,35 +1,35 @@
Configuration Explained
An A-Z guide to Pacemaker's Configuration Options
Pacemaker
2.0
13
- 0
+ 1
The purpose of this document is to definitively explain the concepts used to configure Pacemaker.
To achieve this, it will focus exclusively on the XML syntax used to configure Pacemaker's
Cluster Information Base (CIB).
diff --git a/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent b/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent
index 6d5ae65169..3cf0609843 100644
--- a/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent
+++ b/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent
@@ -1,4 +1,4 @@
-
+
diff --git a/doc/Pacemaker_Explained/en-US/Revision_History.xml b/doc/Pacemaker_Explained/en-US/Revision_History.xml
index 4a80cb4fb6..31edf194f8 100644
--- a/doc/Pacemaker_Explained/en-US/Revision_History.xml
+++ b/doc/Pacemaker_Explained/en-US/Revision_History.xml
@@ -1,249 +1,263 @@
Revision History
1-0
19 Oct 2009
AndrewBeekhofandrew@beekhof.net
Import from Pages.app
2-0
26 Oct 2009
AndrewBeekhofandrew@beekhof.net
Cleanup and reformatting of docbook xml complete
3-0
Tue Nov 12 2009
AndrewBeekhofandrew@beekhof.net
Split book into chapters and pass validation
Re-organize book for use with Publican
3-1
Tue Nov 12 2009
TanjaRoth
SUSE
taroth@suse.com
LarsMarowsky-Bree
SUSE
lmb@suse.com
YanGao
SUSE
ygao@suse.com
ThomasSchraitle
SUSE
toms@suse.com
DejanMuhamedagic
SUSE
dmuhamedagic@suse.com
Utilization chapter
Resource Templates chapter
Multi-Site Clusters chapter
3-2
Fri Nov 4 2011
PhilippMarek
LINBit
philipp.marek@linbit.com
Extensive style, formatting, and indexing updates
4-0
Mon Oct 8 2012
AndrewBeekhofandrew@beekhof.net
Converted to asciidoc
(which is converted to docbook for use with
Publican)
5-0
Mon Feb 23 2015
KenGaillotkgaillot@redhat.com
Update for clarity, stylistic consistency and current command-line syntax
6-0
Tue Dec 8 2015
KenGaillotkgaillot@redhat.com
Update for Pacemaker 1.1.14
7-0
Tue May 3 2016
KenGaillotkgaillot@redhat.com
Update for Pacemaker 1.1.15
7-1
Fri Oct 28 2016
KenGaillotkgaillot@redhat.com
Overhaul upgrade documentation, and document node health strategies
8-0
Tue Oct 25 2016
KenGaillotkgaillot@redhat.com
Update for Pacemaker 1.1.16
9-0
Tue Jul 11 2017
KenGaillotkgaillot@redhat.com
Update for Pacemaker 1.1.17
10-0
Fri Oct 6 2017
KenGaillotkgaillot@redhat.com
Update for Pacemaker 1.1.18
11-0
Fri Jan 12 2018
KenGaillotkgaillot@redhat.com
Update for Pacemaker 2.0.0
12-0
Mon Jan 28 2019
KenGaillotkgaillot@redhat.com
ReidWahlnwahl@redhat.com
JanPokornýjpokorny@redhat.com
Update for Pacemaker 2.0.1, remove "Further Reading" and "FAQ" sections,
and add minor clarifications and reformatting
12-1
Mon May 13 2019
KenGaillotkgaillot@redhat.com
MaciejSobkowiakmsobkowiak@egnyte.com
Document podman support, cluster-name cluster option, and new
HealthIOWait agent, with other minor clarifications and
corrections
12-2
Wed Jun 19 2019
KenGaillotkgaillot@redhat.com
Add chapter for ACLs
13-0
Tue Oct 15 2019
KenGaillot
kgaillot@redhat.com
Overhaul fencing, rules, and constraints chapters,
elaborate on various options, and update for Pacemaker 2.0.3
+
+ 13-1
+ Wed Apr 1 2020
+
+ YanGao
+ SUSE
+ ygao@suse.com
+
+
+
+ Document new feature priority-fencing-delay
+
+
+