Site copy rewrite

_includes/footer.html

@@ -13,7 +13,10 @@
                 <li><a href="http://represent.poplus.org/">Represent Boundaries</a></li>
             </ul>
         </div>
+        <div class="contact-us-footer-links">
           <a href="https://groups.google.com/forum/#!forum/poplus" class="contact-us-footer-link">Contact us</a>
+          <a href="https//twitter.com/poplusproject" class="contact-us-footer-link">Twitter</a>
+        </div>
         <div class="poplus-founders">
             <p>Poplus was proudly founded by</p>
             <div class="founder-images">

_includes/sidebar.html

@@ -3,7 +3,6 @@
         <li>
           <a href="{{ site.baseurl }}/get-involved/">Get involved</a>
           <ul>
-            <li><a href="{{ site.baseurl }}/get-involved/join-a-committee/">Join a committee</a></li>
             <li><a href="{{ site.baseurl }}/get-involved/other-ways/">Other ways to help</a></li>
             <li><a href="{{ site.baseurl }}/get-involved/find-people/">Find Poplus people!</a></li>
           </ul>
@@ -14,12 +13,12 @@
             <li><a href="{{ site.baseurl }}/components/current/">Current components</a></li>
             <li><a href="{{ site.baseurl }}/components/examples/">See components in&nbsp;use</a></li>
             <li><a href="{{ site.baseurl }}/components/definition/">What is a component?</a></li>
-            <li><a href="{{ site.baseurl }}/components/apply/">Making new components</a></li>
+            <li><a href="{{ site.baseurl }}/components/make/">Making new components</a></li>
           </ul>
         </li>
         <li><a href="{{ site.baseurl }}/about/">About Poplus</a></li>
         <li><a href="{{ site.baseurl }}/about/faq/">FAQ</a></li>
-        <li><a href="{{ site.baseurl }}/popluscon/">Conference</a></li>
+        <li><a href="{{ site.baseurl }}/resources/">Resources</a></li>
         <li><a href="{{ site.baseurl }}/blog/">Blog</a></li>
     </ul>
 </nav>

_sass/_footer.scss

