Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md

1 files changed, 11 insertions, 10 deletions

diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index bdb023c8e..dfdce5f6a 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -8,17 +8,18 @@ https://yourgnusocialinstance.org/settings/oauthapps
 
 Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field.
 
-Icon. I uploaded the Hubzilla icon located at this link, after saving it to my computer:
+Icon. I uploaded the $Projectname icon located at this link, after saving it to my computer:
 
 https://github.com/redmatrix/hubzilla/blob/master/images/rm-32.png
 
 Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g.
 
-Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from Hubzilla to GNUsocial.
+Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from $Projectname to GNUsocial.
+
 
 Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourhubzillasite.com. If your Red installation is a subdomain, that would probably be called for.
 
-Organization. Since Hubzilla is unorganized, I put that. If you use your installation for a group or business, that might be a good option.
+Organization. Since $Projectname is unorganized, I put that. If you use your installation for a group or business, that might be a good option.
 
 Homepage. If your group is using a subdomain, you probably want to put your main domain URI here. Since I'm on a hosted site, I put redmatrix.me.
 
@@ -32,13 +33,13 @@ All fields except the callback URL must be filled in.
 
 Click on the save button.
 
-Then click on the icon or the name of the application for the information you'll need to insert over on Hubzilla.
+Then click on the icon or the name of the application for the information you'll need to insert over on $Projectname.
 
 *****
 
-Now open up a new tab or window and go to your Hubzilla account, to Settings > Feature settings. Find the StatusNet Posting Settings.
+Now open up a new tab or window and go to your $Projectname account, to Settings > Feature settings. Find the StatusNet Posting Settings.
 
-Insert the strings of numbers given on the GNUsocial site into the Hubzilla fields for Consumer Key and Consumer Secret.
+Insert the strings of numbers given on the GNUsocial site into the $Projectname fields for Consumer Key and Consumer Secret.
 
 The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this:
 
@@ -50,15 +51,15 @@ StatusNet application name: Insert the name you gave to the application over on
 
 Click Submit.
 
-A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the Hubzilla app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit.
+A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit.
 
-If successful, your information from the GNUsocial instance should appear in the Hubzilla app.
+If successful, your information from the GNUsocial instance should appear in the $Projectname app.
 
-You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your Hubzilla account to your GNUsocial instance.
+You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your $Projectname account to your GNUsocial instance.
 
 If you don't choose this option, you will have an option to send a post to your GNUsocial instance by first opening the post (by clicking in the post text area) and clicking on the lock icon next to the Share button. Select the GNUsocial icon made up of three colored dialog baloons. Close that window, then make your post.
 
-If all goes well, you have just cross-posted your Hubzilla post to your account on a GNUsocial instance.
+If all goes well, you have just cross-posted your $Projectname post to your account on a GNUsocial instance.
 
 #include doc/macros/addons_footer.bb;