+ {% block markdown %}
{% apply markdown_to_html %}
- ## About
+ ## What is this site?
+ This is a social network, running the GNU social software.
- GNU social is a social network based on the Free Software [GNU social](https://git.gnu.io/gnu/gnu-social) tool.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- If you [register](https://loadaverage.org/main/register) for an account, you can post small (0 chars or less) text notices about yourself, where you are, what you're doing, or practically anything you want. You can also subscribe to the notices of your friends, or other people you're interested in, and follow them on the Web or in an [RSS](https://en.wikipedia.org/wiki/RSS) feed.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/api.html.twig b/templates/faq/api.html.twig
index 4b6ea7f6b1..6fa67c0f17 100644
--- a/templates/faq/api.html.twig
+++ b/templates/faq/api.html.twig
@@ -1,49 +1,18 @@
-{% extends 'faq/base.html.twig' %}
+{% extends 'faq/home.html.twig' %}
{% block title %}Help{% endblock %}
{% block body %}
- {{ parent() }}
-
-
+ {% block markdown %}
{% apply markdown_to_html %}
- ## API
- GNU social provides APIs that applications can use to interact with it:
+ ## What is this site?
+ This is a social network, running the GNU social software.
- - [AtomPub](https://loadaverage.org/doc/atompub)
- - [Twitter-compatible API](https://loadaverage.org/doc/twitterapi)
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- ### API discovery
-
- The base URLs for the APIs can be obtained using [Really Simple Discovery](https://en.wikipedia.org/wiki/Really_Simple_Discovery).
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/base.html.twig b/templates/faq/base.html.twig
index 3dff7bc831..74457f902d 100644
--- a/templates/faq/base.html.twig
+++ b/templates/faq/base.html.twig
@@ -1,15 +1,16 @@
{% extends 'base.html.twig' %}
-{% block meta %}{% endblock %}
+{% block meta %}{{ parent() }}{% endblock %}
{% block title %}{% endblock %}
{% block stylesheets %}
-
-
+
+
+
{% endblock %}
-{% block body %}
+{% block header %}
+ {% block markdown %}
{% apply markdown_to_html %}
- ## Contact
+ ## What is this site?
+ This is a social network, running the GNU social software.
- There are a number of options for getting in contact with responsible people for GNU social.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- ### Bugs
-
- If you think you've found a bug in the underlying [GNU social](https://gnu.io/social/) software, or if there's a new feature you'd like to see, add it into the [GNU social task list](https://git.gnu.io/gnu/gnu-social/issues). Don't forget to check the list of existing bugs to make sure it hasn't already been reported!
-
- ### Email
-
- You can reach the responsible party for this server at [gnusocial@loadaverage.org](mailto:gnusocial@loadaverage.org).
-
- ### Post a notice
-
- If you have a question about how to do something, just post a notice with your question, preferrably tagged with #NewHere. Watch your inbox for replies.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/groups.html.twig b/templates/faq/groups.html.twig
index 0a9a2373e7..6fa67c0f17 100644
--- a/templates/faq/groups.html.twig
+++ b/templates/faq/groups.html.twig
@@ -1,71 +1,18 @@
-{% extends 'faq/base.html.twig' %}
+{% extends 'faq/home.html.twig' %}
{% block title %}Help{% endblock %}
{% block body %}
- {{ parent() }}
-
-
+ {% block markdown %}
{% apply markdown_to_html %}
- ## Groups
+ ## What is this site?
+ This is a social network, running the GNU social software.
- Users on LoadAverage can create _groups_ that other users can join. Groups can be a great way to share information and entertainment with a group of people who have a common interest or background; who work together on a team; or who have a particular knowledge or skill.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- You can find out about groups on the server on the [Groups](https://loadaverage.org/groups) page. You can join a group by clicking on the "Join" button either in the group list or on the group's home page.
-
- ### Starting a new group
-
- You can start a new group for friends and colleagues. Note that all groups are free for anyone to join.
-
- To start a new group, use the [new group](https://loadaverage.org/group/new) tool and fill out the form. Describe your group as best you can if you want people to be able to find it.
-
- When choosing the nickname for your group, try to keep it short. The nickname is sometimes included in messages to and from the group, so the less chars the better. Try using acronyms for organizations, or airport codes for places (like 'pdx' instead of 'portland').
-
- ### Sending messages to a group
-
- You can send a message to a group using the syntax "!groupname" anywhere in the message. If you have more than one group named, the notice will go to each group. Only members can send notices to a group, and groups do not respond to direct messages (DMs).
-
- You can also select the group from the "To:" drop down when posting.
-
- You can make a group message private by clicking the "private" button before posting.
-
- ### Receiving messages
-
- New group messages will appear in your inbox, and will also come to your phone or IM client if you've set them up to receive notices.
-
- ### Private groups
-
- The administrator can make a group private. For a private group, all notices will marked as private for group members only. Also, administrators will have to approve all new members to the group.
-
- Private groups are visible in the group directory.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/help.html.twig b/templates/faq/help.html.twig
index 21b76a3b09..6fa67c0f17 100644
--- a/templates/faq/help.html.twig
+++ b/templates/faq/help.html.twig
@@ -1,48 +1,18 @@
-{% extends 'faq/base.html.twig' %}
+{% extends 'faq/home.html.twig' %}
{% block title %}Help{% endblock %}
{% block body %}
- {{ parent() }}
-
-
+ {% block markdown %}
{% apply markdown_to_html %}
- ## Help
- GNU social is a **social service**. Users can post short (0 character) status messages which are broadcast to their friends and colleagues on the service and (optionally) onto the Web.
+ ## What is this site?
+ This is a social network, running the GNU social software.
- You can also broadcast other types of data, like bookmarks, event invitations, polls, and questions.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the textbox at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices.
-
- To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/home.html.twig b/templates/faq/home.html.twig
index ab3bfc3932..6b4cabc0d4 100644
--- a/templates/faq/home.html.twig
+++ b/templates/faq/home.html.twig
@@ -2,45 +2,49 @@
{% block title %}FAQ{% endblock %}
-{% block body %}
- {{ parent() }}
+{% block header %}{{ parent() }}{% endblock %}
+
+{% block nav %}
-
+{% endblock %}
+{% block body %}
+ {% block markdown %}
{% apply markdown_to_html %}
- ## What is this site?
- This is a social network, running the GNU social software.
+ ## What is this site?
+ This is a social network, running the GNU social software.
- You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/openid.html.twig b/templates/faq/openid.html.twig
index 1d767450f9..6fa67c0f17 100644
--- a/templates/faq/openid.html.twig
+++ b/templates/faq/openid.html.twig
@@ -1,52 +1,18 @@
-{% extends 'faq/base.html.twig' %}
+{% extends 'faq/home.html.twig' %}
{% block title %}Help{% endblock %}
{% block body %}
- {{ parent() }}
-
-
+ {% block markdown %}
{% apply markdown_to_html %}
- GNU social supports the [OpenID](http://openid.net/) standard for single signon between Web sites. OpenID lets you log into many different Web sites without using a different password for each. (See [Wikipedia's OpenID article](http://en.wikipedia.org/wiki/OpenID) for more information.)
+ ## What is this site?
+ This is a social network, running the GNU social software.
- If you already have an account on GNU social, you can login with your username and password as usual. To use OpenID in the future, you can [add an OpenID to your account](https://loadaverage.org/settings/openid) after you have logged in normally.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- There are many [Public OpenID providers](http://wiki.openid.net/OpenID-Providers), and you may already have an OpenID-enabled account on another service.
-
- - On wikis: If you have an account on an OpenID-enabled wiki, like [Wikitravel](http://wikitravel.org/), [wikiHow](http://www.wikihow.com/), [Vinismo](http://vinismo.com/), [AboutUs](http://aboutus.org/) or [Keiki](http://kei.ki/), you can log in to GNU social by entering the **full URL** of your user page on that other wiki in the box above. For example, _http://kei.ki/en/User:Evan_.
- - [Yahoo!](http://openid.yahoo.com/) : If you have an account with Yahoo!, you can log in to this site by entering your Yahoo!-provided OpenID in the box above. Yahoo! OpenID URLs have the form _https://me.yahoo.com/yourusername_.
- - [AOL](http://dev.aol.com/aol-and-63-million-openids) : If you have an account with [AOL](http://www.aol.com/), like an [AIM](http://www.aim.com/) account, you can log in to LoadAverage by entering your AOL-provided OpenID in the box above. AOL OpenID URLs have the form _http://openid.aol.com/yourusername_. Your username should be all lowercase, no spaces.
- - [Blogger](http://bloggerindraft.blogspot.com/2008/01/new-feature-blogger-as-openid-provider.html), [Wordpress.com](http://faq.wordpress.com/2007/03/06/what-is-openid/), [LiveJournal](http://www.livejournal.com/openid/about.bml), [Vox](http://bradfitz.vox.com/library/post/openid-for-vox.html) : If you have a blog on any of these services, enter your blog URL in the box above. For example, _http://yourusername.blogspot.com/_, _http://yourusername.wordpress.com/_, _http://yourusername.livejournal.com/_, or _http://yourusername.vox.com/_.
-
- Additionally, once you have an account on LoadAverage, you can use your profile's URL (https://loadaverage.org/yourusername) as an OpenID elsewhere as well.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/faq/tags.html.twig b/templates/faq/tags.html.twig
index 0924d52ec8..6fa67c0f17 100644
--- a/templates/faq/tags.html.twig
+++ b/templates/faq/tags.html.twig
@@ -1,63 +1,18 @@
-{% extends 'faq/base.html.twig' %}
+{% extends 'faq/home.html.twig' %}
{% block title %}Help{% endblock %}
{% block body %}
- {{ parent() }}
-
-
+ {% block markdown %}
{% apply markdown_to_html %}
- ## Tags
+ ## What is this site?
+ This is a social network, running the GNU social software.
- GNU social supports [tags](https://en.wikipedia.org/wiki/Tag_(metadata)) to help you organize your activities here. You can use tags for people and for notices.
+ You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
- ### Tagging a notice
-
- You can tag a notice using a _hashtag_; a # character followed by letters and numbers as well as '.', '-', and '_'. Note that accented latin characters are not supported, and non-roman scripts are right out.
-
- The HTML for the notice will link to a stream of all the other notices with that tag. This can be a great way to keep track of a conversation.
-
- ### Tagging yourself
-
- You can also add tags for yourself on your [profile settings](https://loadaverage.org/settings/profile) page or by using the edit tags button on your profile page. Use single words to describe yourself, your experiences and your interest. The tags will become links on your profile page to a list of all the users on the site who use that same tag. It can be a nice way to find people who are related to you geographically or who have a common interest.
-
- ### Tagging others
-
- You can also tag other users by using the edit tags button next to their profile. Such tags are called _people tags_. Once you have created a people tag, you can add or remove users from it using the tag's edit form. This makes it easy to organize your subscriptions into groups and sort through them separately. Also, it will let you create custom lists of people that others can subscribe to.
-
- You can also send a notice "to the attention of" your subscribers whom you've marked with a particular tag (note: _not_ people who've marked themselves with that tag). "@#family hello" will send a notice to all your subscribers you've marked with the tag 'family'.
-
- ### Private and public people tags
-
- A private people tag is only visible to the creator, it cannot be subscribed to, but the timeline can be viewed. To create a new private prepend a '.' to the tag in the tags editing box. To set an existing public tag as private or vice-versa, go to the tag's edit page.
+ In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
+ {% endblock %}