Merge https://github.com/friendica/red into zpull

include/items.php

@@ -98,6 +98,10 @@ function can_comment_on_post($observer_xchan,$item) {
 				return true;
 			break;
 		case 'public':
+			# We don't allow public comments yet, until a policy 
+			# for dealing with anonymous comments is in place with 
+			# a means to moderate comments. Until that time, return 
+			# false.
 			return false;
 			break;
 		case 'contacts':
@@ -3874,4 +3878,4 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
     }
 
 	return $items;
-}
+}

include/page_widgets.php

@@ -5,7 +5,7 @@ function writepages_widget ($who,$which){
 	return replace_macros(get_markup_template('write_pages.tpl'), array(
 			'$new' => t('New Page'),
 			'$newurl' => "webpages/$who",
-                        '$edit' => t('edit'),
+                        '$edit' => t('Edit'),
                         '$editurl' => "editwebpage/$who/$which"
 			));
 }