api function item/new renamed to item/store as that more closely reflects its purpose. It can also be used to store an edit of an existing item. I believe this is a reasonably safe change at this time as I don't believe there is any software currently making use of this call - instead using the Twitter API which is now a plugin.

Also some work to make the install documentation agnostic to project name variations. This is not yet complete.

2 files changed, 57 insertions, 30 deletions

diff --git a/include/api_zot.php b/include/api_zot.php
index 60cb288af..8d6041408 100644
--- a/include/api_zot.php
+++ b/include/api_zot.php
@@ -28,8 +28,8 @@
 		api_register_func('api/z/1.0/group','api_group', true);
 		api_register_func('api/red/xchan','api_red_xchan',true);
 		api_register_func('api/z/1.0/xchan','api_red_xchan',true);
-		api_register_func('api/red/item/new','red_item_new', true);
-		api_register_func('api/z/1.0/item/new','red_item_new', true);
+		api_register_func('api/red/item/store','red_item_store', true);
+		api_register_func('api/z/1.0/item/store','red_item_store', true);
 		api_register_func('api/red/item/full','red_item', true);
 		api_register_func('api/z/1.0/item/full','red_item', true);
 
@@ -341,15 +341,15 @@
 
 	}
 
-	function red_item_new($type) {
+	function red_item_store($type) {
 
 		if (api_user() === false) {
-			logger('api_red_item_new: no user');
+			logger('api_red_item_store: no user');
 			return false;
 		}
 
-		logger('api_red_item_new: REQUEST ' . print_r($_REQUEST,true));
-		logger('api_red_item_new: FILES ' . print_r($_FILES,true));
+		logger('api_red_item_store: REQUEST ' . print_r($_REQUEST,true));
+		logger('api_red_item_store: FILES ' . print_r($_FILES,true));
 
 
 		// set this so that the item_post() function is quiet and doesn't redirect or emit json
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index a216e630d..7d4ed9534 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -1,12 +1,12 @@
-Hubzilla Installation
+Software Installation
 
-We've tried very hard to ensure that Hubzilla will run on commodity
+We've tried very hard to ensure that this software will run on commodity
 hosting platforms - such as those used to host Wordpress blogs and Drupal 
 websites. It will run on most any Linux VPS system. Windows LAMP platforms
 such as XAMPP and WAMP are not officially supported at this time - however 
 we welcome patches if you manage to get it working. 
 
-Be aware that the Hubzilla is more than a simple web application. It is a 
+Be aware that this software is more than a simple web application. It is a 
 complex communications system which more closely resembles an email server 
 than a web server. For reliability and performance, messages are delivered in
 the background and are queued for later delivery when sites are down. This
@@ -17,20 +17,24 @@ with your hosting provider prior to installation. (And preferably before
 entering into a long-term contract.)
 
 If you encounter installation issues, please let us know via the Github issue 
-tracker (https://github.com/redmatrix/hubzilla/issues). Please be as clear as you 
-can about your operating environment and provide as much detail as possible
+tracker where you downloaded the software. Please be as clear as
+you can about your operating environment and provide as much detail as possible
 about any error messages you may see, so that we can prevent it from happening 
 in the future. Due to the large variety of operating systems and PHP platforms 
-in existence we may have only limited ability to debug your PHP installation or 
-acquire any missing modules - but we will do our best to solve any general code 
-issues.
+in existence we may have only limited ability to debug your PHP installation
+or acquire any missing modules - but we will do our best to solve any general
+code issues.
 
 
 
-Before you begin: Choose a domain name or subdomain name for your server.
+**Before you begin** 
 
-Hubzilla can only be installed into the root of a domain or
-sub-domain, and can not be installed using alternate TCP ports. 
+Choose a domain name or subdomain name for your server.
+
+The software can only be installed into the root of a domain or
+sub-domain, and can not be installed using alternate TCP ports. These 
+restrictions may be relaxed in the future, but will be inconvenient to work
+with, so we still STRONGLY recommend you abide by them. 
 
 Decide if you will use SSL and obtain an SSL certificate before software
 installation.  You SHOULD use SSL. If you use SSL, you MUST use a
@@ -46,12 +50,12 @@ This restriction is incorporated because public posts from you may contain
 references to images on your own hub. Other members viewing their stream on
 other hubs will get warnings if your certificate is not trusted by their web
 browser. This will confuse many people because this is a decentralised network
-and they will get the warning about your hub while viewing their own hub and may 
-think their own hub has an issue. These warnings are very technical and scary to 
-some folks, many of whom will not know how to proceed except to follow the browser
-advice. This is disruptive to the community. That said, we recognise the issues
-surrounding the current certificate infrastructure and agree there are many
-problems, but that doesn't change the requirement. 
+and they will get the warning about your hub while viewing their own hub and
+may think their own hub has an issue. These warnings are very technical and 
+scary to some folks, many of whom will not know how to proceed except to
+follow the browser advice. This is disruptive to the community. That said, we
+recognise the issues surrounding the current certificate infrastructure and
+agree there are many problems, but that doesn't change the requirement. 
 
 Free "browser-valid" certificates are available from providers such as StartSSL
 and LetsEncrypt. 
@@ -63,13 +67,36 @@ SSL port first, before falling back to a less secure connection.  If you do not
 use SSL, your webserver MUST NOT listen on port 443 at all.
 
 If you use LetsEncrypt to provide certificates and create a file under 
-.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, 
-please remove or rename the .well-known directory as soon as the certificate is 
-generated. Hubzilla will provide its own handler for ".well-known" services when
-it is installed, and an existing directory in this location may prevent some of 
-these services from working correctly. This should not be a problem with Apache,
-but may be an issue with nginx or other web server platforms.
+.well-known/acme-challenge so that LetsEncrypt can verify your domain
+ownership, please remove or rename the .well-known directory as soon as the
+certificate is generated. The software will provide its own handler for 
+".well-known" services when it is installed, and an existing directory in this
+location may prevent some of these services from working correctly. This
+should not be a problem with Apache, but may be an issue with nginx or other
+web server platforms.
+
+**Server Roles**
+
+During installation you will be asked to choose a server role. Your choices are
+1. Basic
+2. Standard
+3. Pro
+
+Basic is highly simplified, with almost all the advanced functionality and 
+complexity removed or permanently disabled.
+
+Standard is typically used for federated network use, when you wish to interact
+with other networks using other protocols. Not all the built in features and
+functionality work correctly when other networks are involved. All advanced
+and complex features are available to all members by default.  
+
+Pro is for sites that wish to make full use of the built-in abilities and
+features, but **not** to interact with other networks. Advanced features are
+enabled according to a per-account 'techlevel' which reduces complexity
+initially and allows members to adjust the software complexity to match their
+technical abilities.   
 
+**Installation**
 
 1. Requirements
     - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
@@ -96,7 +123,7 @@ but may be an issue with nginx or other web server platforms.
     - Installation into a top-level domain or sub-domain (without a 
     directory/path component in the URL) is REQUIRED.
 
-2. Unpack the Hubzilla files into the root of your web server document area.
+2. Unpack the project files into the root of your web server document area.
     
      If you copy the directory tree to your webserver, make sure that you 
     also copy .htaccess - as "dot" files are often hidden and aren't normally