Commit graph

10 commits

Author SHA1 Message Date
Andrew Manning
9f630b6653 Corrected some missing space typos in docs 2015-09-17 06:44:12 -04:00
Andrew Manning
999ac60a87 Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzilla and grid 2015-09-16 21:44:24 -04:00
redmatrix
51b89f0ed8 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
2015-05-13 19:23:13 -07:00
redmatrix
364025e550 remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. 2015-05-13 17:59:45 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica
d599ebe742 update resource links 2015-04-01 15:52:02 -07:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
Thomas Willingham
46a3c4d804 Doc update 2014-02-27 16:28:29 +00:00
Thomas Willingham
29f6975715 Import doco from docs@friendicared.net 2014-02-24 05:13:28 +00:00