From a7cf027235c92103118cf415d244447a6ea82b3a Mon Sep 17 00:00:00 2001
From: Derek Allard
Date: Thu, 25 Sep 2008 12:56:02 +0000
Subject: postgre to postgres in a few documentation pages
---
user_guide/changelog.html | 12 ++++++------
user_guide/database/configuration.html | 6 +++---
user_guide/database/helpers.html | 2 +-
user_guide/general/requirements.html | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 94e41a893..7a59eaf64 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -449,7 +449,7 @@ SVN Revision: 1155
Fixed a bug (#2732) in the SQLite driver for PHP 4.
Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
- Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.
+ Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
Fixed a bug (#2858) which referenced a wrong variable in the Image class.
@@ -545,7 +545,7 @@ SVN Revision: 1155
Fixed a bug in result_array() that was returning an empty array when no result is produced.
Fixed a bug in the redirect function of the url helper.
Fixed an undefined variable in Loader
- Fixed a version bug in the Postgre driver
+ Fixed a version bug in the Postgres driver
Fixed a bug in the textarea function of the form helper for use with strings
Fixed doc typos.
@@ -683,7 +683,7 @@ SVN Revision: 1155
Added support for % character in URL.
Added the ability to supply full URLs using the anchor() helper function.
Added mode parameter to file_write() helper.
-Added support for changing the port number in the Postgre driver.
+Added support for changing the port number in the Postgres driver.
Moved the list of "allowed URI characters" out of the Router class and into the config file.
Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
Updated the Upload class to allow the upload field name to be set when calling do_upload().
@@ -694,10 +694,10 @@ SVN Revision: 1155
Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
Updated the Models loader function to allow multiple loads of the same model.
Updated the MS SQL driver so that single quotes are escaped.
-Updated the Postgre and ODBC drivers for better compatibility.
+Updated the Postgres and ODBC drivers for better compatibility.
Removed a strtolower() call that was changing URL segments to lower case.
Removed some references that were interfering with PHP 4.4.1 compatibility.
-Removed backticks from Postgre class since these are not needed.
+Removed backticks from Postgres class since these are not needed.
Renamed display() to _display() in the Output class to make it clear that it's a private function.
Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
Fixed an bug that was preventing the input class from unsetting GET variables.
@@ -790,7 +790,7 @@ This feature enables you to (among other things) use your Models.
-Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
+Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
Added a feature to the database class that lets you run custom function calls.
Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html
index 2c16f3608..26bbe75e1 100644
--- a/user_guide/database/configuration.html
+++ b/user_guide/database/configuration.html
@@ -121,7 +121,7 @@ for the primary connection, but it too can be renamed to something more relevant
username - The username used to connect to the database.
password - The password used to connect to the database.
database - The name of the database you want to connect to.
-dbdriver - The database type. ie: mysql, postgre, odcc, etc. Must be specified in lower case.
+dbdriver - The database type. ie: mysql, postgres, odcc, etc. Must be specified in lower case.
dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
@@ -129,10 +129,10 @@ for the primary connection, but it too can be renamed to something more relevant
cachedir - The absolute server path to your database query cache directory.
char_set - The character set used in communicating with the database.
dbcollat - The character collation used in communicating with the database.
-port - The database port number. Currently only used with the Postgre driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
+port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
-Note: Depending on what database platform you are using (MySQL, Postgre, etc.)
+
Note: Depending on what database platform you are using (MySQL, Postgres, etc.)
not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and
the database name will be the path to your database file. The information above assumes you are using MySQL.
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index ac6ea11a3..0647e2a8c 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -80,7 +80,7 @@ correct number of affected rows. By default this hack is enabled but it can be
$this->db->platform()
-Outputs the database platform you are running (MySQL, MS SQL, Postgre, etc...):
+Outputs the database platform you are running (MySQL, MS SQL, Postgres, etc...):
echo $this->db->platform();
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index a65519702..742cd1931 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -59,7 +59,7 @@ Server Requirements
- PHP version 4.3.2 or newer.
- - A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC.
+ - A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.
--
cgit v1.2.3-24-g4f1b