Index: trunk/docs/coding_standards.txt
===================================================================
--- trunk/docs/coding_standards.txt	(revision 124)
+++ trunk/docs/coding_standards.txt	(revision 136)
@@ -183,5 +183,5 @@
         ?>
         <div align="right" class="sc-tiny">
-        [&nbsp;<a href="<?php echo App::oHREF('contact.php') ?>">Contact us</a>&nbsp;]
+        [&nbsp;<a href="<?php echo $app->oHREF('contact.php') ?>">Contact us</a>&nbsp;]
         </div>
         <?php
@@ -214,5 +214,7 @@
     function getSetEnumFieldValues()
     {
-        $qid = DB::query("SHOW COLUMNS FROM $db_table LIKE '$db_col'",false);
+		$db =& DB::getInstance();
+        
+        $qid = $db->query("SHOW COLUMNS FROM $db_table LIKE '$db_col'",false);
 
         $row = mysql_fetch_row($qid);
Index: trunk/docs/example_config.inc.php
===================================================================
--- trunk/docs/example_config.inc.php	(revision 124)
+++ trunk/docs/example_config.inc.php	(revision 136)
@@ -70,9 +70,13 @@
 // DB credentials for command line scripts stored in a file with read rights
 // given only to the user who will be executing the scripts: -rw-------
-// This file includes App:: method calls so must be included after App.
+// This file includes $app-> method calls so must be included after App.
 require_once 'global/db_auth.inc.php';
 
+// Start application-based functionality: database, session, environment, ini setup, etc.
 // Most configuration parameters must be set before starting the App.
 $app->start();
+
+// Global DB object. Automatically preconfigured by $app->start().
+$db =& DB::getInstance();
 
 // User authentication.
Index: trunk/docs/example_script_template.php
===================================================================
--- trunk/docs/example_script_template.php	(revision 124)
+++ trunk/docs/example_script_template.php	(revision 136)
@@ -11,5 +11,5 @@
 
 $auth->requireLogin();
-App::sslOn();
+$app->sslOn();
 
 require_once 'codebase/lib/FormValidator.inc.php';
Index: trunk/docs/file_layout.txt
===================================================================
--- trunk/docs/file_layout.txt	(revision 124)
+++ trunk/docs/file_layout.txt	(revision 136)
@@ -55,5 +55,5 @@
         RecordVersion.inc.php (db record versioning system)
         ScriptTimer.inc.php (timer for scripts)
-        SessionCache.inc.php (class for accessing a cache in a users session, stores any variables for quick retreival)
+        Cache.inc.php (class for accessing a cache in a users session, stores any variables for quick retreival)
         SortOrder.inc.php (class dealing with sorting of columns in database generated lists)
         SpellCheck.inc.php
Index: trunk/docs/revision_history.txt
===================================================================
--- trunk/docs/revision_history.txt	(revision 124)
+++ trunk/docs/revision_history.txt	(revision 136)
@@ -31,5 +31,5 @@
     - RecordLock
     - RecordVersion
-    - SessionCache
+    - Cache
     - Upload
 
@@ -56,5 +56,5 @@
     - app object can be accessed globally without reference to object name by calling methods statically, e.g. App:logMsg()
     - seperate application and codebase parameters from site configuration variables.
-      Use $app->getParam('var') or App::getParam('var') to get app params.
+      Use $app->getParam('var') or $app->getParam('var') to get app params.
       F or site configurations do whatever you want (I'm using $cfg['node']['features'] format for configurations)
 
@@ -68,5 +68,5 @@
 
 DB object:
-    - Self contained class for DB functions. db::query is the only necessary function. Maintains connections and state independent of App.
+    - Self contained class for DB functions. $db->query is the only necessary function. Maintains connections and state independent of App.
 
 Full test suite for all codebase libraries. Run from the command line: "codebase/tests/run_tests.sh;"
Index: trunk/docs/version.txt
===================================================================
--- trunk/docs/version.txt	(revision 136)
+++ trunk/docs/version.txt	(revision 136)
@@ -0,0 +1,1 @@
+2.1dev
