Rewrote Getting Started substantially and bumped some over to a new Exploring page

configs/user.config.php

@@ -24,7 +24,8 @@ $config["output_dir"] = "rendered/user";
 
 $config["pages"] = array(
   array("id" => "what_is_gnu_social", "title" => "What is GNU social"),
-  array("id" => "getting_started", "title" => "Getting Started")  
+  array("id" => "getting_started", "title" => "Getting Started"),
+  array("id" => "exploring", "title" => "Exploring the Network")
 );
 
 ?>

html/user/exploring.html

@@ -0,0 +1,48 @@
+
+
+
+{HEADING:SECTION:exploring:Exploring the network}
+
+<p>(Expand this to fully explain all the different timelines available and how to access them using stock vs Qvitter interfaces).</p>
+
+<p>Once you have an account you need to find some interesting people to follow. If somebody you know is already using GNU social, ask them for the URL of their profile. You can put it straight into your web browser to see their notices. If you would like to follow them, see the next section.</p>
+
+<p>If you don't know anyone there are several different ways to explore to explore the GNU social network. Look for these links:</p>
+
+<ul>
+	<li><em>Public</em> / <em>Public Timeline</em>: This shows you all of the notices published on this server.</li>
+	<li><em>Network</em> / <em>The Whole Known Network</em> - This shows you all of the noticed published on this server, plus all of the notices of all the people followed by people on this server. This is a good way to see lots of activity if you are on a busy server.</li>
+</ul>
+
+<p>You can look up GNU social servers in other ways, such as searching in search engines. If you find another server you can follow any user who has an account there, whether or not they are already part of the "known network" for your server.</p>
+
+
+
+{HEADING:SECTION:following:Following other people}
+
+
+<p>(Something about the difference between following people on the same server vs a remote one.)</p>
+
+
+{HEADING:SECTION:remote_follow:Following people on other servers}
+
+
+<p>When you follow somebody it means their notices will appear in your timeline (or Home screen). The simplest way to follow somebody is to visit their profile. For example, if you are browsing "The Whole Known Network" you could click on an account you see there.</p>
+
+<p>[example]</p>
+
+<p>Once the account page loads you will see some option to "Remote follow". Depending on the style of the website this could take multiple forms:</p>
+
+<p>[form 1] [form 2] [form 3]</p>
+
+<p>When you click on the button you will be asked for your account address. This is the full form that looks like an email address; something like: myaccountname@someserver.com</p>
+
+<p>After you submit your account, you will be taken to a page where you confirm the nickname of the person you wish to follow, along with your account. Click "XXX".</p>
+
+<p>You will then be redirected to the server where your accounted is hosted. It will also ask you to confirm that you wish to follow this person. Click "Confirm".</p>
+
+<p>Congratulations! You are now following that person.</p>
+
+<p>If you click on the "Home" / "Timeline" link on your server, you will see notices that they post from now on. (Not previous ones.)</p>
+
+<p>[screenshot]</p>

html/user/getting_started.html

@@ -1,40 +1,46 @@
 {HEADING:SECTION:choosing_a_server:Choosing a server}
 
-<p>You have to make one decision to get on GNU social: which server to use. If you're technically inclined and want to host your own server then you can do that. For everyone else there are many choices available. Many of them are listed on <a href="http://www.skilledtests.com/wiki/List_of_Independent_Statusnet_Instances">this webpage</a>.</p>
+<p>You have to make one decision to get on GNU social: which server to use. If you're technically inclined and want to host your own then <a href="https://git.gnu.io/gnu/gnu-social">you can do that</a>. For everyone else there are many choices available. Many of them are listed on <a href="http://www.skilledtests.com/wiki/List_of_Independent_Statusnet_Instances">this webpage</a>.</p>
 
-<p>If you don't want to shop around, here are some popular choices particularly for English speakers:</p>
+<p>If you don't want to shop around, these are some popular choices, particularly for English speakers:</p>
 
 <ul>
-	<li><a href="https://quitter.se/">https://quitter.se/</a></li>
-	<li><a href="https://loadaverage.org/">https://loadaverage.org/</a></li>
-	<li><a href="https://quitter.no/">https://quitter.no/</a></li>
+	<li><a href="https://quitter.se/">Quitter.se</a></li>
+	<li><a href="https://loadaverage.org/">LoadAverage</a></li>
+	<li><a href="https://quitter.no/">Quitter.no</a></li>
 </ul>
 
-<p>Otherwise you might like to use a server with people you already know. Each server has a section where you can see all the notices published on that server. If you choose a server that's relevant to you this could be a good way to find people you already know or meet new people who share similar interests.</p>
+<p>There is a small advantage in choosing either a local server or a server where you already know people. Every server has a user directory that lists all the accounts registered there. This can make it easier for others to stumble across you.</p>
 
