From jcouteau@users.chorem.org Tue Dec 29 16:44:14 2009
From: jcouteau@users.chorem.org
To: pollen-commits@list.chorem.org
Subject:
 [Pollen-commits] r2831 - in trunk: . src/site src/site/fr/rst	src/site/rst
Date: Tue, 29 Dec 2009 16:44:14 +0100
Message-ID: <20091229154414.4387215D8F@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7481227903609685302=="

--===============7481227903609685302==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: jcouteau
Date: 2009-12-29 16:44:14 +0100 (Tue, 29 Dec 2009)
New Revision: 2831

Added:
   trunk/src/site/fr/rst/assentiment.rst
   trunk/src/site/fr/rst/condorcet.rst
   trunk/src/site/fr/rst/depouillement.rst
   trunk/src/site/fr/rst/historique.rst
   trunk/src/site/fr/rst/pourcentage.rst
   trunk/src/site/rst/approval.rst
   trunk/src/site/rst/condorcet.rst
   trunk/src/site/rst/historical.rst
   trunk/src/site/rst/methods.rst
   trunk/src/site/rst/percentage.rst
Modified:
   trunk/pom.xml
   trunk/src/site/fr/rst/index.rst
   trunk/src/site/fr/rst/install.rst
   trunk/src/site/fr/rst/tutoriel.rst
   trunk/src/site/site_en.xml
   trunk/src/site/site_fr.xml
Log:
Add explanation about each vote counting method.
Now can use scmwebeditor (good default locale in pom)


Modified: trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pom.xml	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/pom.xml	2009-12-29 15:44:14 UTC (rev 2831)
@@ -301,6 +301,9 @@
         <!--Multilanguage maven-site -->
         <maven.site.locales>en,fr</maven.site.locales>
=20
+        <!--Override fr mavenpom default locale-->
+        <defaultLocale>en</defaultLocale>
+=09
         <!-- license to use  -->
         <license.licenseName>gpl_v3</license.licenseName>
=20

Added: trunk/src/site/fr/rst/assentiment.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/assentiment.rst	                        (rev 0)
+++ trunk/src/site/fr/rst/assentiment.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,11 @@
+D=C3=A9pouillement par assentiment
+-----------------------------
+
+La consultation par assentiment se d=C3=A9roule en seul tour. Chaque personne
+s=C3=A9lectionne autant de choix qu'elle le d=C3=A9sire : aucun, un, plusieu=
rs, tous, mais
+jamais deux fois le m=C3=AAme. Le choix vainqueur est celui qui a le plus de=
 voix.
+
+Cette m=C3=A9thode est simple et pratique. Dans Pollen, il est possible de l=
imiter le
+nombre de choix, cela permet de varier entre le scrutin uninominal =C3=A0 un=
 tour et
+le scrutin par assentiment, cela invite =C3=A9galement les =C3=A9lecteurs =
=C3=A0 voter
+sinc=C3=A8rement.

Added: trunk/src/site/fr/rst/condorcet.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/condorcet.rst	                        (rev 0)
+++ trunk/src/site/fr/rst/condorcet.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,20 @@
+M=C3=A9thode de vote Condorcet
+-------------------------
+
+La m=C3=A9thode Condorcet est une m=C3=A9thode cr=C3=A9=C3=A9e par le marqui=
s de Condorcet au XVIIIe
+si=C3=A8cle et qui a pour but de trouver le meilleur compromis entre tous le=
s votants
+ou sond=C3=A9s.
+
+D'apr=C3=A8s cette m=C3=A9thode, l'unique vainqueur, s'il existe, est le cho=
ix qui compar=C3=A9
+=C3=A0 tous les autres choix un =C3=A0 un s'av=C3=A8rerait =C3=AAtre le plus=
 appr=C3=A9ci=C3=A9.
+
+Cette m=C3=A9thode a =C3=A9t=C3=A9 cr=C3=A9=C3=A9e pour am=C3=A9liorer la m=
=C3=A9thode uninominale =C3=A0 un tour qui
+peut tr=C3=A8s bien ne pas repr=C3=A9senter les d=C3=A9sirs des =C3=A9lecteu=
rs.
+
+L'inconv=C3=A9nient de cette m=C3=A9thode est qu'il est possible qu'aucun va=
inqueur ne
+puisse =C3=AAtre d=C3=A9sign=C3=A9 (c'est le paradoxe de Condorcet). Dans ce=
 cas, il faut
+utiliser une autre m=C3=A9thode de r=C3=A9solution des conflits.
+
+(Source : Wikipedia_ )
+
+.. _Wikipedia: http://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet#Utilisati=
on_du_vote_de_Condorcet
\ No newline at end of file

Added: trunk/src/site/fr/rst/depouillement.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/depouillement.rst	                        (rev 0)
+++ trunk/src/site/fr/rst/depouillement.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,13 @@
+Les m=C3=A9thodes de d=C3=A9pouillement de Pollen
+---------------------------------------
+
+Pollen permet diff=C3=A9rentes m=C3=A9thodes de d=C3=A9pouillement pour les =
consultations.
+Chaque m=C3=A9thode a ses avantages et ses inconv=C3=A9nients.
+
+ * M=C3=A9thode Condorcet_
+ * M=C3=A9thode par pourcentage_
+ * M=C3=A9thode par assentiment_
+
+.. _M=C3=A9thode Condorcet: condorcet.html
+.. _M=C3=A9thode par pourcentage: pourcentage.html
+.. _M=C3=A9thode par assentiment: assentiment.html
\ No newline at end of file

Added: trunk/src/site/fr/rst/historique.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/historique.rst	                        (rev 0)
+++ trunk/src/site/fr/rst/historique.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,21 @@
+Pourquoi Pollen est Pollen ?
+----------------------------
+
+Historiquement, CodeLutin_ et Libre-Entreprise_ utilisaient, pour
+leurs consultations et votes internes, le logiciel Glasnost_. Cependant ce
+dernier =C3=A9tait trop complexe =C3=A0 utiliser et =C3=A0 =C3=A9t=C3=A9 aba=
ndonn=C3=A9.
+
+Apr=C3=A8s avoir cherch=C3=A9 parmi les solutions existantes, il s'est av=C3=
=A9r=C3=A9 que ces
+derni=C3=A8res =C3=A9taient, ou trop simples, ou trop complexes, ou propri=
=C3=A9taires. La
+soci=C3=A9t=C3=A9 Code Lutin_ a donc pris en charge le d=C3=A9veloppement d'=
une nouvelle
+application, sous licence GPL, permettant de r=C3=A9aliser simplement des
+consultations simples ou complexes pour les diff=C3=A9rentes organisations d=
ont elle
+fait partie et ses besoins internes. Pollen =C3=A9tait n=C3=A9.
+
+Pollen sert actuellement pour les besoins internes de Code Lutin_ : vote pou=
r les
+noms de projet, logos, d=C3=A9cisions d'entreprise, ..., pour Libre-Entrepri=
se_ :
+votes des membres pour les diff=C3=A9rentes d=C3=A9cisions du groupement.
+
+.. _CodeLutin: http://www.codelutin.com
+.. _Libre-Entreprise: http://www.libre-entreprise.org
+.. _Glasnost: http://glasnost.entrouvert.org
\ No newline at end of file

Modified: trunk/src/site/fr/rst/index.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/index.rst	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/src/site/fr/rst/index.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -1,29 +1,32 @@
-Bienvenue sur le site de Pollen
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D
-
-Pollen, qu'est-ce que c'est ?
------------------------------
-
-Pollen est une application de consultation web. Elle est destin=C3=A9e aux p=
etites entit=C3=A9s
-qui veulent un moyen simple de g=C3=A9rer des consultations tout en restant =
ma=C3=AEtre de leurs
-donn=C3=A9es.
-
-Le but de Pollen n'est pas de permettre de faire du vote en ligne et de remp=
lacer les scrutins existant mais d'introduire de nouveaux usages de consultat=
ion/sondage/vote l=C3=A0 o=C3=B9 il n'y en a pas. De ce fait aucune r=C3=A9fl=
exion sur la s=C3=A9curit=C3=A9 des votes a =C3=A9t=C3=A9 conduite, car ce n'=
est pas notre but.
-
-Pourquoi Pollen est super ?
----------------------------
-
-- Pollen permet de voter pour des textes, dates ou images.
-- Vous pouvez utiliser un d=C3=A9pouillement classique ou Condorcet
-- Vous pouvez voter anonymement.
-- Vous pouvez importer des listes de votants depuis des fichiers de CSV ou d=
es
-  annuaires LDAP.
-- Vous pouvez importer/exporter des consultations.
-- Vous pouvez installer Pollen sur votre propre serveur pour garder le contr=
=C3=B4le
-  de vos donn=C3=A9es (consultation confidentielle par exemple).
-- Pollen est bas=C3=A9 sur les services pour pouvoir =C3=AAtre int=C3=A9gr=
=C3=A9 partout.
-- Pollen est libre, vous pouvez le modifier, l'am=C3=A9liorer ou l'adapter a=
 vos besoins.
-- Pollen est super beau.
-
-.. image:: pollen.png
-   :alt: Pollen screenshot
+Bienvenue sur le site de Pollen
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D
+
+Pollen, qu'est-ce que c'est ?
+-----------------------------
+
+Pollen est une application de consultation web. Elle est destin=C3=A9e aux p=
etites entit=C3=A9s
+qui veulent un moyen simple de g=C3=A9rer des consultations tout en restant =
ma=C3=AEtre de leurs
+donn=C3=A9es.
+
+Le but de Pollen n'est pas de permettre de faire du vote en ligne et de remp=
lacer
+les scrutins existant mais d'introduire de nouveaux usages de
+consultation/sondage/vote l=C3=A0 o=C3=B9 il n'y en a pas. De ce fait aucune=
 r=C3=A9flexion sur
+la s=C3=A9curit=C3=A9 des votes a =C3=A9t=C3=A9 conduite, car ce n'est pas n=
otre but.
+
+Pourquoi Pollen est super ?
+---------------------------
+
+- Pollen permet de cr=C3=A9er des consultations sur des textes, dates ou ima=
ges.
+- Vous pouvez utiliser un d=C3=A9pouillement classique ou Condorcet
+- Vous pouvez voter anonymement.
+- Vous pouvez importer des listes de votants depuis des fichiers de CSV ou d=
es
+  annuaires LDAP.
+- Vous pouvez importer/exporter des consultations.
+- Vous pouvez installer Pollen sur votre propre serveur pour garder le contr=
=C3=B4le
+  de vos donn=C3=A9es (consultation confidentielle par exemple).
+- Pollen est bas=C3=A9 sur les services pour pouvoir =C3=AAtre int=C3=A9gr=
=C3=A9 partout.
+- Pollen est libre, vous pouvez le modifier, l'am=C3=A9liorer ou l'adapter a=
 vos besoins.
+- Pollen est super beau.
+
+.. image:: pollen.png
+   :alt: Pollen screenshot

Modified: trunk/src/site/fr/rst/install.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/install.rst	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/src/site/fr/rst/install.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -8,7 +8,8 @@
 Conteneur Web
 -------------
=20
-Pour installer l'application il suffit de d=C3=A9ployer l'archive war dans u=
n conteneur Web comme Tomcat_.
+Pour installer l'application il suffit de d=C3=A9ployer l'archive war dans un
+conteneur Web comme Tomcat_.
=20
 Par d=C3=A9faut une base de donn=C3=A9e H2 est cr=C3=A9=C3=A9e dans le r=C3=
=A9pertoire */tmp*. Pour
 modifier ce comportement par d=C3=A9faut il suffit de cr=C3=A9er le fichier
@@ -50,7 +51,10 @@
=20
 Il peut-=C3=AAtre n=C3=A9cessaire de red=C3=A9ployer l'application apr=C3=A8=
s avoir modifi=C3=A9 ce fichier.
=20
-Un utilisateur avec les droits d'administration est cr=C3=A9=C3=A9 automatiq=
uement (identifiant "admin", mot de passe "pollen"). Par mesure de s=C3=A9cur=
it=C3=A9 il est important de supprimer cet utilisateur apr=C3=A8s avoir cr=C3=
=A9er un autre compte administrateur.
+Un utilisateur avec les droits d'administration est cr=C3=A9=C3=A9 automatiq=
uement
+(identifiant "admin", mot de passe "pollen"). Par mesure de s=C3=A9curit=C3=
=A9 il est
+important de supprimer cet utilisateur apr=C3=A8s avoir cr=C3=A9er un autre =
compte
+administrateur.
=20
 Conteneur embarqu=C3=A9
 ------------------

Added: trunk/src/site/fr/rst/pourcentage.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/pourcentage.rst	                        (rev 0)
+++ trunk/src/site/fr/rst/pourcentage.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,8 @@
+Vote par pourcentage ou vote par estimation moyenne
+---------------------------------------------------
+
+Chaque =C3=A9lecteur a 100 points =C3=A0 r=C3=A9partir entre les diff=C3=A9r=
ents choix (d'o=C3=B9 le
+pourcentage). Le choix qui a le plus de points est d=C3=A9clar=C3=A9 vainque=
ur.
+
+Ce d=C3=A9pouillement a pour principal avantage d'inciter le vote sinc=C3=A8=
re, mais peut
+se r=C3=A9v=C3=A9ler complexe en cas de nombreux choix.

Modified: trunk/src/site/fr/rst/tutoriel.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/fr/rst/tutoriel.rst	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/src/site/fr/rst/tutoriel.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -18,7 +18,7 @@
=20
 Le type de d=C3=A9pouillement correspond =C3=A0 un l'un des suivants :
=20
-- **Normal** : s=C3=A9lection de 1 ou n choix parmis les choix possibles
+- **Normal** : s=C3=A9lection de 1 ou n choix parmis les choix possibles(Vot=
e par assentiment)
 - **Percentage** : attribution d'un pourcentage =C3=A0 chaque choix
 - **Condorcet** : classement des choix par ordre de pr=C3=A9f=C3=A9rence (cf=
 `Condorcet`_ )
=20

Added: trunk/src/site/rst/approval.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/rst/approval.rst	                        (rev 0)
+++ trunk/src/site/rst/approval.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,10 @@
+Approval voting
+---------------
+
+The approval voting is a one round voting system. EAch person select as many
+choices as he/she want : none, one, several, all, but never two times the sa=
me.
+The winner is the choice that has the greater number of votes.
+
+This method is simple and easy. In Pollen, it is possible to limit the numbe=
r of
+choices, this permits to switch from the first-to-post voting (only one choi=
ce)
+to approval voting (no limit of choice). This invites voters to vote sincere=
ly.
\ No newline at end of file

Added: trunk/src/site/rst/condorcet.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/rst/condorcet.rst	                        (rev 0)
+++ trunk/src/site/rst/condorcet.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,19 @@
+Condorcet method
+----------------
+
+The Condorcet method has been created by the marquis de Condorcet in XVIIIth
+century and that is aimed to find the best compromise between all the voters.
+
+According to this method, the unique winner, if it exists, is the choice tha=
t,
+compared to all the other choices one by one, is the most appreciated.
+
+This method has been created to improve the first past the post method that
+might not represent the wishes of the voters.
+
+The major inconvenient of this method it that it is possible that no winner =
can
+be designated (this is the Condorcet paradox). In this case, you have to use
+another method to solve conflicts.
+
+(Source : Wikipedia_ )
+
+.. _Wikipedia: http://en.wikipedia.org/wiki/Condorcet_method
\ No newline at end of file

Added: trunk/src/site/rst/historical.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/rst/historical.rst	                        (rev 0)
+++ trunk/src/site/rst/historical.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,20 @@
+Why Pollen is Pollen ?
+----------------------
+
+Back in the time, `Code Lutin`__ and Libre-Entreprise_ were using, for their
+consultations and internal votes, Glasnost_ software. But this one was too
+complex to use and was abandonned.
+
+After lots of search between existing solutions, it have been showed that th=
ey
+were, too simple, or too complex, or proprietary. So the `Code Lutin`__ comp=
any took
+in charge the development of a new software, under GPL license, allowing to
+realize quickly simple of complex consultations for the different organisati=
ons
+it is part of and for its own needs. Pollen was born.
+
+Pollen is actually used for the internal needs of `Code Lutin`__ : vote for =
new
+projects names, logos, company decisons, ... for Libre-Entreprise_ : vote of=
 the
+members for the different decisions of the group.
+
+__ http://www.codelutin.com
+.. _Libre-Entreprise: http://www.libre-entreprise.org
+.. _Glasnost: http://glasnost.entrouvert.org
\ No newline at end of file

Added: trunk/src/site/rst/methods.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/rst/methods.rst	                        (rev 0)
+++ trunk/src/site/rst/methods.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,14 @@
+Pollen's votecounting methods
+-----------------------------
+
+Pollen allows you to chose between several votecounting methods for
+consultations.
+Each method has its pros and cons.
+
+ * Condorcet_ method
+ * Percentage_ method
+ * Approval_ voting
+
+.. _Condorcet: condorcet.html
+.. _Percentage: percentage.html
+.. _Approval: approval.html
\ No newline at end of file

Added: trunk/src/site/rst/percentage.rst
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/rst/percentage.rst	                        (rev 0)
+++ trunk/src/site/rst/percentage.rst	2009-12-29 15:44:14 UTC (rev 2831)
@@ -0,0 +1,7 @@
+Vote by percentage
+------------------
+
+Each voter has 100 points to distribute between the choices (so the percenta=
ge).
+The choice that has the greater number of points is declared winner.
+
+This votecounting method has the main advantage of inciting sincere vote.

Modified: trunk/src/site/site_en.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/site_en.xml	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/src/site/site_en.xml	2009-12-29 15:44:14 UTC (rev 2831)
@@ -36,6 +36,11 @@
             <item name=3D"User" href=3D"user.html">
                 <item name=3D"Install" href=3D"install.html"/>
                 <item name=3D"Tutorial" href=3D"tutoriel.html"/>
+                <item name=3D"Votecounting methods" href=3D"methods.html">
+                    <item name=3D"Percentage" href=3D"percentage.html"/>
+                    <item name=3D"Condorcet" href=3D"condorcet.html"/>
+                    <item name=3D"Approval" href=3D"approval.html"/>
+                </item>
             </item>
=20
             <item name=3D"Developer" href=3D"developer.html">
@@ -47,6 +52,8 @@
                     <item name=3D"UI" href=3D"ui.html"/>
                 </item>
             </item>
+
+            <item name=3D"History" href=3D"historical.html"/>
         </menu>
=20
        =20

Modified: trunk/src/site/site_fr.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/site/site_fr.xml	2009-12-23 15:46:31 UTC (rev 2830)
+++ trunk/src/site/site_fr.xml	2009-12-29 15:44:14 UTC (rev 2831)
@@ -35,6 +35,11 @@
             <item name=3D"Utilisateur" href=3D"user.html">
                 <item name=3D"Installation" href=3D"install.html"/>
                 <item name=3D"Tutoriel" href=3D"tutoriel.html"/>
+                <item name=3D"Types de d=C3=A9pouillement" href=3D"depouille=
ment.html">
+                    <item name=3D"Pourcentage" href=3D"pourcentage.html"/>
+                    <item name=3D"Condorcet" href=3D"condorcet.html"/>
+                    <item name=3D"Assentiment" href=3D"assentiment.html"/>
+                </item>
             </item>
=20
             <item name=3D"D=C3=A9veloppeur" href=3D"developer.html">
@@ -46,6 +51,8 @@
                     <item name=3D"UI" href=3D"ui.html"/>
                 </item>
             </item>
+
+            <item name=3D"Historique" href=3D"historique.html"/>
         </menu>
=20
         <menu name =3D"T=C3=A9l=C3=A9chargement">


--===============7481227903609685302==--


