Documentation fixes, from Marek Černocký.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7897 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/docs/en_US/bugreport.html b/docs/en_US/bugreport.html
index 0cbf83e1c7833b40bb6892c1d1c0f5dd63ada71f..1438731160313a169e614648676764ff1293388c 100644 (file)
--- a/docs/en_US/bugreport.html
+++ b/docs/en_US/bugreport.html
@@ -32,8 +32,10 @@ mailing list</A>, and include the following informations:</P>
        <LI>If possible and appropriate, include a backtrace from the crash. You may need to recompile wxWidgets and pgAdmin
             with the --enable-debug option to do this.
 </UL>
+<p>
 Please do <B>not</B> send an email directly to one of the programmers; they might miss it, or even be the wrong person altogether.
 Using the mailing list guarantees that your request isn't lost and will be answered in a timely fashion.
+</p>
 <P>After a bug has been reported on the mailing list as being fixed,
 it might take one or two days until it has made it into the
 distribution tarballs, please be patient.</P>

diff --git a/docs/en_US/editgrid.html b/docs/en_US/editgrid.html
index 9b89fa88e7230550594c8488c0099a9a6946caa7..33152f6db3aef2b2216e44d2c8292e404764bbcd 100644 (file)
--- a/docs/en_US/editgrid.html
+++ b/docs/en_US/editgrid.html
@@ -70,7 +70,7 @@ preference is appended to the current sort order.</li>
 the currently selected rows in the descending order of the selected column values. 
 If a sorting preference is already present for this data set, this sorting 
 preference is appended to the current sort order.</li>
-<li><i>Remove Filter</i>: When selected, removes all sorting preferences for 
+<li><i>Remove Sorting</i>: When selected, removes all sorting preferences for 
 this data set.</li>
 </ul>
 Note: If a column is already selected for sorting, it's position in the sort

diff --git a/docs/en_US/options-tab1.html b/docs/en_US/options-tab1.html
index 8cc3a67a63daca4c33f2c92bd3b2980652c6f780..ea3c65632bc3a0892974c3d84387a09019e88d61 100644 (file)
--- a/docs/en_US/options-tab1.html
+++ b/docs/en_US/options-tab1.html
@@ -41,33 +41,33 @@
    to the Slony help files, and may be configured in the same way as the PG
    help path. The Slony Help is used when selected from the Help menu.<br>&nbsp;</li>
 
-   <li><b>System schemas</b>- You can suppress the display of additional schemas,
+   <li><b>System schemas</b> - You can suppress the display of additional schemas,
    by declaring them a system schema. This field takes a list of comma separated strings.<br>&nbsp;</li>
    
-   <li><b>Slony-I path</b>- To enable pgAdmin III to create Slony-I replication clusters
+   <li><b>Slony-I path</b> - To enable pgAdmin III to create Slony-I replication clusters
    from scratch, you need to enter the path to the Slony-I script installation directory here. If no
    valid scripts can be found, only joining existing clusters is possible.
    <br>&nbsp;</li> 
 
-   <li><b>PG bin path</b>- This should be set to the path to the standard PostgreSQL pg_dump, pg_restore
+   <li><b>PG bin path</b> - This should be set to the path to the standard PostgreSQL pg_dump, pg_restore
    and pg_dumpall utilities. pgAdmin will use these for backing up and restoring your PostgreSQL databases.
    If this path is not set, pgAdmin will attempt to find the utilities in its installation directory,
    the 'hint' directory set by a local PostgreSQL installation (on Windows) and in the system path.
    <br>&nbsp;</li>
 
-   <li><b>EDB bin path</b>- This should be set to the path to the EnterpriseDB pg_dump, pg_restore
+   <li><b>EDB bin path</b> - This should be set to the path to the EnterpriseDB pg_dump, pg_restore
    and pg_dumpall utilities. pgAdmin will use these for backing up and restoring your EnterpriseDB databases.
    If this path is not set, pgAdmin will attempt to find the utilities in standard locations used by
    EnterpriseDB.
    <br>&nbsp;</li>
    
-   <li><b>GP bin path</b>- This should be set to the path to the Greenplum pg_dump, pg_restore
+   <li><b>GP bin path</b> - This should be set to the path to the Greenplum pg_dump, pg_restore
    and pg_dumpall utilities. pgAdmin will use these for backing up and restoring your Greenplum databases.
    If this path is not set, pgAdmin will attempt to find the utilities in standard locations used by
    Greenplum.
    <br>&nbsp;</li>
 
-   <li><b>Ignore server/utility version mismatches</b>- When checked, pgAdmin will pass the '-i' option 
+   <li><b>Ignore server/utility version mismatches</b> - When checked, pgAdmin will pass the '-i' option 
    to utilities such as <i>pg_dump</i> which will allow utilities from one version of the database to 
    be used with another version. This option should be use with extreme care as it may cause errors to
    occur during backup or restore options.

diff --git a/docs/en_US/pgadmin3.hhc b/docs/en_US/pgadmin3.hhc
index b2d8199ff42f22919dce327cc65c5e382634bd2e..698110531838650ada7197fd2466dde9ce15b08f 100644 (file)
--- a/docs/en_US/pgadmin3.hhc
+++ b/docs/en_US/pgadmin3.hhc
@@ -232,6 +232,11 @@
                                <param name="Local" value="licence.html">
                                <param name="ImageNumber" value="11">
                                </OBJECT>
+                       <LI> <OBJECT type="text/sitemap">
+                               <param name="Name" value="MIT Kerberos License">
+                               <param name="Local" value="kerberos.html">
+                               <param name="ImageNumber" value="11">
+                               </OBJECT>
                        <LI> <OBJECT type="text/sitemap">
                                <param name="Name" value="OpenSSL Licence">
                                <param name="Local" value="openssl.html">

diff --git a/docs/en_US/query.html b/docs/en_US/query.html
index 43bc9ef832fbaf645998de899ee665e20f7118db..9b0e12a590a2cf8b4fd2a76481e4afdc1446a1ad 100644 (file)
--- a/docs/en_US/query.html
+++ b/docs/en_US/query.html
@@ -17,7 +17,7 @@
 <p>The upper part of the Query Tool contains the SQL Editor
 where you type your commands. You may read the query from a file, or
 write it out to a file. When writing a file, the encoding of the file
-is determined by the file suffix: if it is *.sql, a 8 byte local
+is determined by the file suffix: if it is *.sql, a 8 bit local
 character set is used. If *.usql is selected, the file will be
 written in UTF-8, which enables the storage of virtually all
 characters used throughout the world, according to the coding rules

diff --git a/docs/en_US/status.html b/docs/en_US/status.html
index 6b102e8fff836fff652ddcd5d4646de97996b63b..9cfab9c6fc6cc1fc8cf56c35c67a88a59fea4f5d 100644 (file)
--- a/docs/en_US/status.html
+++ b/docs/en_US/status.html
@@ -37,15 +37,6 @@ instead of by it's name, if the relation is in a different database to
 that being monitored.
 </p>
 <p>
-The Cancel button allows cancelling the query running on a specific
-backend. Terminate will shutdown the backend. <B>Attention:</B> Both functions should be
-used carefully, as the interrupt the client's work
-ungracefully. particularly, the terminate function might disturb the
-function of the complete server, force it to restart its services and
-thus interrupt all user connections. You should use this function only
-if the server is seriously injured by a backend you can't control otherwise.
-</p>
-<p>
 <b>Note:</b> When the pg_locks view is accessed as is the case whenever 
 this dialgue is open, PostgreSQL's internal lock manager data structures are 
 momentarily locked, and a copy is made for the dialogue to display. This