diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /doc/registration.bb | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'doc/registration.bb')
| -rw-r--r-- | doc/registration.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/registration.bb b/doc/registration.bb index 072e82bf2..31d696221 100644 --- a/doc/registration.bb +++ b/doc/registration.bb @@ -1,6 +1,6 @@ [size=large][b]Registration[/b][/size]
-Not all Red Matrix sites allow open registration. If registration is allowed, you will see a "Register" 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 Red Matrix 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 "Register" 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]
@@ -8,7 +8,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 Red Matrix 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]
@@ -25,7 +25,7 @@ Next, you will be presented with the "Add a channel" screen. Normally, When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.
See Also
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the Red Matrix[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the $Projectname[/zrl]
[zrl=[baseurl]/help/accounts]Accounts[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/permissions]Permissions[/zrl]
|