Update the help files, removing old ones, updating PostgresDoc73.php accordingly...
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sun, 11 Apr 2010 22:29:37 +0000 (00:29 +0200)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sun, 11 Apr 2010 22:29:37 +0000 (00:29 +0200)
admin.php
help/PostgresDoc70.php [deleted file]
help/PostgresDoc71.php [deleted file]
help/PostgresDoc72.php [deleted file]
help/PostgresDoc73.php
help/PostgresDoc90.php [moved from help/PostgresDoc85.php with 53% similarity]

index dcd94954070ded25ab10b839ef351a4048929035..3dd05494733d6c79c2abbfecb6625c16b944133f 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -16,7 +16,7 @@
                if ($confirm) {
                        if (isset($_REQUEST['ma'])) {
                                $misc->printTrail('schema');
-                               $misc->printTitle($lang['strclusterindex'], 'pg.cluster');
+                               $misc->printTitle($lang['strclusterindex'], 'pg.index.cluster');
 
                                echo "<form action=\"{$script}\" method=\"post\">\n";
                                foreach($_REQUEST['ma'] as $v) {
@@ -27,7 +27,7 @@
                        } // END if multi cluster
                        else {
                                $misc->printTrail($type);
-                               $misc->printTitle($lang['strclusterindex'], 'pg.cluster');
+                               $misc->printTitle($lang['strclusterindex'], 'pg.index.cluster');
                                
                                echo "<form action=\"{$script}\" method=\"post\">\n";
                                
diff --git a/help/PostgresDoc70.php b/help/PostgresDoc70.php
deleted file mode 100644 (file)
index 4613505..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 7.0 documentation
- *
- * $Id: PostgresDoc70.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
- */
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7');
-
-# TODO: Check and fix links for >= 7.0 and <= 7.3 (those in the following array)
-
-$this->help_page = array(
-       'pg.cast'                       => array('sql-expressions.html#SQL-SYNTAX-TYPE-CASTS','sql-createcast.html'),
-       'pg.cast.create'                => 'sql-createcast.html',
-       'pg.cast.drop'                  => 'sql-dropcast.html',
-
-       'pg.column.add'                 => array('ddl-alter.html#AEN2115', 'sql-altertable.html'),
-       'pg.column.alter'               => array('ddl-alter.html','sql-altertable.html'),
-       'pg.column.drop'                => array('ddl-alter.html#AEN2124', 'sql-altertable.html'),
-
-       'pg.constraint'                 => 'ddl-constraints.html',
-       'pg.constraint.add'             => 'ddl-alter.html#AEN2131',
-       'pg.constraint.check'           => 'ddl-constraints.html#AEN1895',
-       'pg.constraint.drop'            => 'ddl-alter.html#AEN2140',
-       'pg.constraint.foreign_key'     => 'ddl-constraints.html#DDL-CONSTRAINTS-FK',
-       'pg.constraint.primary_key'     => 'ddl-constraints.html#AEN1972',
-       'pg.constraint.unique_key'      => 'ddl-constraints.html#AEN1950',
-
-       'pg.conversion'                 => 'multibyte.html',
-       'pg.conversion.alter'           => 'sql-alterconversion.html',
-       'pg.conversion.create'          => 'sql-createconversion.html',
-       'pg.conversion.drop'            => 'sql-dropconversion.html',
-
-       'pg.domain'                     => 'extend-type-system.html#AEN28657',
-       'pg.domain.alter'               => 'sql-alterdomain.html',
-       'pg.domain.create'              => 'sql-createdomain.html',
-       'pg.domain.drop'                => 'sql-dropdomain.html',
-
-       'pg.function'                   => array('xfunc.html', 'functions.html', 'sql-expressions.html#AEN1599'),
-       'pg.function.alter'             => 'sql-alterfunction.html',
-       'pg.function.create'            => 'sql-createfunction.html',
-       'pg.function.create.c'          => array('xfunc-c.html','sql-createfunction.html'),
-       'pg.function.create.internal'   => array('xfunc-internal.html','sql-createfunction.html'),
-       'pg.function.create.pl'         => array('xfunc-sql.html','xfunc-pl.html','sql-createfunction.html'),
-       'pg.function.drop'              => 'sql-dropfunction.html',
-
-       'pg.group'                      => 'groups.html',
-       'pg.group.alter'                => array('sql-altergroup.html','groups.html'),
-       'pg.group.create'               => 'sql-creategroup.html',
-       'pg.group.drop'                 => 'sql-dropgroup.html',
-
-       'pg.index'                      => 'indexes.html',
-       'pg.index.cluster'              => 'sql-cluster.html',
-       'pg.index.drop'                 => 'sql-dropindex.html',
-       'pg.index.create'               => 'sql-createindex.html',
-       'pg.index.reindex'              => 'sql-reindex.html',
-
-       'pg.language'                   => 'xplang.html',
-       'pg.language.alter'             => 'sql-alterlanguage.html',
-       'pg.language.create'            => 'sql-createlanguage.html',
-       'pg.language.drop'              => 'sql-droplanguage.html',
-
-       'pg.opclass'                    => 'indexes-opclass.html',
-       'pg.opclass.alter'              => 'sql-alteropclass.html',
-       'pg.opclass.create'             => 'sql-createopclass.html',
-       'pg.opclass.drop'               => 'sql-dropopclass.html',
-
-       'pg.operator'                   => array('xoper.html', 'functions.html', 'sql-expressions.html#AEN1570'),
-       'pg.operator.alter'             => 'sql-alteroperator.html',
-       'pg.operator.create'            => 'sql-createoperator.html',
-       'pg.operator.drop'              => 'sql-dropoperator.html',
-
-       'pg.pl'                         => 'xplang.html',
-       'pg.pl.plperl'                  => 'plperl.html',
-       'pg.pl.plpgsql'                 => 'plpgsql.html',
-       'pg.pl.plpython'                => 'plpython.html',
-       'pg.pl.pltcl'                   => 'pltcl.html',
-
-       'pg.privilege'                  => array('privileges.html','ddl-priv.html'),
-       'pg.privilege.grant'            => 'sql-grant.html',
-       'pg.privilege.revoke'           => 'sql-revoke.html',
-
-       'pg.process'                    => 'monitoring.html',
-
-       'pg.rule'                       => 'rules.html',
-       'pg.rule.create'                => 'sql-createrule.html',
-       'pg.rule.drop'                  => 'sql-droprule.html',
-
-       'pg.schema'                     => 'ddl-schemas.html',
-       'pg.schema.alter'               => 'sql-alterschema.html',
-       'pg.schema.create'              => array( 'sql-createschema.html','ddl-schemas.html#DDL-SCHEMAS-CREATE'),
-       'pg.schema.drop'                => 'sql-dropschema.html',
-       'pg.schema.search_path'         => 'ddl-schemas.html#DDL-SCHEMAS-PATH',
-       
-       'pg.sequence'                   => 'functions-sequence.html',
-       'pg.sequence.alter'             => 'sql-altersequence.html',
-       'pg.sequence.create'            => 'sql-createsequence.html',
-       'pg.sequence.drop'              => 'sql-dropsequence.html',
-
-       'pg.sql'                        => array('sql.html','sql-commands.html'),
-       'pg.sql.insert'                 => 'sql-insert.html',
-       'pg.sql.select'                 => 'sql-select.html',
-       'pg.sql.update'                 => 'sql-update.html',
-
-       'pg.table'                      => 'ddl.html#DDL-BASICS',
-       'pg.table.alter'                => 'sql-altertable.html',
-       'pg.table.create'               => 'sql-createtable.html',
-       'pg.table.drop'                 => 'sql-droptable.html',
-       'pg.table.empty'                => 'sql-truncate.html',
-
-       'pg.tablespace'                 => 'manage-ag-tablespaces.html',
-       'pg.tablespace.alter'           => 'sql-altertablespace.html',
-       'pg.tablespace.create'          => 'sql-createtablespace.html',
-       'pg.tablespace.drop'            => 'sql-droptablespace.html',
-
-       'pg.trigger'                    => 'triggers.html',
-       'pg.trigger.alter'              => 'sql-altertrigger.html',
-       'pg.trigger.create'             => 'sql-createtrigger.html',
-       'pg.trigger.drop'               => 'sql-droptrigger.html',
-
-       'pg.type'                       => array('xtypes.html','datatype.html','extend-type-system.html'),
-       'pg.type.alter'                 => 'sql-altertype.html',
-       'pg.type.create'                => 'sql-createtype.html',
-       'pg.type.drop'                  => 'sql-droptype.html',
-
-       'pg.user.alter'                 => array('sql-alteruser.html','user-attributes.html'),
-       'pg.user.create'                => array('sql-createuser.html','user-manag.html#DATABASE-USERS'),
-       'pg.user.drop'                  => array('sql-dropuser.html','user-manag.html#DATABASE-USERS'),
-
-       'pg.variable'                   => 'runtime-config.html',
-
-       'pg.view'                       => 'tutorial-views.html',
-       'pg.view.alter'                 => 'sql-createview.html',
-       'pg.view.create'                => 'sql-createview.html',
-       'pg.view.drop'                  => 'sql-dropview.html',
-);
-
-# correct links follow:
-
-$this->help_page['pg.admin.analyze'] = 'sql-vacuum.htm';
-$this->help_page['pg.admin.vacuum'] = 'sql-vacuum.htm';
-
-$this->help_page['pg.aggregate'] = array('xaggr.htm', 'query27856.htm', 'syntax658.htm');
-$this->help_page['pg.aggregate.create'] = 'sql-createaggregate.htm';
-$this->help_page['pg.aggregate.drop'] = 'sql-dropaggregate.htm';
-
-$this->help_page['pg.database'] = 'manage-ag.htm';
-$this->help_page['pg.database.create'] = array('sql-createdatabase.htm', 'manage-ag.htm#AEN17907');
-$this->help_page['pg.database.drop'] = array('sql-dropdatabase.htm', 'manage-ag17956.htm');
-
-$this->help_page['pg.server'] = 'part-admin.htm';
-
-$this->help_page['pg.user'] = 'newuser.htm';
-
-?>
diff --git a/help/PostgresDoc71.php b/help/PostgresDoc71.php
deleted file mode 100644 (file)
index f2f272d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 7.1 documentation
- *
- * $Id: PostgresDoc71.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
- */
-
-include('./help/PostgresDoc70.php');
-
-# TODO: Check and fix links for 7.1
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.1');
-
-$this->help_page['pg.admin.analyze'] = 'sql-vacuum.html';
-$this->help_page['pg.admin.vacuum'] = 'sql-vacuum.html';
-
-$this->help_page['pg.aggregate'] = array('xaggr.html', 'query-agg.html', 'functions-aggregate.html', 'sql-expressions.html#SYNTAX-AGGREGATES');
-$this->help_page['pg.aggregate.create'] = 'sql-createaggregate.html';
-$this->help_page['pg.aggregate.drop'] = 'sql-dropaggregate.html';
-
-$this->help_page['pg.database'] = 'managing-databases.html';
-$this->help_page['pg.database.create'] = array('sql-createdatabase.html', 'managing-databases.html#MANAGE-AG-CREATEDB');
-$this->help_page['pg.database.drop'] = array('sql-dropdatabase.html', 'manage-ag-dropdb.html');
-
-$this->help_page['pg.server'] = 'admin.html';
-
-$this->help_page['pg.user'] = 'user-manag.html';
-
-?>
diff --git a/help/PostgresDoc72.php b/help/PostgresDoc72.php
deleted file mode 100644 (file)
index 10b4df0..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 7.2 documentation
- *
- * $Id: PostgresDoc72.php,v 1.5 2007/09/13 14:53:41 ioguix Exp $
- */
-
-include('./help/PostgresDoc71.php');
-
-# TODO: Check and fix links for 7.2
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.2');
-
-$this->help_page['pg.admin.analyze'] = 'sql-analyze.html';
-
-$this->help_page['pg.aggregate'][1] = 'tutorial-agg.html';
-
-$this->help_page['pg.view.alter'] = array('sql-createview.html','sql-altertable.html');
-?>
index 99d357f1edf9b94b6138613da3474e947dbab463..078b2dc4b0207352de3af13fb3cde5ea25d5fe94 100644 (file)
 
 /**
  * Help links for PostgreSQL 7.3 documentation
- *
- * $Id: PostgresDoc73.php,v 1.5 2006/05/24 04:53:40 chriskl Exp $
  */
 
-include('./help/PostgresDoc72.php');
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.3');
 
-# TODO: Check and fix links for 7.3
+# TODO: Check and fix links
 
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.3');
+$this->help_page = array(
+
+       'pg.database'                   => 'managing-databases.html',
+       'pg.database.create'    => array('sql-createdatabase.html', 'manage-ag-createdb.html'),
+       'pg.database.alter'             => 'sql-alterdatabase.html',
+       'pg.database.drop'              => array('sql-dropdatabase.html', 'manage-ag-dropdb.html'),
+
+       'pg.admin.analyze'      => 'sql-analyze.html',
+       'pg.admin.vacuum'       => 'sql-vacuum.html',
+
+       'pg.cast'                       => array('sql-expressions.html#SQL-SYNTAX-TYPE-CASTS','sql-createcast.html'),
+       'pg.cast.create'                => 'sql-createcast.html',
+       'pg.cast.drop'                  => 'sql-dropcast.html',
+
+       'pg.column.add'                 => array('ddl-alter.html#AEN2115', 'sql-altertable.html'),
+       'pg.column.alter'               => array('ddl-alter.html','sql-altertable.html'),
+       'pg.column.drop'                => array('ddl-alter.html#AEN2124', 'sql-altertable.html'),
+
+       'pg.constraint'                 => 'ddl-constraints.html',
+       'pg.constraint.add'             => 'ddl-alter.html#AEN2131',
+       'pg.constraint.check'           => 'ddl-constraints.html#AEN1895',
+       'pg.constraint.drop'            => 'ddl-alter.html#AEN2140',
+       'pg.constraint.foreign_key'     => 'ddl-constraints.html#DDL-CONSTRAINTS-FK',
+       'pg.constraint.primary_key'     => 'ddl-constraints.html#AEN1972',
+       'pg.constraint.unique_key'      => 'ddl-constraints.html#AEN1950',
+
+       'pg.conversion'                 => 'multibyte.html',
+       'pg.conversion.alter'           => 'sql-alterconversion.html',
+       'pg.conversion.create'          => 'sql-createconversion.html',
+       'pg.conversion.drop'            => 'sql-dropconversion.html',
+
+       'pg.domain'                     => 'extend-type-system.html#AEN28657',
+       'pg.domain.alter'               => 'sql-alterdomain.html',
+       'pg.domain.create'              => 'sql-createdomain.html',
+       'pg.domain.drop'                => 'sql-dropdomain.html',
+
+       'pg.function'                   => array('xfunc.html', 'functions.html', 'sql-expressions.html#AEN1599'),
+       'pg.function.alter'             => 'sql-alterfunction.html',
+       'pg.function.create'            => 'sql-createfunction.html',
+       'pg.function.create.c'          => array('xfunc-c.html','sql-createfunction.html'),
+       'pg.function.create.internal'   => array('xfunc-internal.html','sql-createfunction.html'),
+       'pg.function.create.pl'         => array('xfunc-sql.html','xfunc-pl.html','sql-createfunction.html'),
+       'pg.function.drop'              => 'sql-dropfunction.html',
+
+       'pg.group'                      => 'groups.html',
+       'pg.group.alter'                => array('sql-altergroup.html','groups.html'),
+       'pg.group.create'               => 'sql-creategroup.html',
+       'pg.group.drop'                 => 'sql-dropgroup.html',
+
+       'pg.index'                      => 'indexes.html',
+       'pg.index.cluster'              => 'sql-cluster.html',
+       'pg.index.drop'                 => 'sql-dropindex.html',
+       'pg.index.create'               => 'sql-createindex.html',
+       'pg.index.reindex'              => 'sql-reindex.html',
+
+       'pg.language'                   => 'xplang.html',
+       'pg.language.alter'             => 'sql-alterlanguage.html',
+       'pg.language.create'            => 'sql-createlanguage.html',
+       'pg.language.drop'              => 'sql-droplanguage.html',
+
+       'pg.opclass'                    => 'indexes-opclass.html',
+       'pg.opclass.alter'              => 'sql-alteropclass.html',
+       'pg.opclass.create'             => 'sql-createopclass.html',
+       'pg.opclass.drop'               => 'sql-dropopclass.html',
+
+       'pg.operator'                   => array('xoper.html', 'functions.html', 'sql-expressions.html#AEN1570'),
+       'pg.operator.alter'             => 'sql-alteroperator.html',
+       'pg.operator.create'            => 'sql-createoperator.html',
+       'pg.operator.drop'              => 'sql-dropoperator.html',
+
+       'pg.pl'                         => 'xplang.html',
+       'pg.pl.plperl'                  => 'plperl.html',
+       'pg.pl.plpgsql'                 => 'plpgsql.html',
+       'pg.pl.plpython'                => 'plpython.html',
+       'pg.pl.pltcl'                   => 'pltcl.html',
+
+       'pg.privilege'                  => array('privileges.html','ddl-priv.html'),
+       'pg.privilege.grant'            => 'sql-grant.html',
+       'pg.privilege.revoke'           => 'sql-revoke.html',
+
+       'pg.process'                    => 'monitoring.html',
+
+       'pg.rule'                       => 'rules.html',
+       'pg.rule.create'                => 'sql-createrule.html',
+       'pg.rule.drop'                  => 'sql-droprule.html',
+
+       'pg.schema'                     => 'ddl-schemas.html',
+       'pg.schema.alter'               => 'sql-alterschema.html',
+       'pg.schema.create'              => array( 'sql-createschema.html','ddl-schemas.html#DDL-SCHEMAS-CREATE'),
+       'pg.schema.drop'                => 'sql-dropschema.html',
+       'pg.schema.search_path'         => 'ddl-schemas.html#DDL-SCHEMAS-PATH',
+       
+       'pg.sequence'                   => 'functions-sequence.html',
+       'pg.sequence.alter'             => 'sql-altersequence.html',
+       'pg.sequence.create'            => 'sql-createsequence.html',
+       'pg.sequence.drop'              => 'sql-dropsequence.html',
+
+       'pg.sql'                        => array('sql.html','sql-commands.html'),
+       'pg.sql.insert'                 => 'sql-insert.html',
+       'pg.sql.select'                 => 'sql-select.html',
+       'pg.sql.update'                 => 'sql-update.html',
+
+       'pg.table'                      => 'ddl.html#DDL-BASICS',
+       'pg.table.alter'                => 'sql-altertable.html',
+       'pg.table.create'               => 'sql-createtable.html',
+       'pg.table.drop'                 => 'sql-droptable.html',
+       'pg.table.empty'                => 'sql-truncate.html',
+
+       'pg.tablespace'                 => 'manage-ag-tablespaces.html',
+       'pg.tablespace.alter'           => 'sql-altertablespace.html',
+       'pg.tablespace.create'          => 'sql-createtablespace.html',
+       'pg.tablespace.drop'            => 'sql-droptablespace.html',
+
+       'pg.trigger'                    => 'triggers.html',
+       'pg.trigger.alter'              => 'sql-altertrigger.html',
+       'pg.trigger.create'             => 'sql-createtrigger.html',
+       'pg.trigger.drop'               => 'sql-droptrigger.html',
+
+       'pg.type'                       => array('xtypes.html','datatype.html','extend-type-system.html'),
+       'pg.type.alter'                 => 'sql-altertype.html',
+       'pg.type.create'                => 'sql-createtype.html',
+       'pg.type.drop'                  => 'sql-droptype.html',
+
+       'pg.user.alter'                 => array('sql-alteruser.html','user-attributes.html'),
+       'pg.user.create'                => array('sql-createuser.html','user-manag.html#DATABASE-USERS'),
+       'pg.user.drop'                  => array('sql-dropuser.html','user-manag.html#DATABASE-USERS'),
+
+       'pg.variable'                   => 'runtime-config.html',
+
+       'pg.view'                       => 'tutorial-views.html',
+       'pg.view.alter'                 => array('sql-createview.html','sql-altertable.html'),
+       'pg.view.create'                => 'sql-createview.html',
+       'pg.view.drop'                  => 'sql-dropview.html',
+       
+       'pg.aggregate'                  => array('xaggr.html', 'tutorial-agg.html', 'functions-aggregate.html', 'sql-expressions.html#SYNTAX-AGGREGATES'),
+       'pg.aggregate.create'   => 'sql-createaggregate.html',
+       'pg.aggregate.drop'             => 'sql-dropaggregate.html',
+       
+       'pg.server' => 'admin.html',
+
+       'pg.user'       => 'user-manag.html',
 
-$this->help_page['pg.database.alter'] = 'sql-alterdatabase.html';
-$this->help_page['pg.database.create'][1] = 'manage-ag-createdb.html';
+       'pg.locks'      => 'view-pg-locks.html'
+);
 
-$this->help_page['pg.locks'] = 'view-pg-locks.html';
 
 ?>
similarity index 53%
rename from help/PostgresDoc85.php
rename to help/PostgresDoc90.php
index 19190e70f487bcd43342fc00ee1cc1d3ea2addf0..519a7db71ffb0c20b19ade5d829305a75a1995c0 100644 (file)
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Help links for PostgreSQL 8.4 documentation
+ * Help links for PostgreSQL 9.0 documentation
  *
  * $Id: PostgresDoc84.php,v 1.3 2008/11/18 21:35:48 ioguix Exp $
  */
 
 include('./help/PostgresDoc84.php');
 
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.5');
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.0');
 
 ?>