-<p>Although there are many GNU social servers not all of them allow the general public to create accounts. This is a choice for the administrator of a particular server.</p>
+<p>Although there are many GNU social servers not all of them allow members of the public to create new accounts. The administrator of each server can turn this feature on or off.</p>
 
 
 
 {HEADING:SECTION:registering:Registering an account}
 
-<p>In this example we will use <a href="https://quitter.no">quitter.no</a>, which allows new users to register freely. This server looks very similar to Twitter because it is using a plugin called Qvitter. It has a "Sign Up" section on the bottom-left of the home page. Enter your basic information and click "Sign up to Quitter.no":</p>
+<p>In this example we will use <a href="https://quitter.no/">Quitter.no</a>, which allows new users to register freely. This server looks very similar to Twitter because it is using a plugin called <a href="https://git.gnu.io/h2p/Qvitter">Qvitter</a>. If you don't like the appearance then you can simply pick a different server.</p>
 
-<p>[main screenshot with sign up section marked]</p>
+<p>It has a Sign Up section on the bottom-left of the home page. Enter your basic information and click <i>Sign up to Quitter.no</i>:</p>
 
-<p>Once you click the button you will be prompted for more information:<p>
+<a href="{RES:qno_signup.jpg}">
+<img src="{RES:qno_signup_small.jpg}" alt="Sign Up section of quitter.no" class="figure" />
+</a>
 
-<p>[details]</p>
+<p>You will be prompted for extra information:<p>
 
-<p>Your nickname is the main name for your account, so choose carefully. This is allowed to contain only letters and numbers. You can also set a "Full name", which is more flexible, but feel free to choose a pseudonym or nickname here if you like.</p>
+<a href="{RES:qno_signup_details.png}">
+<img src="{RES:qno_signup_details_small.png}" alt="Sign Up Details section of quitter.no" class="figure" />
+</a>
 
-<p>A real email address is required for confirmation. This is normally needed to prevent spam.</p>
+<p>Your nickname is the main name for your account. You won't be able to change it so choose carefully. You can also set a "Full Name" that appears on your profile and alongside your notices. Don't feel obligated to use any real information&mdash;anonymous and pseudonymous users are very welcome on GNU social.</p>
+
+<p>A working email address is normally required for account verification. You can use it to receive email notifications too.</p>
 
 <p>Choose a good password. As always it is a good idea to use a password that you don't use anywhere else. Free software like <a href="https://www.keepassx.org/">KeePassX</a> can help you generate and remember your passwords.</p>
 
-<p>Once you confirm your email address you have an account. Congratulations!</p>
+<p>Press the <i>Sign up to Quitter.no</i> button. You can start using your account right away but you should confirm your email address when the email comes through.</p>
 
-<p>Note that when you tell other people about your account you have to specify both the nickname and the server where you registered. It looks like an email address. For example: myaccountnickname@quitter.no</p>
+<p>Congratulations! You're on GNU social!</p>
 
 
 
@@ -42,45 +48,65 @@
 
 <p>Depending on which server you're using you might see something different once you log in. Here are two examples:</p>
 
-<p>[screenshot 1] [screenshot 2]</p>
+<a href="{RES:send_example_1.png}">
+<img src="{RES:send_example_1_small.png}" alt="Publishing a notice on a standard server" class="figure" />
+</a>
+<a href="{RES:send_example_2.png}">
+<img src="{RES:send_example_2_small.png}" alt="Publishing a notice on a Qvitter server" class="figure" />
+</a>
 
-<p>In both cases you have a text box to type a message. Click inside it, type a notice, then click "Send" to publish it to your followers.</p>
+<p>In both cases you have a text box to type a message. Click inside it, type a notice, then click <i>Send</i> to publish it to your followers.</p>
 
 
 
-{HEADING:SECTION:exploring:Exploring the network}
+{HEADING:SECTION:account_names:Referring to your account}
 
-<p>Once you have an account you need to find some interesting people to follow. If somebody you know is already using GNU social, ask them for the URL of their profile. You can put it straight into your web browser to see their notices. If you would like to follow them, see the next section.</p>
+<p>For somebody else to find you on GNU social you need to give them two pieces of information:</p>
 
-<p>If you don't know anyone there are several different ways to explore to explore the GNU social network. Look for these links:</p>
+<ol>
+	<li>What server you're on&mdash;for example, <i>quitter.no</i></li>
+	<li>Your account name. That's the one starting with an <i>@</i>&mdash;for example, <i>@fred</i>
+</ol>
 
