From ae9506f21e90c052248c1dd77c929990883dfd54 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 22:51:29 -0400 Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: cleanup photo menus more backend work on mail2 followers make editplain work everywhere move all fix_mce to one function so it can easily be undone duplicate community posts fix_mce_lf contact edit page fix_mce_lf on profiles set default on get_avatar rev update Incorrect tranlation (one negation too much) fixed install bug diabook-themes: smal fix in bbcode-js diabook-themes: added url and quote to bbcode toolbar under comment box Remove Gravatar from core and add new hook avatar_lookup. Rename gravatar_img() more generic to avatar_img(). * master: From 2af41ee57bbe766229368376670c4ee3b528b2c4 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 23:34:39 -0400 Subject: [PATCH 2/3] [fix] absolute links in docs and newmember.php; breaks sub-dir installs Signed-off-by: Simon L'nu --- doc/Account-Basics.md | 14 ++++++++------ doc/andfinally.md | 6 ++++-- doc/groupsandpages.md | 6 +++--- doc/guide.md | 4 ++-- doc/makingnewfriends.md | 6 +++--- doc/network.md | 6 +++--- doc/peopleyouknow.md | 8 ++++---- mod/newmember.php | 4 ++-- 8 files changed, 29 insertions(+), 25 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 164a6be46..41ca95b36 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -6,40 +6,41 @@ Account Basics **Registration** -Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. +Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. + +If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. -If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. *OpenID* The first field on the Registration page is for an OpenID address. If you do not have an OpenID address or do not wish to use OpenID, leave this field blank. If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in. + *Your Full Name* Please provide your full name **as you would like it to be displayed on this system**. Most people use their real name for this, but you're under no obligation to do so yourself. + *Email Address* Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in. This doesn't have to be your primary email address, but it does need to be a real email address. You can't get your initial password, or reset a lost password later without it. This is the only bit of personal information that has to be accurate. + *Nickname* A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. Due to the way that the nickname is used, it has some limitations. It must contain only US-ASCII text characters and numbers, and must also start with a text character. It also must be unique on this system. This is used in many places to identify your account, and once set - cannot be changed. - *Directory Publishing* The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. + *Register* Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. - - - **Login Page** On the 'Login' page, please enter your login information that was provided during registration. You may use either your nickname or email address as a Login Name. @@ -55,6 +56,7 @@ Otherwise, enter your password. This will have been initially provided in your r After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember. + **Getting Started** A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information. diff --git a/doc/andfinally.md b/doc/andfinally.md index cd8a6994b..1a781c1d8 100644 --- a/doc/andfinally.md +++ b/doc/andfinally.md @@ -1,3 +1,5 @@ +[[!meta title="And Finally..."]] + And that brings the Quick Start to an end. Here are some more things to help get you started: @@ -18,7 +20,7 @@ Here are some more things to help get you started: **Documentation** -- Connecting to more networks -- Help Index +- Connecting to more networks +- Help Index diff --git a/doc/groupsandpages.md b/doc/groupsandpages.md index 418e682c8..5cfbc653c 100644 --- a/doc/groupsandpages.md +++ b/doc/groupsandpages.md @@ -1,11 +1,11 @@ -This is the global directory. If you get lost, you can click this link to bring yourself back here. +This is the global directory. If you get lost, you can click this link to bring yourself back here. On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. -Once you've added some groups, move on to the next section. +Once you've added some groups, move on to the next section. - + diff --git a/doc/guide.md b/doc/guide.md index 178170c4e..9efb4852c 100644 --- a/doc/guide.md +++ b/doc/guide.md @@ -6,8 +6,8 @@ This is a bit like your Facebook wall. It's where all your status messgages are Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. -Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab - + diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md index 35befaa36..7eff1eda1 100644 --- a/doc/makingnewfriends.md +++ b/doc/makingnewfriends.md @@ -1,11 +1,11 @@ -This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. +This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. -Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! +Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! - + diff --git a/doc/network.md b/doc/network.md index f445b0055..6c3235378 100644 --- a/doc/network.md +++ b/doc/network.md @@ -1,9 +1,9 @@ -This is your Network Tab. If you get lost, you can click this link to bring yourself back here. +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to add people you already know from Facebook. +Now we need to fill it up, the first step, is to add people you already know from Facebook. - + diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md index 143c49217..99a850480 100644 --- a/doc/peopleyouknow.md +++ b/doc/peopleyouknow.md @@ -1,13 +1,13 @@ -This is your connector settings page. If you get lost, you can click this link to bring yourself back here. +This is your connector settings page. If you get lost, you can click this link to bring yourself back here. This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. -The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. +The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. -When you're ready, we can move on to making new friends. +When you're ready, we can move on to making new friends. - + diff --git a/mod/newmember.php b/mod/newmember.php index 683463ecb..a423d11b8 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -13,7 +13,7 @@ function newmember_content(&$a) { $o .= '
    '; - $o .= '
  • ' . '' . t('On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '
    • ' . EOL; + $o .= '
  • ' . '' . t('On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '
    • ' . EOL; $o .= '
  • ' . '' . t('On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '
    • ' . EOL; @@ -48,4 +48,4 @@ function newmember_content(&$a) { $o .= ''; return $o; -} \ No newline at end of file +} From 6b414d3de4a25b0f5428b8ef4f315a4f158ac825 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 23:45:47 -0400 Subject: [PATCH 3/3] more ' = ' spacing fixes Signed-off-by: Simon L'nu --- doc/Bugs-and-Issues.md | 4 ++-- doc/Making-Friends.md | 4 ++-- doc/andfinally.md | 14 +++++++------- doc/guide.md | 2 +- doc/network.md | 6 +++--- doc/peopleyouknow.md | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md index 46abea9a3..251f91e93 100644 --- a/doc/Bugs-and-Issues.md +++ b/doc/Bugs-and-Issues.md @@ -6,11 +6,11 @@ Bugs and Issues If your server has a support page, you should report any bugs/issues you encounter there first. Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster. -If you're a technical user, or your site doesn't have a support page, you'll need to use the Bug Tracker. Please perform a search to see if there's already an open bug that matches yours before submitting anything. +If you're a technical user, or your site doesn't have a support page, you'll need to use the Bug Tracker. Please perform a search to see if there's already an open bug that matches yours before submitting anything. Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible. It's generally better to provide too much information than not enough. -See this article to learn more about submitting **good** bug reports. +See this article to learn more about submitting **good** bug reports. **Bug Sponsorship** diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 3f1a24c8d..70b87abbc 100644 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md @@ -5,11 +5,11 @@ Making Friends Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it? -The easiest thing to do is to join the New Here group. This group is especially for people new to the Friendica network. Simply connect to the group, post to the wall, and make new friends. You don't even have to like us - comment on a few of our posts, and other people will start to add you too. +The easiest thing to do is to join the New Here group. This group is especially for people new to the Friendica network. Simply connect to the group, post to the wall, and make new friends. You don't even have to like us - comment on a few of our posts, and other people will start to add you too. The next thing you can do is look at the Directory. The directory is split up into two parts. If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server. You'll also see a link to the Global Directory. If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica. You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages. You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually. -To connect with other Friendica user +To connect with other Friendica users: Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile). diff --git a/doc/andfinally.md b/doc/andfinally.md index 1a781c1d8..c4e8cb948 100644 --- a/doc/andfinally.md +++ b/doc/andfinally.md @@ -7,20 +7,20 @@ Here are some more things to help get you started: **Groups** -- New Here - a group for people new to Friendica +- New Here - a group for people new to Friendica -- Friendica Support - problems? This is the place to ask. +- Friendica Support - problems? This is the place to ask. -- Public Stream - a place to talk about anything to anyone. +- Public Stream - a place to talk about anything to anyone. -- Let's Talk a group for finding people and groups who share similar interests. +- Let's Talk a group for finding people and groups who share similar interests. -- Local Friendica a page for local Friendica groups +- Local Friendica a page for local Friendica groups **Documentation** -- Connecting to more networks -- Help Index +- Connecting to more networks +- Help Index diff --git a/doc/guide.md b/doc/guide.md index 9efb4852c..d76af92e2 100644 --- a/doc/guide.md +++ b/doc/guide.md @@ -6,7 +6,7 @@ This is a bit like your Facebook wall. It's where all your status messgages are Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. -Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab diff --git a/doc/network.md b/doc/network.md index 6c3235378..afb092395 100644 --- a/doc/network.md +++ b/doc/network.md @@ -1,9 +1,9 @@ -This is your Network Tab. If you get lost, you can click this link to bring yourself back here. +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to add people you already know from Facebook. +Now we need to fill it up, the first step, is to add people you already know from Facebook. - + diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md index 99a850480..ae0c9ef59 100644 --- a/doc/peopleyouknow.md +++ b/doc/peopleyouknow.md @@ -1,8 +1,8 @@ -This is your connector settings page. If you get lost, you can click this link to bring yourself back here. +This is your connector settings page. If you get lost, you can click this link to bring yourself back here. This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. -The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. +The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. When you're ready, we can move on to making new friends.