@@ -29,12 +29,17 @@
 a.contact-us-footer-link {
     margin-top: 2em;
     color: #a4b1c2;
+    margin-right: 1em;
     &:hover,
     &:active,
     &:focus {
         text-decoration: underline;
         color: $colour_red;
     }
+
+}
+
+.contact-us-footer-links {
     @media (min-width: $medium-screen) {
         position: absolute;
         top: 1.1em;

about/faq/index.md

@@ -6,44 +6,46 @@ title: Frequently Asked Questions
 
 Greetings, and welcome to Poplus. Thanks for visiting!
 
-We know that it can be hard to understand exactly what Poplus is. Here are some hints about where to begin.
+If you’re wondering just where to start, or how to get involved, you’re in the right place.
 
 ## What should I do first?
 
-Here are five things that will start you off.
+Here are three things that will start you off.
 
 1. Find out what Poplus is: visit our [About page](http://poplus.org/about/) and read our FAQs below.
 2. Understand what Poplus Components are: [see some Poplus Components in action](http://poplus.org/components/examples/).
-3. Take a look at the [Poplus map](http://poplus.org/get-involved/find-people/) and see if there’s anyone local to you. If so, they will be happy to say hello, or answer your questions.
-4. Join the [Google Group](https://groups.google.com/forum/#!forum/poplus) and introduce yourself. Poplus is open to anyone who is interested, and the Google Group is where most activity and discussion takes place. You are welcome, whether you are from an organisation which might like to use a Poplus Component, or a developer who  might like to help make them. 5. Ready for more? Get involved - full details on how to do that [can be found here](http://poplus.org/get-involved/).
+3. Join the [Google Group](https://groups.google.com/forum/#!forum/poplus) and introduce yourself. Poplus is open to anyone who is interested, and the Google Group is where most activity and discussion takes place. You are welcome, whether you are from an organisation which might like to use a Poplus Component, or a developer who might like to help make them.
+
 
 ## Frequently Asked Questions
 
 ### What is Poplus?
 
-Poplus is an international federation for Collaborative Civic Coding. 
+Poplus is an international federation for Collaborative Civic Coding. It is free to join.
 
-In other words, it brings together people who create civic software, and the organisations or people that need that software.
+Poplus brings together people who create civic software, and the organisations or people that use that software.
 
-Its primary aim is to save work for everyone, by sharing digital tools that help people in the civic and democratic areas of life. You can read more on our [About page](http://poplus.org/about/).
+Its primary aim is to save time, energy and money for everyone, by supplying technical components that make it quicker and easier to build and maintain civic apps and websites. You can read more on our [About page](http://poplus.org/about/).
 
 ### How do I join Poplus?
 
 There is no membership process; you become an active member by participating.
 
-But you don’t have to participate immediately! Feel free to join the [Google Group](https://groups.google.com/forum/#!forum/poplus), subscribe to updates, and comment when you have something to say.
+Join the [Google Group](https://groups.google.com/forum/#!forum/poplus), say hello, and you’re in!
+
+### What will Poplus do for me?
 
-### What are some concrete ways to work with Poplus?
+Poplus exists to help you save time, energy and money when it comes to building civic apps or websites.
 
-There are many ways to get involved. If you are a developer, you can write code, or improve other people’s code.
+Specifically it will do this by removing the need to program parts of your civic applications - it takes away the need to solve certain problems, such as mapping locations to political boundaries.
 
-If you are in need of online tools, you can share your experiences and hopes, and help shape the ones that are made.
+And it does it in a way that means you don’t have to buy into one programming language or operating system.
 
-If you are neither a coder nor in need of digital tools, but are just an interested person, you are still welcome, and there are many other ways to get involved. For example, you might like to join one of the Poplus sub-committees. Find out more [here](http://poplus.org/get-involved/).
+If you’re not sure if Poplus can help you, just join the [Google Group](https://groups.google.com/forum/#!forum/poplus) and tell us about the problem you’re trying to solve. We welcome techies, campaigners, everyone.
 
 ### What are the expectations in working with Poplus?
 
-At the moment there is no minimum requirement. Poplus is still young, and we are in the process of forming it. We will accept all the help that we are offered!
+There is no minimum requirement. Every little helps.
 
 ### How do I make contact?
 

about/index.md

@@ -5,22 +5,33 @@ redirect_from:
 - "/about.html"
 - "/about/history.html"
 ---
-<img src="{{ site.baseurl }}/assets/img/shiny-happy-poplus-people.jpg" />
-Poplus is an open federation of people and organisations from many different countries. Our joint mission is to share knowledge and technology that can help us to help citizens.
+Poplus is an open, free-to-join federation of people and organisations from many different countries, working in the civic technology arena. Our joint mission is to share knowledge and technology, so that our civic tech tools can be more useful to citizens.
+
+Our central observation is this: civic websites and apps often contain some of the same features and functions, even when they’re being deployed in very different countries and for very different purposes. For example, it’s very common for civic websites to contain lists of public figures - politicians or business people.
+
+At Poplus we believe that we can all save time and money when we share code that allows us to add these features more quickly and easily than if we build them from scratch. And we believe there is a way of doing this that doesn’t require everyone to adopt one huge shared language or framework.
 
-Poplus' founding principle is that collaborative civic coding can help save time and expense for people and organisations everywhere. And that sharing stories and lessons will help us all to be as effective as possible.
+Our answer is an approach called [Poplus Components](/components/). These are bits of code that solve single problems, and that can be accessed as web services. They don’t require you to use one specific programming language or operating system. They’re there to save time, not impose a new task on you.
 
-Civic websites often need the same basic functionalities, no matter what kind of legislature or form of government they operate within. At Poplus we have been trying to build technologies that can save us all time and money by re-using each others work.
+<img src="{{ site.baseurl }}/assets/img/shiny-happy-poplus-people.jpg" />
 
-We call the resulting software [Poplus Components](/components/). They are open source and are available for anyone to use for free.
+## How did Poplus begin?
 
-## How Poplus began
+Poplus was originally conceived by two organisations - [Fundación Ciudadano Inteligente](http://ciudadanointeligente.org/) in Chile, and [mySociety](http://mysociety.org) in the UK. They realised that, despite their geographic distance from one another, they could work more efficiently when they shared their technologies.
 
-In April 2014, the [first Poplus conference](/popluscon/) threw the doors open to international attendees, who discussed how to take the project forward - [what makes a Component](/components/#definition), what Components are most needed, [how Poplus should organise itself](/posts/santiago-conference-2014/), and how to [facilitate communication](https://groups.google.com/forum/#!forum/poplus).
+In April 2014, the first Poplus conference invited people from civic organisations all over the world to come together, to shape and become part of this new movement. This conference generated great energy and has seen people starting to embrace the idea of Poplus, and the technologies, across large parts of the world.
 
-If you are interested in joining Poplus, you can [find out more](https://groups.google.com/forum/#!forum/poplus).
 
 ## Where is Poplus going next?
 
-Poplus is just getting started. We have goals to hold more events, build more shared technologies, and to share more stories of success and failure. But the real answer is that we are going where you want us to go. So why not get involved, and help plot our journey?
+Our current aims are:
+
+- to bring the first generation of Poplus Components to maturity.
+- to reach out to groups and individuals anywhere in the world who will benefit from using Poplus Components, and work with them to help them deploy these new technologies.
+- to encourage debate and discussion from anyone within the civic or democratic tech areas, on our [online Poplus group](https://groups.google.com/forum/#!forum/poplus)
+- to discover what people want from [existing](/components/current/) and [new Components](/components/apply/)
+
+If you’d like to get involved, you’re more than welcome. Come and say hello on the [online Poplus group](https://groups.google.com/forum/#!forum/poplus).
 
+### More questions?
+[See our FAQs](/about/faq/).

components/current/index.md

@@ -6,7 +6,9 @@ redirect_from:
 - "/catalogue.html"
 ---
 
-Here are all the Poplus Components in existence. They vary between being very mature and brand new.
+All Poplus Components are listed below - visit their websites to find out more about how to use them.
+
+Questions? Problems? Post on the [online Poplus Group](https://groups.google.com/forum/#!forum/poplus) where you’ll find plenty of people to help you.
 
 <div class="grid-row" id="components">
 <!--

components/make/index.md

@@ -0,0 +1,41 @@
+---
+layout: "inner-page"
+title: Make a new Poplus component
+published: true
+redirect_from:
+- "/apply/"
+---
+
+Who builds Components? Anybody who wants to, and has the skills to create an open source piece of code that can be used by civic activists around the world. If that’s you, read on.
+
+## If you already have some code, or an idea
+
+Come and talk on the [online Poplus Group](https://groups.google.com/forum/#!forum/poplus): discover whether there’s a need for your Component, and if anything similar has already been built. Tap into the experience of our worldwide network of developers, and find out if there are any features or requirements you may not have thought of.
+
+Once your Component is ready, you can have it [certified](#certified).
+
+## If you have no ideas, but plenty of enthusiasm
+Like to build a Component, but don’t yet have an idea for one? Then:
+
+1. Make sure you know [what a Component is](/components/definition)
+2. Start a discussion in the [online Poplus Group](https://groups.google.com/forum/#!forum/poplus), where you can talk to the kinds of groups and people who will be using your software, and find out what they really need.
+3. Take a look at the [Poplus Trello board](https://trello.com/b/5gGF4xrJ/ideas-for-new-poplus-components), where suggestions for new Components are made.
+
+## How to get your software certified as a Poplus Component
+Anyone can apply to have a piece of software certified as an official Poplus Component. Once certified it can be given a section on Poplus.org and will be discussed, used and celebrated by Poplus members around the world.
+
+## Why apply to have your code certified as a Poplus Component?
+If your code becomes a Poplus Component, we’ll promote it on the website and at the events we attend.
+
+Poplus Components make it easier for people to build civic and democratic and campaigning websites and apps of all kinds. Your software will help activists, journalists and regular citizens all over the world, not just now but in the years ahead.
+
+## How to apply
+Make a copy of this [application form](https://docs.google.com/a/mysociety.org/document/d/1N70pkeuUc4npp-QerZo68YjvnULNRgakmYv8OCOFsKo/edit), fill it in, and send it to the [Poplus Google Group](https://groups.google.com/forum/#!forum/poplus) to let us know that you’ve applied. We’ll get back to you within a week with feedback.
+
+## An important note
+Your software may not immediately fulfill all the criteria necessary to be labelled a Component. We encourage people to see applying as a learning process - it’s possible (even likely) that your code will need to be refined or modified before it gets the official ‘Poplus Component’ certification.
+
+## Who manages the certification process?
+The certification process is undertaken by a small group of Poplus members who have volunteered to oversee submissions.
+
+If you have any questions or want to learn more about Poplus, Components, or this process, please join the [Poplus Google Group](https://groups.google.com/forum/#!forum/poplus).

get-involved/find-people/index.md

@@ -5,6 +5,11 @@ redirect_from:
 - "/about/people.html"
 - "/about/contributors.html"
 ---
+We’re an international federation, and there are Poplus people in many places.
+
+Between us, we’re often at civic or open data conferences, hackathons and events, and we’re always happy to chat. Check the calendar at the foot of this page to see if we’ll be coming your way.
+
+If in doubt, the best thing to do by far is to join the [online Poplus Group](https://groups.google.com/forum/#!forum/poplus) to introduce yourself and see if anyone else is in the neighbourhood.
 
 <iframe src="https://mapsengine.google.com/map/u/0/embed?mid=zIRpJTfhUk3U.kz3_0IC6HoQ4" frameborder="0" height="420" width="583"></iframe>
 
@@ -35,3 +40,7 @@ For instant chat, find us on #poplus on [Freenode](https://webchat.freenode.net/
 Poplus Components are all Open Source. You can find their code or add tickets for bugs or suggested changes on GitHub.
 
 See the [Components page]({{ site.baseurl }}/components/) for links.
+
+## Meetings calendar
+
+<iframe src="https://www.google.com/calendar/embed?src=b9cleffo7lgld26strcs6ec1os%40group.calendar.google.com&ctz=America/Toronto" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>