Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

3 files changed, 10 insertions, 10 deletions

diff --git a/README.md b/README.md
index 2e5378739..ad7a4a9ca 100644
--- a/README.md
+++ b/README.md
@@ -3,26 +3,26 @@
 Hubzilla - Community Server
 ===========================
 
-Help us redefine the web - using linked/connected community websites. 
----------------------------------------------------------------------
+Connected and linked web communities. 
+-------------------------------------
 
 <p align="center" markdown="1">
 <em><a href="https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt">Installing Hubzilla</a></em> 
 </p>
 
-**What are Hubs?**
+**What are Hubz?**
 
-Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.  
+Hubz are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.  
 This allows hub members on any hub to securely and privately share anything; with anybody, on any hub - anywhere; or share stuff publicly with anybody on the internet if desired. 
 
-**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache, although Mariadb or Postgres and Nginx could also be used - we're pretty easy). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet. 
+**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache and popular variants). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet. 
 
-Hubzilla hubs are
+Hubzilla hubz are
 
 * decentralised
 * inherently social
-* optionally inter-networked with other hubs
-* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubs)
+* optionally inter-networked with other hubz
+* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubz)
 
 Possible website applications include
 
diff --git a/boot.php b/boot.php
index cc916c600..c4d8ec13a 100755
--- a/boot.php
+++ b/boot.php
@@ -454,7 +454,7 @@ define ( 'TERM_OBJ_APP',     7 );
 /**
  * various namespaces we may need to parse
  */
-
+define ( 'PROTOCOL_ZOT',              'http://purl.org/zot/protocol' );
 define ( 'NAMESPACE_ZOT',             'http://purl.org/zot' );
 define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' );
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
diff --git a/include/network.php b/include/network.php
index ac14548a5..7c7da8727 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1089,7 +1089,7 @@ function discover_by_webbie($webbie) {
 				// If we discover zot - don't search further; grab the info and get out of
 				// here. 
 
-				if($link['rel'] == 'http://purl.org/zot/protocol') {
+				if($link['rel'] === PROTOCOL_ZOT) {
 					logger('discover_by_webbie: zot found for ' . $webbie, LOGGER_DEBUG);
 					if(array_key_exists('zot',$x) && $x['zot']['success'])
 						$i = import_xchan($x['zot']);