diff options
| author | Jeroen van Riet Paap <jeroenpraat@xs4all.nl> | 2016-03-07 19:47:47 +0100 |
|---|---|---|
| committer | Jeroen van Riet Paap <jeroenpraat@xs4all.nl> | 2016-03-07 19:47:47 +0100 |
| commit | 7d5b26622745c7c8ad68f4ffd4a999c52e0cfa96 (patch) | |
| tree | 6db7467936f5113af3bf60e7c5851de6732d6b05 | |
| parent | da3f1326e024f42e775132df96411da4d1b6705d (diff) | |
| parent | a013ddbb91f6befb72c441f2b07fa2c2070987a6 (diff) | |
| download | volse-hubzilla-7d5b26622745c7c8ad68f4ffd4a999c52e0cfa96.tar.gz volse-hubzilla-7d5b26622745c7c8ad68f4ffd4a999c52e0cfa96.tar.bz2 volse-hubzilla-7d5b26622745c7c8ad68f4ffd4a999c52e0cfa96.zip | |
Merge pull request #309 from tluther/master
Doco / EMail templates
| -rw-r--r-- | doc/cloud.bb | 2 | ||||
| -rw-r--r-- | doc/git_for_non_developers.bb | 2 | ||||
| -rw-r--r-- | view/en/lostpass_eml.tpl | 3 | ||||
| -rw-r--r-- | view/en/passchanged_eml.tpl | 5 | ||||
| -rw-r--r-- | view/en/register_verify_member.tpl | 5 |
5 files changed, 15 insertions, 2 deletions
diff --git a/doc/cloud.bb b/doc/cloud.bb index d5195c0f5..3e0ac1fd3 100644 --- a/doc/cloud.bb +++ b/doc/cloud.bb @@ -10,7 +10,7 @@ On many public servers there may be limits on disk usage. The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending.
-To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/filestorage/{{username}}" replacing {{username}} with the nickname you provided during channel creation.
+To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/cloud/{{username}}" replacing {{username}} with the nickname you provided during channel creation.
[b]Web Access[/b]
diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb index b0a623104..80c11024b 100644 --- a/doc/git_for_non_developers.bb +++ b/doc/git_for_non_developers.bb @@ -14,7 +14,7 @@ Once you've done that, cd into the directory, and add an upstream. [code]
cd red
-git remote add upstream https://github.com/redmatrix/redmatrix
+git remote add upstream https://github.com/redmatrix/hubzilla
[/code]
From now on, you can pull upstream changes with the command
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index 3b79d2791..285a65ade 100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl @@ -29,4 +29,7 @@ Login Name: {{$email}} Sincerely, {{$sitename}} Administrator +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index 0d94be3c2..61bf27943 100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl @@ -18,3 +18,8 @@ Sincerely, {{$sitename}} Administrator + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl index d1e34be67..71f0964d4 100644 --- a/view/en/register_verify_member.tpl +++ b/view/en/register_verify_member.tpl @@ -23,3 +23,8 @@ To deny the request and remove the account, please visit: Thank you. + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + |