Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimere

Conflicts:
	docs/_build/html/administration.html
	docs/_build/html/customisation.html
	docs/_build/html/import_export.html
	docs/_build/html/searchindex.js

1 files changed, 1 insertions, 1 deletions

diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
index 4019dfe..15f7cce 100644
--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{all:[1,3,6],code:[0,1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:[0,6,3],follow:[1,6,4],feedpars:[1,4],row:3,categori:[2,6,3],hold:6,depend:[2,1,4],zone:4,readabl:[6,4],base_url:[],send:4,easiest:0,init:4,program:[],visitor:[2,1],sens:3,town:[],sourc:[2,1,3,4],string:[1,4],createsuperus:6,relev:[3,4],administr:[0,2,3,4,5,6],button:[6,3],list:[3,4],geograph:[6,3,4],item:[2,6,3],quick:[],initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,second:3,design:[0,2],download:4,further:1,myusernam:4,click:[6,3],blue:3,index:[],appear:3,compar:[],section:[6,3],multimedia:[6,3],abl:6,beautifulsoup:4,access:[6,3],delet:[6,3],version:[0,1,2,3,4,5,6],"new":[0,1,2,3,4,6],net:[1,4],celeri:[1,4],chose:[],createdb:4,french:4,"005k":1,witch:6,address:[],path:[6,3,4],modifi:[0,6,3,4],sinc:4,interpret:[],leav:[],box:[6,3],search:3,epsg_project:[],larger:0,step:[1,3,6],prior:[],permit:[6,3],action:3,chang:[0,1,3,6,4],chanc:6,environn:1,chimere_tag:1,prerequisit:[2,4],extra:[0,3],father:[],modul:[],apt:[1,4],vim:[1,4],ask:6,authentifi:3,subcategori:[2,6,3],fake:1,marker:1,instal:[0,1,6,4,2],select:[6,3],from:[1,3,4],would:[1,4],univers:4,upgrad:[2,1],next:1,websit:[6,4],few:[6,3],handler:[],usr:[1,4],criteria:3,type:[0,6,3,4],more:[0,6,3,4],sort:[6,3],where_is_your_chimer:3,desir:4,share:4,relat:4,server_url:1,site:[2,6,3,4],phone:6,indic:[],particular:4,git:[1,4],recommand:4,unpack:4,cach:[2,1,6],must:[0,1,6,4],psql:4,account:[6,3,4],word:3,hour:6,prepar:1,work:[1,3,6],uniqu:[6,4],soup:4,paragraph:[1,6],below:4,can:[0,1,3,6,4],lc_messag:4,default_categori:[],root:4,control:6,prompt:4,tar:4,give:6,process:[1,3],sudo:[],smtp:4,templat:[0,1,4,2],tarbal:1,tag:[3,4],want:[0,6,3,4],default_cent:[],spe:[],mapnik:[0,6],lxml:[1,4],end:[0,6,3,2],freshli:3,anoth:4,perhap:1,write:[],pure:0,reject:3,verifi:1,simpl:[6,3],css:[0,6],updat:[0,1,2,3,4,5,6],map:[0,6,3],product:1,simpliest:4,rebas:1,stop:1,clone:[1,4],after:[1,3],superus:6,upload:[1,4],manuali:[],befor:[1,3],plane:1,beauti:4,pythondebug:[],mai:6,multipl:3,underscor:4,associ:[6,3],"short":4,practic:6,third:3,bind:1,bing:0,postgi:4,stash:1,django:[0,1,6,4],issu:[],inform:[6,3],environ:[1,6],allow:6,order:[6,3],oper:3,checkbox:3,creation:4,move:[1,4],becaus:[1,4],meter:1,through:[],effici:3,tinymce_url:4,still:4,mainli:[0,3],dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:[0,4],psycopg2:4,clickabl:[],better:4,window:[],restart:1,where_is_chimer:4,onc:[6,3],hidden:[6,3],main:3,extra_url:[],descend:3,them:[1,3,4],recal:[],thei:[6,3],python:[1,4],dai:6,initi:[1,6,4],framework:[2,6],facilit:3,nov:4,now:[1,3,4],vanilla:[],choic:[],name:[0,1,3,6,4],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],drop:3,refresh:1,easili:3,xvjf:4,html2text:4,each:[0,6,3],found:4,unicod:4,email_host:4,mean:[6,3],compil:[2,4],domain:6,administration_:[],replac:[3,4],jquery_url:1,hard:[],procedur:4,realli:[],backport:[1,4],forgot:[6,3],extract:4,moder:[2,6,3],special:[1,3,4],out:3,variabl:[1,6,4],tinymc:4,newli:3,semi:0,publish:1,content:[6,3],adapt:[1,4],modpython:[],ref:[],correct:[1,4],red:3,integr:1,postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[1,4],free:4,like:[1,3,6,4],reason:6,base:[6,4],put:3,org:1,"9227c9":3,mychimer:[1,6],unpredict:4,gdal:[1,4],care:[3,4],spatial_ref_si:4,could:1,pictur:6,static_url:1,keep:3,filter:3,length:[1,4],isn:3,outsid:6,root_urlconf:[1,4],south:[1,4],first:[1,3,6,4],feed:[6,4],teh:3,major:1,suffix:[],render:6,feel:4,media_root:[],number:[1,3,6,4],yourself:3,restrict:6,date:[0,1,3,4,5,6],instruct:1,alreadi:4,done:[0,1,6,4],messag:6,mydjango:4,owner:4,stabl:[1,4],installed_app:1,optionali:4,size:3,differ:[0,6],district:[],script:1,data:[1,3,4],top:[],mkdir:[1,4],system:3,least:[1,6,4],attach:3,chimere_dynamic_categori:[],master:1,conveni:3,option:1,copi:[0,1,4],install_path:4,part:4,consult:3,detail_cont:[],haven:1,png:[],rss:6,serv:[1,6],kind:0,provid:[3,4],remov:[1,3],project:[2,1,6,4],pythoninterpret:[],ressourc:6,database_password:[],browser:[2,1],favorit:4,ani:[1,4],myproject:0,packag:[1,4],properli:6,manner:[],have:[1,3,6,4],tabl:[3,4],need:[0,6,3,4],element:3,pg_version:4,plpgsql:4,engin:[],bz2:4,min:1,rout:[6,3],port:[],note:3,also:[1,3],etienn:[],take:4,which:[],default_data:4,simplifi:1,map_lay:[],sethandl:[],usernam:6,english:3,createus:4,most:[6,3,4],letter:[1,4],deploi:[],geodjango:4,icon:[1,3,6],todo:4,time_zon:4,don:[1,3,6,4],url:[1,3,6,4],doc:[],clear:3,later:[1,6],flow:[],pwd:1,inde:3,database_port:[],pythonhandl:[],propos:[6,3],fact:3,wsgi:[1,4],show:6,german:[],text:6,database_us:[],directli:[6,3],session:6,loaddata:4,permiss:[6,4],line:[1,4],staff:6,chimer:[0,1,3,6,4],current:[1,3,6],onli:[0,1,3,6,4],submit:[3,4],locat:1,just:[1,4],copyright:[0,1,3,4,5,6],explain:3,configur:[2,1,6,4],apach:[1,4],should:[1,4],theme:6,cliquabl:3,local:[1,6,4],media_url:[],contribut:[1,4],get:[2,1,4],familiar:6,your_local_nam:1,pypi:[],blank:3,wheezi:[1,4],a2ensit:4,report:1,geo:4,requir:[1,6],layout:[0,2],enabl:1,specif:4,probabl:[1,6],chimere_localnam:[1,6],reload:[6,4],common:[1,4],contain:3,where:6,explainatori:[],view:6,user:[2,1,3,6,4],set:[1,3,6,4],project_nam:4,"chim\u00e8r":[0,1,2,3,4,5,6],knowledg:1,see:[6,3],mandatori:[6,3],rc3:1,epsg_display_project:[],concern:3,jqueri:[1,4],statu:[6,3],avaibl:[],correctli:3,databas:[2,1,6,4],someth:4,cours:4,label:[6,3],state:[6,3],won:1,between:1,"import":[2,1,3,4,5,6],experi:1,email:4,accord:4,postgresql_psycopg2:[],appreci:4,kei:[0,6,4],javascript:[1,4],job:[],here:4,otherwis:[6,3],purpl:3,valid:3,addit:4,cyclemap:[0,6],both:3,last:4,easi:1,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[0,1,3,4],forgotten:6,freeli:3,login:3,com:6,database_engin:[],load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,colon:0,shortcut:3,poi:3,mapquest:[0,6],backend:[],quit:3,folow:1,come:3,due:6,empti:[],example_project:[0,1,4],json:4,valu:[1,3,4],interest:[6,3],modif:[6,3],popul:4,createlang:4,regroup:4,imag:4,understand:3,present:[0,2,3,4,5,6],"case":6,look:[6,3],amend:[2,3],secret_kei:4,properti:[2,1,3,6],harder:[],easier:6,trick:1,defin:[0,6],evolv:[],error:1,value_of_your_localnam:1,envvar:4,fixtur:4,compilemessag:[1,4],openstreetmap:[],bin:[1,4],layer:[0,6,2],customiz:6,applic:[6,3,4],chimere_hide_propertymodel:6,"\u00e9tienn":[0,1,3,4,5,6],customis:[0,1,2],destin:4,archiv:4,uncom:4,conf:4,mod:4,sever:1,gone:[],develop:3,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[1,3,6],exchang:[],same:[6,3,4],member:6,html:[0,3],changepassword:6,compat:0,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,4],logic:0,effect:3,solut:4,moment:[],auth:6,mani:[1,3,6],extern:[6,3],posgi:[],recent:3,pwprompt:4,task:6,off:[],center:[],chimere_app_path:[1,6],entri:3,well:[0,4],exampl:[6,4],thi:[0,1,3,4,5,6],choos:4,model:[2,1,6],self:3,left:[],explan:[],identifi:[6,3],execut:1,mypassword:[],obtain:4,activ:[1,6,4],insid:[6,3],sampl:[1,4],human:6,touch:[1,4],flavor:6,yet:1,languag:[0,4,2],web:[0,1,6,2],expos:3,particulari:[],"53k":4,littl:6,apache2:4,identif:3,add:[0,1,3,6],setenv:[],simplejson:[1,4],appli:[1,3,6],save:3,explanatori:3,match:[],kombu:1,real:3,libj:[1,4],format:3,read:3,piec:6,database_nam:[],password:[6,3],apart:[],linux:[1,4],insert:[],template_context_processor:[],lost:1,mychimere_project:4,unidecod:4,property_i_j:[],zoom:6,staticfil:1,server:[1,6,4],edit:[2,1,3,4],api:0,necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[0,6,3,2],two:6,encount:4,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,visibl:3,some:[0,1,3,4],begin:[1,4],revel:[],"export":[2,3,5],language_cod:4,home:[],transport:[0,6],distribut:4,lead:3,confirm:3,definit:[],per:6,whole:[],libapache2:4,jquery_js_url:4,larg:4,proj:4,slash:3,three:3,localhost:[],refer:[0,3,4],core:[],plu:3,previou:1,run:1,bold:3,chimere_default_cent:[],usag:6,host:[],squeez:[1,4],repositori:[1,4],wget:4,trustworthi:6,sub:3,postgresql:4,chimere_restricted_ext:[],column:3,eventuali:[],manag:[0,1,2,3,4,6],srv:[1,6],stand:4,discard:3,backup:1,disabl:[6,3],own:6,addus:4,additionn:[],pythonpath:[],submitt:3,encod:4,bound:6,automat:6,appropri:[0,6,4],been:[0,1,3,4,5,6],contrib:[1,4],openlay:0,your:[0,1,3,6,4],libgeo:4,accordingli:4,mod_python:[],lwpostgi:[],wai:[0,4],area:[0,6,2],lok:[0,1,3,4,5,6],secret:4,"long":6,custom:[0,6,4,2],avail:[0,1,3,6,4],interfac:6,"var":[1,4],submiss:[],treat:3,"function":6,chimere_path:[1,6],local_set:[1,6,4],form:[6,3],forc:[2,1],ascend:3,basic:[1,3,6],back:3,your_chimere_path:1,collectstat:[1,4],link:[0,3],translat:[2,1,4],pyexiv2:[1,4],cryptograph:4,"true":6,congratul:4,pull:1,made:[0,1,3],utf:4,possibl:[6,3],"default":[0,1,6,4],checkout:[1,4],chimere_default_categori:[],displai:[6,3],rc2:[],ratatouil:[],makemessag:4,limit:6,"static":[1,4],problem:[1,4],urn:6,crosstrack:1,rvb:3,root_path:[],aerial:0,creat:[2,1,3,6,4],classic:3,parser:4,"char":4,exist:4,dgango:[],file:[0,1,3,6,4],syncdb:[1,4],chimere_default_zoom:[],check:[6,3,4],fill:[],echo:4,encrypt:4,automaticali:[],titl:3,when:[6,3],detail:[0,6,3],gettext:4,field:[1,3,6,4],old:1,other:6,librari:4,branch:[1,4],chimere_admin_01:[],test:1,you:[0,1,3,6,4],draw:[6,3],repeat:1,peacefrog:[1,4],symbol:[],drag:[6,3],database_host:[],log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longer:[],migrate_properti:1,directori:[0,1,4],bottom:3,descript:[1,6,4],rule:[1,4],chown:[1,4],time:[6,4]},objtypes:{},titles:["Chim\u00e8re customisation","Upgrade","Welcome to Chim\u00e8re’s documentation!","Administration","Installation","Chim\u00e8re import/export","Configuration"],objnames:{},filenames:["customisation","upgrade","index","administration","install","import_export","configuration"]})
\ No newline at end of file
+Search.setIndex({objects:{},terms:{all:[2,1],code:[0,1],forget:1,yellow:1,osm:[0,1,2],abil:2,row:1,categori:[3,1,2],depend:[3,2],xapi:2,specif:2,cach:3,sens:1,sourc:[3,1,2],django:0,mechan:2,veri:2,relev:[2,1],administr:[0,1,2,3],button:[2,1],list:[2,1],geograph:[2,1],"try":2,item:[3,1,2],initialis:3,teh:1,sync:2,second:1,design:[0,2,3],click:1,append:2,blue:1,what:2,appear:1,section:1,multimedia:1,overload:2,current:1,delet:[2,1],version:[0,1,2,3],"new":[0,1,2,3],here:2,georss:2,modif:1,address:2,path:1,modifi:[0,1],valu:[2,1],box:[2,1],search:1,larger:0,permit:[2,1],action:[2,1],chang:[0,1,2],extra:[0,1],appli:1,put:[2,1],api:[0,2],subcategori:[3,1,2],visibl:[2,1],instal:[0,3],select:[2,1],from:[2,1],zip:2,two:2,few:1,criteria:1,type:[0,1,2],more:[0,1,2],sort:1,where_is_your_chimer:1,desir:2,site:[3,1],warn:2,templat:[0,3],given:2,easiest:0,must:0,account:[2,1],word:1,sometim:2,work:1,uniqu:2,can:[0,1,2],meet:2,process:[2,1],accept:2,tag:[2,1],want:[0,1,2],mapnik:0,alwai:2,end:[0,1,3],freshli:1,pure:0,reject:1,instead:2,csv:2,simpl:[2,1],css:0,updat:[0,1,2,3],map:[0,1,2],mess:2,after:[2,1],befor:[2,1],date:[0,1,2],multipl:1,associ:[2,1],third:1,bing:0,explicit:2,element:1,issu:2,inform:[2,1],order:[2,1],origin:2,checkbox:[2,1],help:2,becaus:2,mainli:[0,1],style:0,fit:0,platform:2,pend:2,hidden:1,main:[2,1],them:[2,1],thei:1,handi:2,framework:3,facilit:[2,1],now:1,choic:2,document:[0,1,2,3],name:[0,1,2],edit:[3,1],drop:1,refresh:2,easili:[2,1],localis:2,each:[0,1,2],mean:1,compil:3,recommend:2,replac:1,realli:2,forgot:1,http:1,special:1,out:1,newli:[2,1],content:[2,1],print:2,got:2,correct:2,red:1,insid:1,migrat:3,differ:0,standard:2,base:2,ask:2,"9227c9":1,care:[2,1],launch:2,could:2,keep:[2,1],filter:[2,1],isn:1,geometri:2,think:2,first:[2,1],oper:1,directli:[2,1],onc:[2,1],number:1,yourself:1,done:[0,2],blank:1,size:1,guess:2,data:[2,1],licens:2,system:1,messag:2,attach:1,conveni:[2,1],"final":2,store:2,copi:0,consult:1,kind:0,provid:[2,1],remov:1,project:[3,2],browser:3,latitud:2,beforehand:2,ani:2,myproject:0,have:[2,1],tabl:1,need:[0,1,2],seem:2,"null":2,self:1,note:[2,1],also:1,compat:0,sure:2,trace:2,normal:2,usernam:2,object:2,most:1,why:2,sub:1,don:[2,1],url:[2,1],clear:1,inde:1,determin:2,databas:[3,2],came:2,visitor:3,particularli:2,find:2,chimer:[0,1,2],access:1,onli:[0,1,2],layout:[0,3],copyright:[0,1,2],explain:1,configur:3,should:2,cliquabl:1,folder:2,local:2,hit:2,get:[3,2],regularli:2,cannot:2,requir:2,common:2,contain:1,where:2,set:[2,1],"chim\u00e8r":[0,1,2,3],see:[2,1],mandatori:[2,1],arg:2,concern:[2,1],statu:1,correctli:1,vari:2,label:1,state:[2,1],between:2,"import":[3,1,2],experi:2,kei:[0,2],purpl:1,cyclemap:0,both:1,shapefil:2,admin:1,instanc:[0,1,2],logic:0,freeli:1,login:1,color:1,header:1,colon:0,poi:1,mapquest:[0,2],duplic:2,quit:1,coupl:2,come:1,three:1,empti:2,example_project:0,treat:[2,1],interest:1,basic:1,convert:2,understand:1,present:[0,1,2,3],"case":2,look:1,amend:[3,1],properti:[3,1,2],defin:[0,2],abov:2,error:2,openstreetmap:2,layer:[0,3],kmlz:2,"\u00e9tienn":[0,1,2],customis:[0,3],develop:1,welcom:3,author:[0,1,2],make:[2,1],same:[2,1],read:1,html:[0,1],descend:1,eventu:2,wgs84:2,webserv:3,effect:1,user:[3,1],mani:1,extern:1,robust:2,recent:1,appropri:[0,2],moder:[3,1],choos:2,entri:1,well:0,non:2,thi:[0,1,2],english:1,model:3,rout:1,propos:1,identifi:[2,1],distant:2,yet:2,languag:[0,3],web:[0,2,3],expos:1,shortcut:1,identif:1,add:[0,1,2],valid:[2,1],save:1,explanatori:1,real:1,applic:1,format:[2,1],preserv:2,password:[2,1],like:1,semi:0,server:2,authentifi:1,resiz:1,page:[0,1,2,3],right:1,some:[0,1,2],back:1,"export":[3,1,2],transport:0,lead:1,confirm:1,kml:2,proj:2,slash:1,refer:[0,1],plu:1,bold:1,step:1,prerequisit:3,srid:2,column:[2,1],manag:[0,1,2,3],discard:1,disabl:[2,1],effici:1,submitt:1,bound:2,automat:2,upgrad:3,been:[0,1,2],openlay:0,mark:2,your:[0,1,2],w3c:2,log:1,wai:[0,2],area:[0,2,3],lok:[0,1,2],submit:1,custom:[0,3],avail:[0,1,2],icon:1,form:[2,1],forc:3,ascend:1,regard:2,link:[0,1,2],translat:3,made:[0,1],possibl:[2,1],"default":[0,2],displai:1,otherwis:1,problem:2,rvb:1,featur:2,aerial:0,creat:[3,1,2],classic:[2,1],exist:2,file:[0,1,2],check:[2,1],fill:2,titl:1,when:[2,1],detail:[0,1,2],field:[2,1],other:2,test:2,you:[0,1,2],node:2,draw:[2,1],drag:1,longitud:2,directori:0,bottom:1,fact:[2,1]},objtypes:{},titles:["Customisation","Administration","Import/export","Welcome to Chim\u00e8re’s documentation!"],objnames:{},filenames:["customisation","administration","import_export","index"]})
\ No newline at end of file