-<ul>
-	<li><em>Public</em> / <em>Public Timeline</em>: This shows you all of the notices published on this server.</li>
-	<li><em>Network</em> / <em>The Whole Known Network</em> - This shows you all of the noticed published on this server, plus all of the notices of all the people followed by people on this server. This is a good way to see lots of activity if you are on a busy server.</li>
-</ul>
+<p>There are three different ways of referring to your account and they're useful at different times.</p>
 
-<p>You can look up GNU social servers in other ways, such as searching in search engines. If you find another server you can follow any user who has an account there, whether or not they are already part of the "known network" for your server.</p>
+{HEADING:SUBSECTION:account_profile_url:Your profile URL}
+
+<p>If you want someone to check out your account the easiest thing is to give them a link to your profile. They don't need a GNU social account of their own. If they have one and they want to follow you they will be able to do that easily from this page.</p>
+
+<p>To access your profile click on your name. On quitter.no it's in the top-left and looks vaguely like this:</p>
+
+<img src="{RES:qno_profile_link.png}" alt="Link to your profile on quitter.no" class="figure" />
+
+<p>On a more standard server you can look for something in the menu called <i>Profile</i>:</p>
+
+<img src="{RES:taslug_profile_link.png}" alt="Link to your profile on a standard GNU social server" class="figure" />
+
+<p>Either way once you get there your browser will be at a URL that looks similar to this:</p>
+
+<p><tt>https://quitter.no/fred</tt></p>
+
+<p>Take that URL and give it to the person who wants to see your account.</p>
+
+
+{HEADING:SUBSECTION:account_email_format:Doing a remote follow}
+
+<p>Another way to describe your account is like an email address. You write your username, move the @ from the start to the end, then write the server without any <i>http</i>s or slashes:</p>
+
+<p><tt>fred@quitter.no</tt></p>
+
+<p>This is what you need to type in if you are doing a Remote Follow&mdash;that is, following someone on a different server from you. More about that in a later section: {LINK:remote_follow}.</p>
 
 
 
-{HEADING:SECTION:following:Following other people}
+{HEADING:SUBSECTION:account_at_format:Writing notices}
 
-<p>When you follow somebody it means their notices will appear in your timeline (or Home screen). The simplest way to follow somebody is to visit their profile. For example, if you are browsing "The Whole Known Network" you could click on an account you see there.</p>
+<p>If you're writing a notice and want to mention another user simply tag their account with an @ like this: <i>@fred - Have you met @sandra? She's a colleague of mine.</i></p>
 
-<p>[example]</p>
+<p>You might be thinking that the server part is missing. You're right! But GNU social is clever. If you use an @ tag in a notice it assumes you must be talking about someone you follow. It looks through its database to find which account has that name and fills out the server part behind the scenes.</p>
 
-<p>Once the account page loads you will see some option to "Remote follow". Depending on the style of the website this could take multiple forms:</p>
 
-<p>[form 1] [form 2] [form 3]</p>
+{HEADING:SECTION:getting_started_next_steps:Next steps}
 
-<p>When you click on the button you will be asked for your account address. This is the full form that looks like an email address; something like: myaccountname@someserver.com</p>
+<p>In this part you signed up for GNU social and sent your first notice. This will quickly get boring unless you find some other people to follow. The next part describes the different ways you can explore the GNU social network and see what everyone else is saying.</p>
 
-<p>After you submit your account, you will be taken to a page where you confirm the nickname of the person you wish to follow, along with your account. Click "XXX".</p>
-
-<p>You will then be redirected to the server where your accounted is hosted. It will also ask you to confirm that you wish to follow this person. Click "Confirm".</p>
-
-<p>Congratulations! You are now following that person.</p>
-
-<p>If you click on the "Home" / "Timeline" link on your server, you will see notices that they post from now on. (Not previous ones.)</p>
-
-<p>[screenshot]</p>

html/user/what_is_gnu_social.html

@@ -12,7 +12,7 @@
 
 <img src="{RES:federation.png}" alt="Diagram of federated servers" class="figure" />
 
-<p>If one server suffers an outage it's inconvenient for the people who have an account on that particular server but the rest of the network continues to operate as normal. This makes GNU social highly resilient. Censorship is difficult as servers can be located anywhere in the world.</p>
+<p>If one server suffers an outage it's inconvenient for the people who have an account on that particular server. The rest of the network continues to operate as normal. This makes GNU social highly resilient. Censorship is difficult as servers can be located anywhere in the world.</p>
 
 <p>Because GNU social is free software it's here to stay. A corporate social network might disappear or start running advertisements when the venture capital runs out. The GNU social code is available to everybody and there are many servers where it's free to create an account.</p>