aboutsummaryrefslogtreecommitdiffstats
path: root/doc/account_basics.bb
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-13 19:23:13 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-13 19:23:13 -0700
commit51b89f0ed8833004cf695de90791d8d0eec550b5 (patch)
tree815c33e71b411e6f2b8c44ba0f619ee8a869d912 /doc/account_basics.bb
parent475dc7b686d6939d88c79dd58df1ff751356a922 (diff)
parentf866a42a42b9e12756353f5bb39a0f31a64bb26a (diff)
downloadvolse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.tar.gz
volse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.tar.bz2
volse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.zip
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
Diffstat (limited to 'doc/account_basics.bb')
-rw-r--r--doc/account_basics.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/account_basics.bb b/doc/account_basics.bb
index 327709459..ba2380df7 100644
--- a/doc/account_basics.bb
+++ b/doc/account_basics.bb
@@ -2,7 +2,7 @@
[b]Registration[/b]
-Not all Hubzilla sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Hubzilla sites are linked, it does not matter where your account resides.
+Not all $Projectname sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all $Projectname sites are linked, it does not matter where your account resides.
[b]Your Email Address[/b]
@@ -10,7 +10,7 @@ Please provide a valid email address. Your email address is never published. Thi
[b]Password[/b]
-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Hubzilla offers a decentralised identity, your account can log you in to many other websites.
+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the $Projectname offers a decentralised identity, your account can log you in to many other websites.
[b]Terms Of Service[/b]