8 files changed, 12 insertions, 12 deletions
diff --git a/doc/DerivedTheme1.md b/doc/DerivedTheme1.md
index 3db86b6e7..b120c628c 100644
--- a/doc/DerivedTheme1.md
+++ b/doc/DerivedTheme1.md
@@ -38,7 +38,7 @@ Inside it, put the following information - edit as needed
 
     function mytheme_init(&$a) {
 
-        $a->theme_info['extends'] = 'redbasic';
+        App::$theme_info['extends'] = 'redbasic';
 
 
     }
@@ -79,7 +79,7 @@ If you want to use the redbasic schemas for your derived theme, you have to do a
 
 Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead  view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines:
 
-	if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic')
+	if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
 		set_pconfig(local_channel(), 'redbasic', 'schema', '---');
 	
 Also add this line at the bottom:
diff --git a/doc/Primary-Directory.md b/doc/Primary-Directory.md
index 37b0c0431..92460c346 100644
--- a/doc/Primary-Directory.md
+++ b/doc/Primary-Directory.md
@@ -12,7 +12,7 @@ There are certain scenarios where you might want your own directory-server that
 
 *   On the hub that will be the Directory Server, open the .htconfig.php file and set:
 
-    `$a->config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;`
+    `App::$config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;`
 
 
     By default it should already be set as **DIRECTORY_MODE_NORMAL**, so just edit that line to say **DIRECTORY_MODE_PRIMARY**
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md
index e228268dd..1ef80d343 100644
--- a/doc/dev-function-overview.md
+++ b/doc/dev-function-overview.md
@@ -21,7 +21,7 @@ Returns the global app structure ($a).
 
 * App::get_observer()
 
-(App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
+(App:: is usually assigned to the global $a), so App::get_observer() or App::get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
 
 * get_config($family,$key), get_pconfig($uid,$family,$key)
 
diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb
index 729625713..4cf1ca591 100644
--- a/doc/dev_beginner.bb
+++ b/doc/dev_beginner.bb
@@ -242,7 +242,7 @@ Befor you register a first user switch off the registration mails.
 Open /var/www/.htconfig.php
 and make sure "0" is set in this line
 [code]
-$a->config['system']['verify_email'] = 0;
+App::$config['system']['verify_email'] = 0;
 [/code]
 You should be able to change the file as "yourself" (instead of using root or www-data).
 
diff --git a/doc/directories.bb b/doc/directories.bb
index d81dd84c5..60a0b624d 100644
--- a/doc/directories.bb
+++ b/doc/directories.bb
@@ -30,7 +30,7 @@ To configure this, please look in your .htconfig.php file for the following text
 // DIRECTORY_MODE_PRIMARY    = main directory server
 // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
 
-$a->config['system']['directory_mode']  = DIRECTORY_MODE_STANDALONE;
+App::$config['system']['directory_mode']  = DIRECTORY_MODE_STANDALONE;
 [/code]
 
 
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 603cf238f..5da2c19ff 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -8,22 +8,22 @@ $a is a class defined in boot.php and passed all around $Projectname as a global
 
 We don't ever create more than one instance and always modify the elements of the single instance. The mechanics of this are somewhat tricky. If you have a function that is passed $a and needs to modify $a you need to declare it as a reference with '&' e.g. 
 
-[code]function foo(&$a) { $a->something = 'x'; // whatever };
+[code]function foo(&$a) { App::$something = 'x'; // whatever };
 
 *or* access it within your function  as a global variable via get_app()
 
 function foo() {
     $a = get_app();
-    $a->something = 'x';
+    App::$something = 'x';
 }
 
 
-function foo($a) { $a->something = 'x'; }; 
+function foo($a) { App::$something = 'x'; }; 
 
 will *not* change the global app state. 
 
 function foo() {
-   get_app()->something = 'x';
+   App::$something = 'x';
 }
 [/code]
 
diff --git a/doc/hook/module_mod_aftercontent.bb b/doc/hook/module_mod_aftercontent.bb
index 5d48435b8..04e3c8d88 100644
--- a/doc/hook/module_mod_aftercontent.bb
+++ b/doc/hook/module_mod_aftercontent.bb
@@ -8,5 +8,5 @@ The hook data for this call consists of an array
 
 This element contains the HTML content which was prepared for this page by calling the module_content() function. It is invoked after the content has been created. It does not contain the result of AJAX or asynchronous page load calls.
 
-	The current module may be determined by lookin at $a->module  
+	The current module may be determined by lookin at App::$module  
 
diff --git a/doc/hook/module_mod_content.bb b/doc/hook/module_mod_content.bb
index 39f5743b1..eef5b7ba5 100644
--- a/doc/hook/module_mod_content.bb
+++ b/doc/hook/module_mod_content.bb
@@ -6,5 +6,5 @@ The hook data for this call consists of an array
 
 This element contains the HTML content before calling the module_content() function. It is invoked before the content region has been populated. This may  or may not be empty as there may be other processes or addons generating content prior to your hook handler is run. Be certain to preserve any current content. Typically anything you add here will be placed at the top of the content region of the page, but in any event prior to the main content region being generated. 
 
-	The current module may be determined by lookin at $a->module  
+	The current module may be determined by lookin at App::$module