diff --git a/doc/Pacemaker_Explained/en-US/Book_Info.xml b/doc/Pacemaker_Explained/en-US/Book_Info.xml index 93f1783439..56b9d9bfda 100644 --- a/doc/Pacemaker_Explained/en-US/Book_Info.xml +++ b/doc/Pacemaker_Explained/en-US/Book_Info.xml @@ -1,40 +1,35 @@ Configuration Explained An A-Z guide to Pacemaker's Configuration Options Pacemaker 1.1 - 1 + + 5 0 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 the CIB. - - - For those that are allergic to XML, there exist several unified shells - and GUIs for Pacemaker. However these tools will not be covered at all - in this document - I hope, however, that the concepts explained here make the functionality of these tools more easily understood. - , precisely because they hide the XML. - - - Additionally, this document is NOT a step-by-step how-to guide for configuring a specific clustering scenario. - Although such guides exist, the purpose of this document is to provide an understanding of the building blocks that can be used to construct any type of Pacemaker cluster. - Try the Clusters from Scratch document instead. + 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/NOTES b/doc/Pacemaker_Explained/en-US/NOTES index ae5069b559..0c11bbb721 100644 --- a/doc/Pacemaker_Explained/en-US/NOTES +++ b/doc/Pacemaker_Explained/en-US/NOTES @@ -1,69 +1,18 @@ +2.3.1 editing CIB copy via VI: isn't that racy? Are concurrent changes detected? -That's a "+", not a hyphen: - -Key combinations can be distinguished from keycaps by the hyphen connecting each part of a key -combination. For example: -Press Enter to execute the command. -Press Ctrl+Alt+F2 to switch to the first virtual terminal. Press Ctrl+Alt+F1 to -return to your X-Windows session. - - - - -doesn't apply here: - -If source code is discussed, class names, methods, functions, v - including application names; dialog box text; labeled buttons; check-box and radio button labels; menu titles and sub-menu titles. - - -1.2 terminal output has page-break - - -2.3 editing via VI -isn't that racy? Are concurrent changes detected? - - -why sometimes and sometimes
? example 2.2 has title at top, different to the figures - - -2.8 header slightly too long, line broken +why sometimes and sometimes
? examples have title at top, figures have title at bottom +Example 2.8 (and others) XML line too long, line broken some are in , some in ... I'd like the latter more, or perhaps in a . Indentation makes whitespace at start of lines ... remove? -Chapter 3 -========= -- table 3.3 "Properties maintained by the Cluster" incomplete (crm-feature-set, ...) - - -4.4.2 structure different from 4.4.1 ... numbered lists - - -5.3 Notes have next content overlaid - - -ex 5.6: 1.0 ???? - - -perhaps use 10.20.30.40 instead of the 1.2.3.4 example IP address? - - -6.5 images/resource-set.png missing, "images/two-sets.png" too; images/three-sets; "images/three-sets-complex.png" - +tables 3.1 and 3.2 incomplete (crm-feature-set, ...) Ch 7 missing? - Remove Ex9.9? - -collocate or colocate? Eg. in C.1: -Multi-dimensional colocation and ordering constraints. See Section 6.5, “Ordering Sets of -Resources” and Section 6.6, “Collocating Sets of Resources” - - Ap-Debug.xml not used? - alias for primary? diff --git a/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent b/doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent index b9137bc6ff..74004c8d25 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 0afc90b237..eecd34b59b 100644 --- a/doc/Pacemaker_Explained/en-US/Revision_History.xml +++ b/doc/Pacemaker_Explained/en-US/Revision_History.xml @@ -1,47 +1,60 @@ + 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 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 + + + +