pgpool2.git / summary / log / commit / refs

commit    c248f3ea64d8a905b04896cf213fd7e8d5e2108f
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Fri Mar 18 23:45:59 2016 +0000

    Write initial version of PCP command reference intro.
    
    Add pcp_common_options.sgml which describes PCP command common options.
    Fix pcp_node_count doc.
    Modify version.sgml to set it to "pgpool-II 3.6 alpha1".
    Set our legal notice into legal.sgml.


doc/src/sgml/HTML.index | 38 +- doc/src/sgml/bookindex.sgml | 20 +- doc/src/sgml/html/LEGALNOTICE.html | 19 +- doc/src/sgml/html/admin.html | 8 +- doc/src/sgml/html/biblio.html | 12 +- doc/src/sgml/html/bookindex.html | 61 ++-- doc/src/sgml/html/bug-reporting.html | 6 +- doc/src/sgml/html/history.html | 6 +- doc/src/sgml/html/index.html | 8 +- doc/src/sgml/html/install-getsource.html | 6 +- doc/src/sgml/html/install-post.html | 10 +- doc/src/sgml/html/install-procedure.html | 6 +- doc/src/sgml/html/install-requirements.html | 6 +- doc/src/sgml/html/install-short.html | 6 +- doc/src/sgml/html/installation-platform-notes.html | 6 +- doc/src/sgml/html/installation.html | 10 +- doc/src/sgml/html/intro-whatis.html | 6 +- doc/src/sgml/html/notation.html | 6 +- doc/src/sgml/html/pcp-commands.html | 103 +++++- doc/src/sgml/html/pcp-common-options.html | 396 +++++++++++++++++++++ doc/src/sgml/html/pcp-node-count.html | 119 ++----- doc/src/sgml/html/preface.html | 12 +- doc/src/sgml/html/reference.html | 19 +- doc/src/sgml/html/resources.html | 6 +- doc/src/sgml/html/stylesheet.css | 243 ++++++++++++- doc/src/sgml/html/supported-platforms.html | 6 +- doc/src/sgml/html/tutorial-install.html | 6 +- doc/src/sgml/html/tutorial-start.html | 6 +- doc/src/sgml/html/tutorial.html | 8 +- doc/src/sgml/legal.sgml | 13 +- doc/src/sgml/ref/allfiles.sgml | 1 + doc/src/sgml/ref/pcp_common_options.sgml | 164 +++++++++ doc/src/sgml/ref/pcp_node_count.sgml | 69 +--- doc/src/sgml/reference.sgml | 321 ++++------------- doc/src/sgml/stylesheet.css | 243 ++++++++++++- doc/src/sgml/version.sgml | 2 +- 36 files changed, 1366 insertions(+), 611 deletions(-) diff --git a/doc/src/sgml/HTML.index b/doc/src/sgml/HTML.index index 48aa25399..63806a008 100644 --- a/doc/src/sgml/HTML.index +++ b/doc/src/sgml/HTML.index @@ -1,5 +1,5 @@ INDEXTERM history.html -INDEXPOINT history.html#AEN50 +INDEXPOINT history.html#AEN48 TITLE A Brief History of pgpool-II significance NORMAL ZONE history.html @@ -8,7 +8,7 @@ PRIMARY history SECONDARY of pgpool-II /INDEXTERM INDEXTERM installation.html -INDEXPOINT installation.html#AEN114 +INDEXPOINT installation.html#AEN112 TITLE pgpool-IIInstallation from Source Code significance NORMAL ZONE installation.html @@ -16,7 +16,7 @@ TITLE pgpool-IIInstallation from Source Code PRIMARY installation /INDEXTERM INDEXTERM install-procedure.html -INDEXPOINT install-procedure.html#AEN132 +INDEXPOINT install-procedure.html#AEN130 TITLE Installation Procedure significance NORMAL ZONE install-procedure.html @@ -24,50 +24,58 @@ TITLE Installation Procedure PRIMARY configure /INDEXTERM INDEXTERM install-procedure.html -INDEXPOINT install-procedure.html#AEN139 +INDEXPOINT install-procedure.html#AEN137 TITLE Installation Procedure significance NORMAL PRIMARY VPATH /INDEXTERM INDEXTERM install-procedure.html -INDEXPOINT install-procedure.html#AEN283 +INDEXPOINT install-procedure.html#AEN281 TITLE Installation Procedure significance NORMAL PRIMARY OpenSSL SEEALSO SSL /INDEXTERM INDEXTERM install-procedure.html -INDEXPOINT install-procedure.html#AEN404 +INDEXPOINT install-procedure.html#AEN402 TITLE Installation Procedure significance NORMAL PRIMARY regression test /INDEXTERM -INDEXTERM install-post.html#AEN453 -INDEXPOINT install-post.html#AEN455 +INDEXTERM install-post.html#AEN451 +INDEXPOINT install-post.html#AEN453 TITLE Shared Libraries significance NORMAL PRIMARY shared library /INDEXTERM -INDEXTERM install-post.html#AEN453 -INDEXPOINT install-post.html#AEN495 +INDEXTERM install-post.html#AEN451 +INDEXPOINT install-post.html#AEN493 TITLE Shared Libraries significance NORMAL PRIMARY ldconfig /INDEXTERM -INDEXTERM install-post.html#AEN504 -INDEXPOINT install-post.html#AEN506 +INDEXTERM install-post.html#AEN502 +INDEXPOINT install-post.html#AEN504 TITLE Environment Variables significance NORMAL PRIMARY PATH /INDEXTERM -INDEXTERM install-post.html#AEN504 -INDEXPOINT install-post.html#AEN525 +INDEXTERM install-post.html#AEN502 +INDEXPOINT install-post.html#AEN523 TITLE Environment Variables significance NORMAL PRIMARY MANPATH /INDEXTERM +INDEXTERM pcp-common-options.html +INDEXPOINT pcp-common-options.html#AEN579 +TITLE pcp_common_options +significance NORMAL +ZONE pcp-common-options.html +TITLE pcp_common_options +PRIMARY pcp_common_options +/INDEXTERM INDEXTERM pcp-node-count.html -INDEXPOINT pcp-node-count.html#AEN566 +INDEXPOINT pcp-node-count.html#AEN679 TITLE pcp_node_count significance NORMAL ZONE pcp-node-count.html diff --git a/doc/src/sgml/bookindex.sgml b/doc/src/sgml/bookindex.sgml index b355c741c..9f9f7615d 100644 --- a/doc/src/sgml/bookindex.sgml +++ b/doc/src/sgml/bookindex.sgml @@ -52,7 +52,7 @@ <indexentry> <primaryie>ldconfig, - <ulink url="install-post.html#AEN453" role="AEN495">Shared Libraries</ulink> + <ulink url="install-post.html#AEN451" role="AEN493">Shared Libraries</ulink> </primaryie> </indexentry> @@ -61,7 +61,7 @@ <indexentry> <primaryie>MANPATH, - <ulink url="install-post.html#AEN504" role="AEN525">Environment Variables</ulink> + <ulink url="install-post.html#AEN502" role="AEN523">Environment Variables</ulink> </primaryie> </indexentry> @@ -70,7 +70,7 @@ <indexentry> <primaryie>OpenSSL, - <ulink url="install-procedure.html" role="AEN283">Installation Procedure</ulink> + <ulink url="install-procedure.html" role="AEN281">Installation Procedure</ulink> </primaryie> <seealsoie>SSL</seealsoie> </indexentry> @@ -80,7 +80,13 @@ <indexentry> <primaryie>PATH, - <ulink url="install-post.html#AEN504" role="AEN506">Environment Variables</ulink> + <ulink url="install-post.html#AEN502" role="AEN504">Environment Variables</ulink> + </primaryie> +</indexentry> + +<indexentry> + <primaryie>pcp_common_options, + <ulink url="pcp-common-options.html" role="pcp-common-options">pcp_common_options</ulink> </primaryie> </indexentry> @@ -95,7 +101,7 @@ <indexentry> <primaryie>regression test, - <ulink url="install-procedure.html" role="AEN404">Installation Procedure</ulink> + <ulink url="install-procedure.html" role="AEN402">Installation Procedure</ulink> </primaryie> </indexentry> @@ -104,7 +110,7 @@ <indexentry> <primaryie>shared library, - <ulink url="install-post.html#AEN453" role="AEN455">Shared Libraries</ulink> + <ulink url="install-post.html#AEN451" role="AEN453">Shared Libraries</ulink> </primaryie> </indexentry> @@ -113,7 +119,7 @@ <indexentry> <primaryie>VPATH, - <ulink url="install-procedure.html" role="AEN139">Installation Procedure</ulink> + <ulink url="install-procedure.html" role="AEN137">Installation Procedure</ulink> </primaryie> </indexentry> diff --git a/doc/src/sgml/html/LEGALNOTICE.html b/doc/src/sgml/html/LEGALNOTICE.html index 057401319..f6cd9dfd2 100644 --- a/doc/src/sgml/html/LEGALNOTICE.html +++ b/doc/src/sgml/html/LEGALNOTICE.html @@ -7,7 +7,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="NEXT" TITLE="Preface" @@ -18,7 +18,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY ><DIV CLASS="NAVHEADER" @@ -35,7 +35,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ></TABLE @@ -54,16 +54,9 @@ NAME="LEGALNOTICE" ><P > <SPAN CLASS="PRODUCTNAME" ->PostgreSQL</SPAN -> is Copyright &copy; 1996-2016 - by the PostgreSQL Global Development Group. - </P -><P -> <SPAN -CLASS="PRODUCTNAME" ->Postgres95</SPAN -> is Copyright &copy; 1994-5 - by the Regents of the University of California. +>Pgpool and Pgpool-II</SPAN +> are Copyright &copy; 1996-2016 + by the Pgpool Global Development Group. </P ><P > Permission to use, copy, modify, and distribute this software and diff --git a/doc/src/sgml/html/admin.html b/doc/src/sgml/html/admin.html index 227186548..5e047abc7 100644 --- a/doc/src/sgml/html/admin.html +++ b/doc/src/sgml/html/admin.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" TITLE="Installation" @@ -23,7 +23,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="PART" ><DIV @@ -41,7 +41,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -97,7 +97,7 @@ CLASS="TITLE" ><DIV CLASS="PARTINTRO" ><A -NAME="AEN108" +NAME="AEN106" ></A ><P > This part covers topics that are of interest to a diff --git a/doc/src/sgml/html/biblio.html b/doc/src/sgml/html/biblio.html index 4ea25a065..db9628825 100644 --- a/doc/src/sgml/html/biblio.html +++ b/doc/src/sgml/html/biblio.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" TITLE="pcp_node_count" @@ -23,7 +23,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="BIBLIOGRAPHY" ><DIV @@ -41,7 +41,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -118,7 +118,7 @@ TARGET="_top" ><H2 CLASS="BIBLIODIV" ><A -NAME="AEN624" +NAME="AEN712" ><ACRONYM CLASS="ACRONYM" >SQL</ACRONYM @@ -272,7 +272,7 @@ STYLE="margin-left: 0.5in" ><H2 CLASS="BIBLIODIV" ><A -NAME="AEN734" +NAME="AEN822" >PostgreSQL-specific Documentation</A ></H2 ><DIV @@ -362,7 +362,7 @@ STYLE="margin-left: 0.5in" ><H2 CLASS="BIBLIODIV" ><A -NAME="AEN780" +NAME="AEN868" >Proceedings and Articles</A ></H2 ><DIV diff --git a/doc/src/sgml/html/bookindex.html b/doc/src/sgml/html/bookindex.html index 16707ef75..6b741d63b 100644 --- a/doc/src/sgml/html/bookindex.html +++ b/doc/src/sgml/html/bookindex.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" TITLE="Bibliography" @@ -20,7 +20,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="INDEX" ><DIV @@ -38,7 +38,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -86,34 +86,34 @@ NAME="BOOKINDEX" ><P CLASS="INDEXDIV-QUICKLINKS" ><A -HREF="bookindex.html#AEN976" +HREF="bookindex.html#AEN1064" >C</A > | <A -HREF="bookindex.html#AEN981" +HREF="bookindex.html#AEN1069" >H</A > | <A -HREF="bookindex.html#AEN987" +HREF="bookindex.html#AEN1075" >I</A > | <A -HREF="bookindex.html#AEN992" +HREF="bookindex.html#AEN1080" >L</A > | <A -HREF="bookindex.html#AEN997" +HREF="bookindex.html#AEN1085" >M</A > | <A -HREF="bookindex.html#AEN1002" +HREF="bookindex.html#AEN1090" >O</A > | <A -HREF="bookindex.html#AEN1008" +HREF="bookindex.html#AEN1096" >P</A > | <A -HREF="bookindex.html#AEN1016" +HREF="bookindex.html#AEN1107" >R</A > | <A -HREF="bookindex.html#AEN1021" +HREF="bookindex.html#AEN1112" >S</A > | <A -HREF="bookindex.html#AEN1026" +HREF="bookindex.html#AEN1117" >V</A ></P ><DIV @@ -121,7 +121,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN976" +NAME="AEN1064" >C</A ></H2 ><DL @@ -139,7 +139,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN981" +NAME="AEN1069" >H</A ></H2 ><DL @@ -168,7 +168,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN987" +NAME="AEN1075" >I</A ></H2 ><DL @@ -186,14 +186,14 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN992" +NAME="AEN1080" >L</A ></H2 ><DL ><DT >ldconfig, <A -HREF="install-post.html#AEN453" +HREF="install-post.html#AEN451" >Shared Libraries</A > </DT @@ -204,14 +204,14 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN997" +NAME="AEN1085" >M</A ></H2 ><DL ><DT >MANPATH, <A -HREF="install-post.html#AEN504" +HREF="install-post.html#AEN502" >Environment Variables</A > </DT @@ -222,7 +222,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN1002" +NAME="AEN1090" >O</A ></H2 ><DL @@ -246,18 +246,25 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN1008" +NAME="AEN1096" >P</A ></H2 ><DL ><DT >PATH, <A -HREF="install-post.html#AEN504" +HREF="install-post.html#AEN502" >Environment Variables</A > </DT ><DT +>pcp_common_options, + <A +HREF="pcp-common-options.html" +>pcp_common_options</A +> + </DT +><DT >pcp_node_count, <A HREF="pcp-node-count.html" @@ -271,7 +278,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN1016" +NAME="AEN1107" >R</A ></H2 ><DL @@ -289,14 +296,14 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN1021" +NAME="AEN1112" >S</A ></H2 ><DL ><DT >shared library, <A -HREF="install-post.html#AEN453" +HREF="install-post.html#AEN451" >Shared Libraries</A > </DT @@ -307,7 +314,7 @@ CLASS="INDEXDIV" ><H2 CLASS="INDEXDIV" ><A -NAME="AEN1026" +NAME="AEN1117" >V</A ></H2 ><DL diff --git a/doc/src/sgml/html/bug-reporting.html b/doc/src/sgml/html/bug-reporting.html index 52c513911..11b689f75 100644 --- a/doc/src/sgml/html/bug-reporting.html +++ b/doc/src/sgml/html/bug-reporting.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Preface" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/history.html b/doc/src/sgml/html/history.html index a3a644dbb..5964ca5aa 100644 --- a/doc/src/sgml/html/history.html +++ b/doc/src/sgml/html/history.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Preface" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/index.html b/doc/src/sgml/html/index.html index 27fd27ecd..1317f8432 100644 --- a/doc/src/sgml/html/index.html +++ b/doc/src/sgml/html/index.html @@ -2,7 +2,7 @@ <HTML ><HEAD ><TITLE ->pgpool-II 3.5.0 Documentation</TITLE +>pgpool-II 3.6 alpha1 Documentation</TITLE ><META NAME="GENERATOR" CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK @@ -17,7 +17,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="BOOK" ><DIV @@ -31,7 +31,7 @@ CLASS="TITLEPAGE" CLASS="TITLE" ><A NAME="POSTGRES" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></H1 ><H3 CLASS="CORPAUTHOR" @@ -41,7 +41,7 @@ CLASS="COPYRIGHT" ><A HREF="LEGALNOTICE.html" >Copyright</A -> &copy; 1996-2016 The PostgreSQL Global Development Group</P +> &copy; 2003-2016 The Pgpool Global Development Group</P ><HR></DIV ><DIV CLASS="TOC" diff --git a/doc/src/sgml/html/install-getsource.html b/doc/src/sgml/html/install-getsource.html index 8faac93fc..d8aab2a8c 100644 --- a/doc/src/sgml/html/install-getsource.html +++ b/doc/src/sgml/html/install-getsource.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/install-post.html b/doc/src/sgml/html/install-post.html index 963984508..c2d56694c 100644 --- a/doc/src/sgml/html/install-post.html +++ b/doc/src/sgml/html/install-post.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -103,7 +103,7 @@ CLASS="SECT2" ><H2 CLASS="SECT2" ><A -NAME="AEN453" +NAME="AEN451" >2.5.1. Shared Libraries</A ></H2 ><P @@ -295,7 +295,7 @@ CLASS="SECT2" ><H2 CLASS="SECT2" ><A -NAME="AEN504" +NAME="AEN502" >2.5.2. Environment Variables</A ></H2 ><P diff --git a/doc/src/sgml/html/install-procedure.html b/doc/src/sgml/html/install-procedure.html index 1463c0f27..132110e94 100644 --- a/doc/src/sgml/html/install-procedure.html +++ b/doc/src/sgml/html/install-procedure.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/install-requirements.html b/doc/src/sgml/html/install-requirements.html index ef6af518a..78e2e0b16 100644 --- a/doc/src/sgml/html/install-requirements.html +++ b/doc/src/sgml/html/install-requirements.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/install-short.html b/doc/src/sgml/html/install-short.html index d43bd4013..20e1eb0bf 100644 --- a/doc/src/sgml/html/install-short.html +++ b/doc/src/sgml/html/install-short.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/installation-platform-notes.html b/doc/src/sgml/html/installation-platform-notes.html index 06c421410..27ee140fb 100644 --- a/doc/src/sgml/html/installation-platform-notes.html +++ b/doc/src/sgml/html/installation-platform-notes.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/installation.html b/doc/src/sgml/html/installation.html index 1f82d1b3e..6e53668af 100644 --- a/doc/src/sgml/html/installation.html +++ b/doc/src/sgml/html/installation.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Server Administration" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="CHAPTER" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -133,12 +133,12 @@ HREF="install-post.html" ><DL ><DT >2.5.1. <A -HREF="install-post.html#AEN453" +HREF="install-post.html#AEN451" >Shared Libraries</A ></DT ><DT >2.5.2. <A -HREF="install-post.html#AEN504" +HREF="install-post.html#AEN502" >Environment Variables</A ></DT ></DL diff --git a/doc/src/sgml/html/intro-whatis.html b/doc/src/sgml/html/intro-whatis.html index e06a45b68..24789b516 100644 --- a/doc/src/sgml/html/intro-whatis.html +++ b/doc/src/sgml/html/intro-whatis.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Preface" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/notation.html b/doc/src/sgml/html/notation.html index 3b60a3fe8..cd94cd3af 100644 --- a/doc/src/sgml/html/notation.html +++ b/doc/src/sgml/html/notation.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Preface" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/pcp-commands.html b/doc/src/sgml/html/pcp-commands.html index 2d04a2808..bbc04360f 100644 --- a/doc/src/sgml/html/pcp-commands.html +++ b/doc/src/sgml/html/pcp-commands.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Reference" @@ -18,15 +18,15 @@ REL="PREVIOUS" TITLE="Reference" HREF="reference.html"><LINK REL="NEXT" -TITLE="pcp_node_count" -HREF="pcp-node-count.html"><LINK +TITLE="pcp_common_options" +HREF="pcp-common-options.html"><LINK REL="STYLESHEET" TYPE="text/css" HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="REFERENCE" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -77,8 +77,8 @@ WIDTH="20%" ALIGN="right" VALIGN="top" ><A -TITLE="pcp_node_count" -HREF="pcp-node-count.html" +TITLE="pcp_common_options" +HREF="pcp-common-options.html" ACCESSKEY="N" >Next</A ></TD @@ -100,11 +100,85 @@ CLASS="TITLE" ><DIV CLASS="PARTINTRO" ><A -NAME="AEN563" +NAME="AEN561" ></A ><P -> This part contains reference information for pcp commands... - </P +> This part contains reference information for PCP commands. + PCP commands are UNIX commands which manipulate pgpool-II via the network. + Please note that the parameter format for all PCP commands has been changed since pgpool-II 3.5. + </P +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="PCP-CONNECTION-AUTHENTICATION" +>1. PCP connection authentication</A +></H1 +><P +> PCP user names and passwords must be declared in + <TT +CLASS="FILENAME" +>pcp.conf</TT +> in <TT +CLASS="FILENAME" +>$prefix/etc</TT +> + directory. <TT +CLASS="OPTION" +>-F</TT +> option can be used when starting + pgpool-II if <TT +CLASS="FILENAME" +>pcp.conf</TT +> is placed somewhere + else. + </P +></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="PCP-PASSWORD-FILE" +>2. PCP password file</A +></H1 +><P +> The file <TT +CLASS="FILENAME" +>.pcppass</TT +> in a user's home + directory or the file referenced by environment variable + PCPPASSFILE can contain passwords to be used if no password has + been specified for the pcp connection. + </P +><P +> This file should contain lines of the following format: + + </P><PRE +CLASS="PROGRAMLISTING" +> hostname:port:username:password + </PRE +><P> + </P +><P +> (You can add a reminder comment to the file by copying the line + above and preceding it with #.) Each of the first three fields + can be a literal value, or *, which matches anything. The password + field from the first line that matches the current connection + parameters will be used. (Therefore, put more-specific entries + first when you are using wildcards.) If an entry needs to contain + : or \, escape this character with \. A host name of localhost + matches both TCP (host name localhost) and Unix domain socket + connections coming from the local machine. + </P +><P +> The permissions on .pcppass must disallow any access to world or + group; achieve this by the command chmod 0600 ~/.pcppass. If the + permissions are less strict than this, the file will be + ignored. + </P +></DIV ></DIV ><DIV CLASS="TOC" @@ -115,6 +189,11 @@ CLASS="TOC" ></DT ><DT ><A +HREF="pcp-common-options.html" +>pcp_common_options</A +>&nbsp;--&nbsp; common options used in PCP commands</DT +><DT +><A HREF="pcp-node-count.html" >pcp_node_count</A >&nbsp;--&nbsp; displays the total number of database nodes</DT @@ -156,7 +235,7 @@ WIDTH="33%" ALIGN="right" VALIGN="top" ><A -HREF="pcp-node-count.html" +HREF="pcp-common-options.html" ACCESSKEY="N" >Next</A ></TD @@ -180,7 +259,7 @@ ACCESSKEY="U" WIDTH="33%" ALIGN="right" VALIGN="top" ->pcp_node_count</TD +>pcp_common_options</TD ></TR ></TABLE ></DIV diff --git a/doc/src/sgml/html/pcp-common-options.html b/doc/src/sgml/html/pcp-common-options.html new file mode 100644 index 000000000..77313e9fc --- /dev/null +++ b/doc/src/sgml/html/pcp-common-options.html @@ -0,0 +1,396 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML +><HEAD +><TITLE +>pcp_common_options</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK +REV="MADE" +HREF="mailto:pgsql-docs@postgresql.org"><LINK +REL="HOME" +TITLE="pgpool-II 3.6 alpha1 Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="PCP commands" +HREF="pcp-commands.html"><LINK +REL="PREVIOUS" +TITLE="PCP commands" +HREF="pcp-commands.html"><LINK +REL="NEXT" +TITLE="pcp_node_count" +HREF="pcp-node-count.html"><LINK +REL="STYLESHEET" +TYPE="text/css" +HREF="stylesheet.css"><META +HTTP-EQUIV="Content-Type" +CONTENT="text/html; charset=ISO-8859-1"><META +NAME="creation" +CONTENT="2016-03-18T23:36:16"></HEAD +><BODY +CLASS="REFENTRY" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="4" +ALIGN="center" +VALIGN="bottom" +><A +HREF="index.html" +>pgpool-II 3.6 alpha1 Documentation</A +></TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="top" +><A +TITLE="PCP commands" +HREF="pcp-commands.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="top" +><A +HREF="pcp-commands.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="60%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="20%" +ALIGN="right" +VALIGN="top" +><A +TITLE="pcp_node_count" +HREF="pcp-node-count.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><H1 +><A +NAME="PCP-COMMON-OPTIONS" +></A +>pcp_common_options</H1 +><DIV +CLASS="REFNAMEDIV" +><A +NAME="AEN585" +></A +><H2 +>Name</H2 +>pcp_common_options&nbsp;--&nbsp; common options used in PCP commands</DIV +><DIV +CLASS="REFSYNOPSISDIV" +><A +NAME="AEN588" +></A +><H2 +>Synopsis</H2 +><P +><TT +CLASS="COMMAND" +>pcp_command</TT +> [<TT +CLASS="REPLACEABLE" +><I +>option</I +></TT +>...]</P +></DIV +><DIV +CLASS="REFSECT1" +><A +NAME="R1-PCP-COMMON-OPTIONS-1" +></A +><H2 +> Description + </H2 +><P +> There are some arguments common to all PCP commands. Most of + these are for authentication and the rest are about verbose + mode, debug message, and so on. + </P +></DIV +><DIV +CLASS="REFSECT1" +><A +NAME="AEN596" +></A +><H2 +>Options</H2 +><P +> <P +></P +></P><DIV +CLASS="VARIABLELIST" +><DL +><DT +><TT +CLASS="OPTION" +>-h <TT +CLASS="REPLACEABLE" +><I +>hostname</I +></TT +></TT +><BR><TT +CLASS="OPTION" +>--host=<TT +CLASS="REPLACEABLE" +><I +>hostname</I +></TT +></TT +></DT +><DD +><P +> The host name of the machine on which the server is running. If the + value begins with a slash, it is used as the directory for the Unix-domain socket. + </P +></DD +><DT +><TT +CLASS="OPTION" +>-p <TT +CLASS="REPLACEABLE" +><I +>port</I +></TT +></TT +><BR><TT +CLASS="OPTION" +>--port=<TT +CLASS="REPLACEABLE" +><I +>port</I +></TT +></TT +></DT +><DD +><P +> The PCP port number (default:"9898"). + </P +></DD +><DT +><TT +CLASS="OPTION" +>-u <TT +CLASS="REPLACEABLE" +><I +>username</I +></TT +></TT +><BR><TT +CLASS="OPTION" +>--username=<TT +CLASS="REPLACEABLE" +><I +>username</I +></TT +></TT +></DT +><DD +><P +> The user name for PCP authentication (default: OS user name). + </P +></DD +><DT +><TT +CLASS="OPTION" +>-w</TT +><BR><TT +CLASS="OPTION" +>--no-password</TT +></DT +><DD +><P +> Never prompt for password. And if a password is not available + by a <TT +CLASS="FILENAME" +>.pcppass</TT +> file, the connection + attempt will fail. This option can be useful in batch jobs + and scripts where no user is present to enter a password. + </P +></DD +><DT +><TT +CLASS="OPTION" +>-W</TT +><BR><TT +CLASS="OPTION" +>--password</TT +></DT +><DD +><P +> Force password prompt (should happen automatically). + </P +></DD +><DT +><TT +CLASS="OPTION" +>-d</TT +><BR><TT +CLASS="OPTION" +>--debug</TT +></DT +><DD +><P +> Enable debug message. + </P +></DD +><DT +><TT +CLASS="OPTION" +>-v</TT +><BR><TT +CLASS="OPTION" +>--verbose</TT +></DT +><DD +><P +> Enable verbose output. + </P +></DD +><DT +><TT +CLASS="OPTION" +>-V</TT +><BR><TT +CLASS="OPTION" +>--version</TT +></DT +><DD +><P +> Print the command version, then exit. + </P +></DD +><DT +><TT +CLASS="OPTION" +>-?</TT +><BR><TT +CLASS="OPTION" +>--help</TT +></DT +><DD +><P +> Shows help for the command line arguments, then exit. + </P +></DD +></DL +></DIV +><P> + </P +></DIV +><DIV +CLASS="REFSECT1" +><A +NAME="AEN670" +></A +><H2 +>Environment</H2 +><P +></P +><DIV +CLASS="VARIABLELIST" +><DL +><DT +><TT +CLASS="ENVAR" +>PCPPASSFILE</TT +></DT +><DD +><P +> Specifies the path to pcp password file. + </P +></DD +></DL +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="pcp-commands.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="pcp-node-count.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>PCP commands</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="pcp-commands.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>pcp_node_count</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file diff --git a/doc/src/sgml/html/pcp-node-count.html b/doc/src/sgml/html/pcp-node-count.html index 5de2da04a..cd9a1e712 100644 --- a/doc/src/sgml/html/pcp-node-count.html +++ b/doc/src/sgml/html/pcp-node-count.html @@ -9,14 +9,14 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="PCP commands" HREF="pcp-commands.html"><LINK REL="PREVIOUS" -TITLE="PCP commands" -HREF="pcp-commands.html"><LINK +TITLE="pcp_common_options" +HREF="pcp-common-options.html"><LINK REL="NEXT" TITLE="Bibliography" HREF="biblio.html"><LINK @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="REFENTRY" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -53,8 +53,8 @@ WIDTH="10%" ALIGN="left" VALIGN="top" ><A -TITLE="PCP commands" -HREF="pcp-commands.html" +TITLE="pcp_common_options" +HREF="pcp-common-options.html" ACCESSKEY="P" >Prev</A ></TD @@ -95,7 +95,7 @@ NAME="PCP-NODE-COUNT" ><DIV CLASS="REFNAMEDIV" ><A -NAME="AEN572" +NAME="AEN685" ></A ><H2 >Name</H2 @@ -103,7 +103,7 @@ NAME="AEN572" ><DIV CLASS="REFSYNOPSISDIV" ><A -NAME="AEN575" +NAME="AEN688" ></A ><H2 >Synopsis</H2 @@ -116,18 +116,7 @@ CLASS="REPLACEABLE" ><I >option</I ></TT ->...] [<TT -CLASS="OPTION" ->--pgdata</TT -> | <TT -CLASS="OPTION" ->-D</TT ->]<TT -CLASS="REPLACEABLE" -><I -> directory</I -></TT -> </P +>...]</P ></DIV ><DIV CLASS="REFSECT1" @@ -148,84 +137,30 @@ CLASS="FILENAME" >. It does not distinguish between nodes status, ie attached/detached. ALL nodes are counted. </P -></DIV -><DIV -CLASS="REFSECT1" -><A -NAME="AEN592" -></A -><H2 ->Options</H2 -><P -> <P -></P -></P><DIV -CLASS="VARIABLELIST" -><DL -><DT -><TT -CLASS="OPTION" ->-h <TT -CLASS="REPLACEABLE" -><I ->hostname</I -></TT -></TT -><BR><TT -CLASS="OPTION" ->--host=<TT -CLASS="REPLACEABLE" -><I ->hostname</I -></TT -></TT -></DT -><DD ><P -> The host name of the machine on which the server is running. If the - value begins with a slash, it is used as the directory for the Unix-domain socket. - </P -></DD -></DL -></DIV +> Here is an example output: + </P><PRE +CLASS="PROGRAMLISTING" +>$ pcp_node_count -p 11001 +Password: +2 + </PRE ><P> - </P -></DIV -><DIV -CLASS="REFSECT1" -><A -NAME="AEN605" -></A -><H2 ->Environment</H2 -><P -></P -><DIV -CLASS="VARIABLELIST" -><DL -><DT -><TT -CLASS="ENVAR" ->PCPPASSFILE</TT -></DT -><DD -><P -> Specifies the path to pcp password file. - </P -></DD -></DL -></DIV + </P ></DIV ><DIV CLASS="REFSECT1" ><A -NAME="AEN613" +NAME="AEN700" ></A ><H2 ->Notes</H2 +>Options</H2 ><P -> Notes... - </P +> See <A +HREF="pcp-common-options.html" +>pcp_common_options</A +>. + </P ></DIV ><DIV CLASS="NAVFOOTER" @@ -243,7 +178,7 @@ WIDTH="33%" ALIGN="left" VALIGN="top" ><A -HREF="pcp-commands.html" +HREF="pcp-common-options.html" ACCESSKEY="P" >Prev</A ></TD @@ -271,7 +206,7 @@ ACCESSKEY="N" WIDTH="33%" ALIGN="left" VALIGN="top" ->PCP commands</TD +>pcp_common_options</TD ><TD WIDTH="34%" ALIGN="center" diff --git a/doc/src/sgml/html/preface.html b/doc/src/sgml/html/preface.html index 722eeb263..61adac1a8 100644 --- a/doc/src/sgml/html/preface.html +++ b/doc/src/sgml/html/preface.html @@ -9,10 +9,10 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="NEXT" TITLE=" What is pgpool-II?" @@ -23,7 +23,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="PREFACE" ><DIV @@ -41,7 +41,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -50,7 +50,7 @@ WIDTH="10%" ALIGN="left" VALIGN="top" ><A -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html" ACCESSKEY="P" >Prev</A @@ -249,7 +249,7 @@ ACCESSKEY="N" WIDTH="33%" ALIGN="left" VALIGN="top" ->pgpool-II 3.5.0 Documentation</TD +>pgpool-II 3.6 alpha1 Documentation</TD ><TD WIDTH="34%" ALIGN="center" diff --git a/doc/src/sgml/html/reference.html b/doc/src/sgml/html/reference.html index b80b13e32..14a706d53 100644 --- a/doc/src/sgml/html/reference.html +++ b/doc/src/sgml/html/reference.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" TITLE="Platform-specific Notes" @@ -23,7 +23,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="PART" ><DIV @@ -41,7 +41,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -97,14 +97,14 @@ CLASS="TITLE" ><DIV CLASS="PARTINTRO" ><A -NAME="AEN557" +NAME="AEN555" ></A ><P -> About pgool-II reference... +> This part contains reference information for the pgool-II. </P ><P -> The reference entries are also available as traditional - <SPAN +> The reference entries are also available as traditional + <SPAN CLASS="QUOTE" >"man"</SPAN > pages. @@ -126,6 +126,11 @@ HREF="pcp-commands.html" ><DL ><DT ><A +HREF="pcp-common-options.html" +>pcp_common_options</A +>&nbsp;--&nbsp; common options used in PCP commands</DT +><DT +><A HREF="pcp-node-count.html" >pcp_node_count</A >&nbsp;--&nbsp; displays the total number of database nodes</DT diff --git a/doc/src/sgml/html/resources.html b/doc/src/sgml/html/resources.html index f8a930d6b..3a5b8f494 100644 --- a/doc/src/sgml/html/resources.html +++ b/doc/src/sgml/html/resources.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Preface" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/stylesheet.css b/doc/src/sgml/html/stylesheet.css index 60dcc7620..c4e185f0e 100644 --- a/doc/src/sgml/html/stylesheet.css +++ b/doc/src/sgml/html/stylesheet.css @@ -2,17 +2,54 @@ /* color scheme similar to www.postgresql.org */ +@media screen and (min-width: 641px) { + BODY > * { + width: 90%; + margin: auto !important; + display: block; + text-align: left; + } +} + BODY { color: #000000; background: #FFFFFF; font-family: verdana, sans-serif; } -A:link { color:#0066A2; } +script { + display: none; +} + +A:link { color:#0085B0; } A:visited { color:#004E66; } -A:active { color:#0066A2; } +A:active { color:#0085B0; } A:hover { color:#000000; } +p i, pre i, .emphasis em { + font-style: normal; + font-weight: bold; + color: #440000; +} + +.replaceable code { + font-style: italic; +} + +pre strong { + white-space: nowrap; +} + +p span, pre span, p acronym, pre acronym { + font-style: normal; + color: #440000; +} + +p tt, pre tt { + font-family: monospace; + color: #440000; +} + H1 { font-size: 1.4em; font-weight: bold; @@ -22,24 +59,25 @@ H1 { } H2 { - font-size: 1.2em; + font-size: 1.3em; margin: 1.2em 0em 1.2em 0em; font-weight: bold; - color: #666; + color: #EC5800; } H3 { - font-size: 1.1em; + font-size: 1.2em; margin: 1.2em 0em 1.2em 0em; font-weight: bold; - color: #666; + color: #EC5800; } H4 { - font-size: 0.95em; + font-size: 1.1em; margin: 1.2em 0em 1.2em 0em; font-weight: normal; - color: #666; + font-weight: bold; + color: #EC5800; } H5 { @@ -54,15 +92,18 @@ H6 { font-weight: normal; } +p { + line-height: 1.3; +} + /* center some titles */ -.BOOK .TITLE, .BOOK .CORPAUTHOR, .BOOK .COPYRIGHT { +.BOOK .TITLE, .BOOK .CORPAUTHOR, .BOOK .COPYRIGHT, .book .titlepage { text-align: center; } /* decoration for formal examples */ - -DIV.EXAMPLE { +DIV.EXAMPLE, div.example { padding-left: 15px; border-style: solid; border-width: 0px; @@ -71,28 +112,192 @@ DIV.EXAMPLE { margin: 0.5ex; } +BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.WARNING, div.note, div.tip, div.important, div.caution, div.warning, div.blockquote { + margin: 4ex auto; + color: black; + display: block; + border-color: #DBDBCC; + background-color: #EED; + padding: 14px; + max-width: 720px; + border-width: 1px; + border-style: solid; + overfileow: auto; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + -khtml-border-radius: 8px; + border-radius: 8px; +} + /* less dense spacing of TOC */ .BOOK .TOC DL DT { - padding-top: 1.5ex; - padding-bottom: 1.5ex; + padding-top: 1.0ex; + padding-bottom: 1.0ex; } .BOOK .TOC DL DL DT { - padding-top: 0ex; - padding-bottom: 0ex; + padding-top: 0.2ex; + padding-bottom: 0.2ex; } /* miscellaneous */ -PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING { +PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING, pre.literallayout, pre.screen, pre.synopsis, pre.programlisting { margin-left: 4ex; + border-color: #CFCFCF; + background-color: #F7F7F7; + color: #000; + border-width: 1px; + border-style: solid; + padding: 2ex; + margin: 2ex 0px 2ex 2ex; + overflow: auto; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + -khtml-border-radius: 8px; + border-radius: 8px; } -.COMMENT { color: red; } +/* shadow */ + +PRE.LITERALLAYOUT, PRE.SCREEN, PRE.SYNOPSIS, PRE.PROGRAMLISTING, BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.CALSTABLE, table.WARNING, pre.literallayout, pre.screen, pre.synopsis, pre.programlisting, div.note, div.tip, table.caution, table.calstable, table.warning, div.blockquote, .informaltable table, .table-contents table { + -moz-box-shadow: 3px 3px 5px #DFDFDF; + -webkit-box-shadow: 3px 3px 5px #DFDFDF; + -khtml-box-shadow: 3px 3px 5px #DFDFDF; + -o-box-shadow: 3px 3px 5px #DFDFDF; + box-shadow: 3px 3px 5px #DFDFDF; +} + +/* Table Styles */ + +.table-contents table, +.informaltable table, +table.CALSTABLE, +table.CAUTION, +table.WARNING { + border-spacing: 0; + border-collapse: collapse; +} + +.table-contents table, +.informaltable table, +table.CALSTABLE { + margin: 2ex 0 2ex 2ex; + background-color: #E0ECEF; + border: 2px solid #A7C6DF; +} + +table.CAUTION, +table.WARNING { + border-collapse: separate; + display: block; + padding: 0; +} + +table.CAUTION { + background-color: #F5F5DC; + border-color: #DEDFA7; +} + +table.WARNING, div.warning { + background-color: #FFD7D7; + border-color: #DF421E; +} + +table.CALSTABLE td, +table.CALSTABLE th, +table.CAUTION td, +table.CAUTION th, +table.WARNING td, +table.WARNING th { + border-style: solid; +} + +table.CAUTION td, +table.CAUTION th, +table.WARNING td, +table.WARNING th { + border-width: 0; + padding-left: 2ex; + padding-right: 2ex; +} + +table.WARNING td { + padding-top: 7px; +} + +.table-contents table td, +table.CALSTABLE td { + background-color: #FFF; +} + +table.CAUTION td, +table.CAUTION th { + border-color: #f3e4d5; +} + +table.WARNING td, +table.WARNING th { + border-color: #ffd7d7; +} + +.table-contents table, .table-contents td, .table-contents th{ + border: 1px solid #a7c6df; + padding: 0.5ex 0.5ex; +} + +.table-contents table td, +.table-contents table th, +.informaltable table td, +.informaltable table th, +table.CALSTABLE td, +table.CALSTABLE th { + border: 1px solid #a7c6df; + padding: 0.5ex 0.5ex; +} + +.informaltable table td { + background-color: #FFF; +} + +.table-contents table tr:hover td, +.informaltable table tr:hover td, +table.CALSTABLE tr:hover td { + background-color: #EFEFEF; +} + +td.c1, +td.c2, +td.c3, +td.c4, +td.c5, +td.c6 { + font-size: 1.1em; + font-weight: bold; + border-bottom: 0 solid #ffefef; + padding: 1ex 2ex 0; +} + +table.simplelist { + border-collapse: collapse; +} +table.simplelist th, table.simplelist td { + border: 1px solid #ccc; + padding: 10px; +} + +.original { + display: block; + color: #008800; +} + +.actions { + font-size: 65%; +} + +.COMMENT,.comment { color: red; } VAR { font-family: monospace; font-style: italic; } /* Konqueror's standard style for ACRONYM is italic. */ ACRONYM { font-style: inherit; } - -.OPTION { white-space: nowrap; } diff --git a/doc/src/sgml/html/supported-platforms.html b/doc/src/sgml/html/supported-platforms.html index 4accdc25e..1c52aee12 100644 --- a/doc/src/sgml/html/supported-platforms.html +++ b/doc/src/sgml/html/supported-platforms.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="pgpool-IIInstallation from Source Code" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/tutorial-install.html b/doc/src/sgml/html/tutorial-install.html index c532c828c..f901aca60 100644 --- a/doc/src/sgml/html/tutorial-install.html +++ b/doc/src/sgml/html/tutorial-install.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Getting Started" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="SECT1" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/tutorial-start.html b/doc/src/sgml/html/tutorial-start.html index c6c2fa67a..3683f2f03 100644 --- a/doc/src/sgml/html/tutorial-start.html +++ b/doc/src/sgml/html/tutorial-start.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="UP" TITLE="Tutorial" @@ -26,7 +26,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="CHAPTER" ><DIV @@ -44,7 +44,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR diff --git a/doc/src/sgml/html/tutorial.html b/doc/src/sgml/html/tutorial.html index d3d740915..df71775ef 100644 --- a/doc/src/sgml/html/tutorial.html +++ b/doc/src/sgml/html/tutorial.html @@ -9,7 +9,7 @@ CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK REV="MADE" HREF="mailto:pgsql-docs@postgresql.org"><LINK REL="HOME" -TITLE="pgpool-II 3.5.0 Documentation" +TITLE="pgpool-II 3.6 alpha1 Documentation" HREF="index.html"><LINK REL="PREVIOUS" TITLE="Bug Reporting Guidelines" @@ -23,7 +23,7 @@ HREF="stylesheet.css"><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><META NAME="creation" -CONTENT="2016-03-15T07:35:30"></HEAD +CONTENT="2016-03-18T23:36:16"></HEAD ><BODY CLASS="PART" ><DIV @@ -41,7 +41,7 @@ ALIGN="center" VALIGN="bottom" ><A HREF="index.html" ->pgpool-II 3.5.0 Documentation</A +>pgpool-II 3.6 alpha1 Documentation</A ></TH ></TR ><TR @@ -97,7 +97,7 @@ CLASS="TITLE" ><DIV CLASS="PARTINTRO" ><A -NAME="AEN99" +NAME="AEN97" ></A ><P > Explanation about pgpool-II tutorial here... diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml index 84bc7beb5..4cb39fd3a 100644 --- a/doc/src/sgml/legal.sgml +++ b/doc/src/sgml/legal.sgml @@ -3,21 +3,16 @@ <date>2016</date> <copyright> - <year>1996-2016</year> - <holder>The PostgreSQL Global Development Group</holder> + <year>2003-2016</year> + <holder>The Pgpool Global Development Group</holder> </copyright> <legalnotice id="legalnotice"> <title>Legal Notice</title> <para> - <productname>PostgreSQL</productname> is Copyright &copy; 1996-2016 - by the PostgreSQL Global Development Group. - </para> - - <para> - <productname>Postgres95</productname> is Copyright &copy; 1994-5 - by the Regents of the University of California. + <productname>Pgpool and Pgpool-II</productname> are Copyright &copy; 1996-2016 + by the Pgpool Global Development Group. </para> <para> diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index d6ea11f86..d8a6857c4 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -208,4 +208,5 @@ Complete list of usable sgml source files in this directory. <!ENTITY reindexdb SYSTEM "reindexdb.sgml"> <!ENTITY vacuumdb SYSTEM "vacuumdb.sgml"> --> +<!ENTITY pcpCommonOptions SYSTEM "pcp_common_options.sgml"> <!ENTITY pcpNodeCount SYSTEM "pcp_node_count.sgml"> diff --git a/doc/src/sgml/ref/pcp_common_options.sgml b/doc/src/sgml/ref/pcp_common_options.sgml new file mode 100644 index 000000000..b010ec986 --- /dev/null +++ b/doc/src/sgml/ref/pcp_common_options.sgml @@ -0,0 +1,164 @@ +<!-- +doc/src/sgml/ref/pcp_common_options.sgml +Pgpool-II documentation +--> + +<refentry id="PCP-COMMON-OPTIONS"> + <indexterm zone="pcp-common-options"> + <primary>pcp_common_options</primary> + </indexterm> + + <refmeta> + <refentrytitle>pcp_common_options</refentrytitle> + <manvolnum>1</manvolnum> + <refmiscinfo>PCP Command</refmiscinfo> + </refmeta> + + <refnamediv> + <refname>pcp_common_options</refname> + <refpurpose> + common options used in PCP commands</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> + <command>pcp_command</command> + <arg rep="repeat"><replaceable>option</></arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1 id="R1-PCP-common-options-1"> + <title> + Description + </title> + <para> + There are some arguments common to all PCP commands. Most of + these are for authentication and the rest are about verbose + mode, debug message, and so on. + </para> + </refsect1> + + <refsect1> + <title>Options</title> + + <para> + <variablelist> + + <varlistentry> + <term><option>-h <replaceable class="parameter">hostname</replaceable></option></term> + <term><option>--host=<replaceable class="parameter">hostname</replaceable></option></term> + <listitem> + <para> + The host name of the machine on which the server is running. If the + value begins with a slash, it is used as the directory for the Unix-domain socket. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-p <replaceable class="parameter">port</replaceable></option></term> + <term><option>--port=<replaceable class="parameter">port</replaceable></option></term> + <listitem> + <para> + The PCP port number (default:"9898"). + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-u <replaceable class="parameter">username</replaceable></option></term> + <term><option>--username=<replaceable class="parameter">username</replaceable></option></term> + <listitem> + <para> + The user name for PCP authentication (default: OS user name). + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-w</option></term> + <term><option>--no-password</option></term> + <listitem> + <para> + Never prompt for password. And if a password is not available + by a <filename>.pcppass</filename> file, the connection + attempt will fail. This option can be useful in batch jobs + and scripts where no user is present to enter a password. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-W</option></term> + <term><option>--password</option></term> + <listitem> + <para> + Force password prompt (should happen automatically). + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-d</option></term> + <term><option>--debug</option></term> + <listitem> + <para> + Enable debug message. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-v</option></term> + <term><option>--verbose</option></term> + <listitem> + <para> + Enable verbose output. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-V</option></term> + <term><option>--version</option></term> + <listitem> + <para> + Print the command version, then exit. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-?</option></term> + <term><option>--help</option></term> + <listitem> + <para> + Shows help for the command line arguments, then exit. + </para> + </listitem> + </varlistentry> + + </variablelist> + </para> + + </refsect1> + + <refsect1> + <title>Environment</title> + + <variablelist> + <varlistentry> + <term><envar>PCPPASSFILE</envar></term> + + <listitem> + <para> + Specifies the path to pcp password file. + </para> + </listitem> + </varlistentry> + + </variablelist> + + </refsect1> + +</refentry> diff --git a/doc/src/sgml/ref/pcp_node_count.sgml b/doc/src/sgml/ref/pcp_node_count.sgml index 1e0e5975b..5a15d84aa 100644 --- a/doc/src/sgml/ref/pcp_node_count.sgml +++ b/doc/src/sgml/ref/pcp_node_count.sgml @@ -24,13 +24,6 @@ Pgpool-II documentation <cmdsynopsis> <command>pcp_node_count</command> <arg rep="repeat"><replaceable>option</replaceable></arg> - <group choice="plain"> - <group choice="opt"> - <arg choice="plain"><option>--pgdata</option></arg> - <arg choice="plain"><option>-D</option></arg> - </group> - <replaceable> directory</replaceable> - </group> </cmdsynopsis> </refsynopsisdiv> @@ -43,65 +36,21 @@ Pgpool-II documentation displays the total number of database nodes defined in <filename>pgpool.conf</filename>. It does not distinguish between nodes status, ie attached/detached. ALL nodes are counted. </para> + <para> + Here is an example output: + <programlisting> +$ pcp_node_count -p 11001 +Password: +2 + </programlisting> + </para> </refsect1> <refsect1> <title>Options</title> - <para> - <variablelist> - - <varlistentry> - <term><option>-h <replaceable class="parameter">hostname</replaceable></option></term> - <term><option>--host=<replaceable class="parameter">hostname</replaceable></option></term> - <listitem> - <para> - The host name of the machine on which the server is running. If the - value begins with a slash, it is used as the directory for the Unix-domain socket. - </para> - </listitem> - </varlistentry> - - </variablelist> + See <xref linkend="pcp-common-options">. </para> - - </refsect1> - - <refsect1> - <title>Environment</title> - - <variablelist> - <varlistentry> - <term><envar>PCPPASSFILE</envar></term> - - <listitem> - <para> - Specifies the path to pcp password file. - </para> - </listitem> - </varlistentry> - - </variablelist> - </refsect1> - <refsect1> - <title>Notes</title> - - <para> - Notes... - </para> - </refsect1> - -<!-- - <refsect1> - <title>See Also</title> - - <simplelist type="inline"> - <member><xref linkend="app-pg-ctl"></member> - <member><xref linkend="app-postgres"></member> - </simplelist> - </refsect1> ---> - </refentry> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 765a4de35..15edbe03f 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -5,271 +5,78 @@ <partintro> <para> - About pgool-II reference... + This part contains reference information for the pgool-II. </para> <para> - The reference entries are also available as traditional - <quote>man</quote> pages. + The reference entries are also available as traditional + <quote>man</quote> pages. </para> </partintro> -<!-- - - <reference id="sql-commands"> - <title>SQL Commands</title> - - <partintro> - <para> - This part contains reference information for the - <acronym>SQL</acronym> commands supported by - <productname>PostgreSQL</productname>. By <quote>SQL</quote> the - language in general is meant; information about the standards - conformance and compatibility of each command can be found on the - respective reference page. - </para> - </partintro> - - &abort; - &alterAggregate; - &alterCollation; - &alterConversion; - &alterDatabase; - &alterDefaultPrivileges; - &alterDomain; - &alterEventTrigger; - &alterExtension; - &alterForeignDataWrapper; - &alterForeignTable; - &alterFunction; - &alterGroup; - &alterIndex; - &alterLanguage; - &alterLargeObject; - &alterMaterializedView; - &alterOperator; - &alterOperatorClass; - &alterOperatorFamily; - &alterPolicy; - &alterRole; - &alterRule; - &alterSchema; - &alterSequence; - &alterServer; - &alterSystem; - &alterTable; - &alterTableSpace; - &alterTSConfig; - &alterTSDictionary; - &alterTSParser; - &alterTSTemplate; - &alterTrigger; - &alterType; - &alterUser; - &alterUserMapping; - &alterView; - &analyze; - &begin; - &checkpoint; - &close; - &cluster; - &commentOn; - &commit; - &commitPrepared; - &copyTable; - &createAggregate; - &createCast; - &createCollation; - &createConversion; - &createDatabase; - &createDomain; - &createEventTrigger; - &createExtension; - &createForeignDataWrapper; - &createForeignTable; - &createFunction; - &createGroup; - &createIndex; - &createLanguage; - &createMaterializedView; - &createOperator; - &createOperatorClass; - &createOperatorFamily; - &createPolicy; - &createRole; - &createRule; - &createSchema; - &createSequence; - &createServer; - &createTable; - &createTableAs; - &createTableSpace; - &createTSConfig; - &createTSDictionary; - &createTSParser; - &createTSTemplate; - &createTransform; - &createTrigger; - &createType; - &createUser; - &createUserMapping; - &createView; - &deallocate; - &declare; - &delete; - &discard; - &do; - &dropAggregate; - &dropCast; - &dropCollation; - &dropConversion; - &dropDatabase; - &dropDomain; - &dropEventTrigger; - &dropExtension; - &dropForeignDataWrapper; - &dropForeignTable; - &dropFunction; - &dropGroup; - &dropIndex; - &dropLanguage; - &dropMaterializedView; - &dropOperator; - &dropOperatorClass; - &dropOperatorFamily; - &dropOwned; - &dropPolicy; - &dropRole; - &dropRule; - &dropSchema; - &dropSequence; - &dropServer; - &dropTable; - &dropTableSpace; - &dropTSConfig; - &dropTSDictionary; - &dropTSParser; - &dropTSTemplate; - &dropTransform; - &dropTrigger; - &dropType; - &dropUser; - &dropUserMapping; - &dropView; - &end; - &execute; - &explain; - &fetch; - &grant; - &importForeignSchema; - &insert; - &listen; - &load; - &lock; - &move; - &notify; - &prepare; - &prepareTransaction; - &reassignOwned; - &refreshMaterializedView; - &reindex; - &releaseSavepoint; - &reset; - &revoke; - &rollback; - &rollbackPrepared; - &rollbackTo; - &savepoint; - &securityLabel; - &select; - &selectInto; - &set; - &setConstraints; - &setRole; - &setSessionAuth; - &setTransaction; - &show; - &startTransaction; - &truncate; - &unlisten; - &update; - &vacuum; - &values; - - </reference> - - <reference id="reference-client"> - <title>PostgreSQL Client Applications</title> - - <partintro> - <para> - This part contains reference information for - <productname>PostgreSQL</productname> client applications and - utilities. Not all of these commands are of general utility; some - might require special privileges. The common feature of these - applications is that they can be run on any host, independent of - where the database server resides. - </para> - - <para> - When specified on the command line, user and database names have - their case preserved &mdash; the presence of spaces or special - characters might require quoting. Table names and other identifiers - do not have their case preserved, except where documented, and - might require quoting. - </para> - </partintro> - - &clusterdb; - &createdb; - &createlang; - &createuser; - &dropdb; - &droplang; - &dropuser; - &ecpgRef; - &pgBasebackup; - &pgbench; - &pgConfig; - &pgDump; - &pgDumpall; - &pgIsready; - &pgReceivexlog; - &pgRecvlogical; - &pgRestore; - &psqlRef; - &reindexdb; - &vacuumdb; - - </reference> - ---> - <reference id="pcp-commands"> - <title>PCP commands</title> - - <partintro> - <para> - This part contains reference information for pcp commands... - </para> - </partintro> + <title>PCP commands</title> + + <partintro> + <para> + This part contains reference information for PCP commands. + PCP commands are UNIX commands which manipulate pgpool-II via the network. + Please note that the parameter format for all PCP commands has been changed since pgpool-II 3.5. + </para> + + <sect1 id="pcp-connection-authentication"> + <title>PCP connection authentication</title> + <para> + PCP user names and passwords must be declared in + <filename>pcp.conf</filename> in <filename>$prefix/etc</filename> + directory. <option>-F</option> option can be used when starting + pgpool-II if <filename>pcp.conf</filename> is placed somewhere + else. + </para> + </sect1> + + <sect1 id="pcp-password-file"> + <title>PCP password file</title> + <para> + The file <filename>.pcppass</filename> in a user's home + directory or the file referenced by environment variable + PCPPASSFILE can contain passwords to be used if no password has + been specified for the pcp connection. + </para> + <para> + This file should contain lines of the following format: + + <programlisting> + hostname:port:username:password + </programlisting> + </para> + + <para> + (You can add a reminder comment to the file by copying the line + above and preceding it with #.) Each of the first three fields + can be a literal value, or *, which matches anything. The password + field from the first line that matches the current connection + parameters will be used. (Therefore, put more-specific entries + first when you are using wildcards.) If an entry needs to contain + : or \, escape this character with \. A host name of localhost + matches both TCP (host name localhost) and Unix domain socket + connections coming from the local machine. + </para> + + <para> + The permissions on .pcppass must disallow any access to world or + group; achieve this by the command chmod 0600 ~/.pcppass. If the + permissions are less strict than this, the file will be + ignored. + </para> + + </sect1> + + </partintro> + + &pcpCommonOptions; + &pcpNodeCount; -<!-- - &initdb; - &pgarchivecleanup; - &pgControldata; - &pgCtl; - &pgResetxlog; - &pgRewind; - &pgtestfsync; - &pgtesttiming; - &pgupgrade; - &pgxlogdump; - &postgres; - &postmaster; ---> - &pcpNodeCount; </reference> - </part> diff --git a/doc/src/sgml/stylesheet.css b/doc/src/sgml/stylesheet.css index 60dcc7620..c4e185f0e 100644 --- a/doc/src/sgml/stylesheet.css +++ b/doc/src/sgml/stylesheet.css @@ -2,17 +2,54 @@ /* color scheme similar to www.postgresql.org */ +@media screen and (min-width: 641px) { + BODY > * { + width: 90%; + margin: auto !important; + display: block; + text-align: left; + } +} + BODY { color: #000000; background: #FFFFFF; font-family: verdana, sans-serif; } -A:link { color:#0066A2; } +script { + display: none; +} + +A:link { color:#0085B0; } A:visited { color:#004E66; } -A:active { color:#0066A2; } +A:active { color:#0085B0; } A:hover { color:#000000; } +p i, pre i, .emphasis em { + font-style: normal; + font-weight: bold; + color: #440000; +} + +.replaceable code { + font-style: italic; +} + +pre strong { + white-space: nowrap; +} + +p span, pre span, p acronym, pre acronym { + font-style: normal; + color: #440000; +} + +p tt, pre tt { + font-family: monospace; + color: #440000; +} + H1 { font-size: 1.4em; font-weight: bold; @@ -22,24 +59,25 @@ H1 { } H2 { - font-size: 1.2em; + font-size: 1.3em; margin: 1.2em 0em 1.2em 0em; font-weight: bold; - color: #666; + color: #EC5800; } H3 { - font-size: 1.1em; + font-size: 1.2em; margin: 1.2em 0em 1.2em 0em; font-weight: bold; - color: #666; + color: #EC5800; } H4 { - font-size: 0.95em; + font-size: 1.1em; margin: 1.2em 0em 1.2em 0em; font-weight: normal; - color: #666; + font-weight: bold; + color: #EC5800; } H5 { @@ -54,15 +92,18 @@ H6 { font-weight: normal; } +p { + line-height: 1.3; +} + /* center some titles */ -.BOOK .TITLE, .BOOK .CORPAUTHOR, .BOOK .COPYRIGHT { +.BOOK .TITLE, .BOOK .CORPAUTHOR, .BOOK .COPYRIGHT, .book .titlepage { text-align: center; } /* decoration for formal examples */ - -DIV.EXAMPLE { +DIV.EXAMPLE, div.example { padding-left: 15px; border-style: solid; border-width: 0px; @@ -71,28 +112,192 @@ DIV.EXAMPLE { margin: 0.5ex; } +BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.WARNING, div.note, div.tip, div.important, div.caution, div.warning, div.blockquote { + margin: 4ex auto; + color: black; + display: block; + border-color: #DBDBCC; + background-color: #EED; + padding: 14px; + max-width: 720px; + border-width: 1px; + border-style: solid; + overfileow: auto; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + -khtml-border-radius: 8px; + border-radius: 8px; +} + /* less dense spacing of TOC */ .BOOK .TOC DL DT { - padding-top: 1.5ex; - padding-bottom: 1.5ex; + padding-top: 1.0ex; + padding-bottom: 1.0ex; } .BOOK .TOC DL DL DT { - padding-top: 0ex; - padding-bottom: 0ex; + padding-top: 0.2ex; + padding-bottom: 0.2ex; } /* miscellaneous */ -PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING { +PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING, pre.literallayout, pre.screen, pre.synopsis, pre.programlisting { margin-left: 4ex; + border-color: #CFCFCF; + background-color: #F7F7F7; + color: #000; + border-width: 1px; + border-style: solid; + padding: 2ex; + margin: 2ex 0px 2ex 2ex; + overflow: auto; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + -khtml-border-radius: 8px; + border-radius: 8px; } -.COMMENT { color: red; } +/* shadow */ + +PRE.LITERALLAYOUT, PRE.SCREEN, PRE.SYNOPSIS, PRE.PROGRAMLISTING, BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.CALSTABLE, table.WARNING, pre.literallayout, pre.screen, pre.synopsis, pre.programlisting, div.note, div.tip, table.caution, table.calstable, table.warning, div.blockquote, .informaltable table, .table-contents table { + -moz-box-shadow: 3px 3px 5px #DFDFDF; + -webkit-box-shadow: 3px 3px 5px #DFDFDF; + -khtml-box-shadow: 3px 3px 5px #DFDFDF; + -o-box-shadow: 3px 3px 5px #DFDFDF; + box-shadow: 3px 3px 5px #DFDFDF; +} + +/* Table Styles */ + +.table-contents table, +.informaltable table, +table.CALSTABLE, +table.CAUTION, +table.WARNING { + border-spacing: 0; + border-collapse: collapse; +} + +.table-contents table, +.informaltable table, +table.CALSTABLE { + margin: 2ex 0 2ex 2ex; + background-color: #E0ECEF; + border: 2px solid #A7C6DF; +} + +table.CAUTION, +table.WARNING { + border-collapse: separate; + display: block; + padding: 0; +} + +table.CAUTION { + background-color: #F5F5DC; + border-color: #DEDFA7; +} + +table.WARNING, div.warning { + background-color: #FFD7D7; + border-color: #DF421E; +} + +table.CALSTABLE td, +table.CALSTABLE th, +table.CAUTION td, +table.CAUTION th, +table.WARNING td, +table.WARNING th { + border-style: solid; +} + +table.CAUTION td, +table.CAUTION th, +table.WARNING td, +table.WARNING th { + border-width: 0; + padding-left: 2ex; + padding-right: 2ex; +} + +table.WARNING td { + padding-top: 7px; +} + +.table-contents table td, +table.CALSTABLE td { + background-color: #FFF; +} + +table.CAUTION td, +table.CAUTION th { + border-color: #f3e4d5; +} + +table.WARNING td, +table.WARNING th { + border-color: #ffd7d7; +} + +.table-contents table, .table-contents td, .table-contents th{ + border: 1px solid #a7c6df; + padding: 0.5ex 0.5ex; +} + +.table-contents table td, +.table-contents table th, +.informaltable table td, +.informaltable table th, +table.CALSTABLE td, +table.CALSTABLE th { + border: 1px solid #a7c6df; + padding: 0.5ex 0.5ex; +} + +.informaltable table td { + background-color: #FFF; +} + +.table-contents table tr:hover td, +.informaltable table tr:hover td, +table.CALSTABLE tr:hover td { + background-color: #EFEFEF; +} + +td.c1, +td.c2, +td.c3, +td.c4, +td.c5, +td.c6 { + font-size: 1.1em; + font-weight: bold; + border-bottom: 0 solid #ffefef; + padding: 1ex 2ex 0; +} + +table.simplelist { + border-collapse: collapse; +} +table.simplelist th, table.simplelist td { + border: 1px solid #ccc; + padding: 10px; +} + +.original { + display: block; + color: #008800; +} + +.actions { + font-size: 65%; +} + +.COMMENT,.comment { color: red; } VAR { font-family: monospace; font-style: italic; } /* Konqueror's standard style for ACRONYM is italic. */ ACRONYM { font-style: inherit; } - -.OPTION { white-space: nowrap; } diff --git a/doc/src/sgml/version.sgml b/doc/src/sgml/version.sgml index 0474bcd90..ddccb01c0 100644 --- a/doc/src/sgml/version.sgml +++ b/doc/src/sgml/version.sgml @@ -1 +1 @@ -<!ENTITY version "3.5.0"> +<!ENTITY version "3.6 alpha1"> [parent: ac21647ae470]