aboutsummaryrefslogtreecommitdiffstats
path: root/doc/bbcode.html
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/bbcode.html
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/bbcode.html')
-rw-r--r--doc/bbcode.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 2b552f0b1..4fe47842f 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -7,7 +7,7 @@
<li>[u]underlined[/u] - <u>underlined</u><br />
<li>[s]strike[/s] - <strike>strike</strike><br />
<li>[color=red]red[/color] - <span style="color: red;">red</span><br />
-<li>[url=https://redmatrix.me]Hubzilla[/url] <a href="https://redmatrix.me">Hubzilla</a><br />
+<li>[url=https://redmatrix.me]$Projectname[/url] <a href="https://redmatrix.me">$Projectname</a><br />
<li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
<li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
<div style="clear:both;"></div>
@@ -47,7 +47,7 @@
</ul><br />
<br />Tables? Yes!<br /><br />[table border=1]<br /> [tr]<br /> [th]Tables now[/th]<br /> [/tr]<br /> [tr]<br /> [td]Have headers[/td]<br /> [/tr]<br />[/table]<br /><br /><table border="1" ><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></table><br />All sizes, <br />From the [size=xx-small] - <span style="font-size: xx-small;">xx-small</span>.<br />To the [size=xx-large] - <span style="font-size: xx-large;">xx-large</span>.<br />To fit exactly <span style="font-size: 20px;">20px</span> use [size=20].<br /><br />
-<p>Hubzilla specific codes</p>
+<p>$Projectname specific codes</p>
<ul class="listbullet" style="list-style-type: circle;">
<li>[&amp;copy;] &copy; This works for many HTML entities</li>
<li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag</li>