Merge remote branch 'pwith/docs'

(Fixed)
Conflicts:
	folks/individual-aggregator.vala
	folks/persona-store.vala

diff --cc configure.ac
Simple merge

diff --cc folks/individual-aggregator.vala
index 79bd7f1,5388517..1b49e29
--- 1/folks/individual-aggregator.vala
--- 2/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@@ -22,12 -22,11 +22,17 @@@ using Folks
  using Gee;
  using GLib;
  
 +public errordomain Folks.IndividualAggregatorError
 +{
 +  STORE_NOT_FOUND,
 +  ADD_FAILED,
 +}
 +
+ /**
+  * Allows access to the {@link Individual}s which have been created through
+  * aggregation of all the {@link Persona}s provided by the various
+  * {@link Backend}s. This is the main interface for client applications.
+  */
  public class Folks.IndividualAggregator : Object
  {
    private BackendStore backend_store;

diff --cc folks/individual.vala
Simple merge

diff --cc folks/persona-store.vala
index 613745b,8a37efa..cfe1b57
--- 1/folks/persona-store.vala
--- 2/folks/persona-store.vala
+++ b/folks/persona-store.vala
@@@ -21,12 -21,9 +21,15 @@@
  using GLib;
  using Folks;
  
 +public errordomain Folks.PersonaStoreError
 +{
 +  INVALID_ARGUMENT,
 +  CREATE_FAILED,
 +}
 +
+ /**
+  * A store for {@link Persona}s.
+  */
  public abstract class Folks.PersonaStore : Object
  {
    public abstract signal void personas_added (GLib.List<Persona> personas);

diff --cc folks/presence.vala
Simple merge