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, 8 insertions, 5 deletions

diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt
index 641e3a3..fa95012 100644
--- a/docs/_build/html/_sources/administration.txt
+++ b/docs/_build/html/_sources/administration.txt
@@ -6,7 +6,7 @@ Administration
 ==============
 
 :Author: Étienne Loks
-:date: 2012-10-08
+:date: 2012-11-28
 :Copyright: CC-BY 3.0
 
 This document presents the administration of Chimère.
@@ -130,6 +130,8 @@ basic color it can be set with the English name (for instance: *red*, *blue*,
 The element type is the type of element the subcategory can contain: POI, route
 or both.
 
+.. _geographic-items-management:
+
 Edition/moderation of items
 ---------------------------
 
@@ -155,11 +157,12 @@ There is a some actions available in the action list.
 To modify an item, classically you have to click on his name.
 Then you access to a form to freely modify the item.
 In this form there is all data available to the end user form plus some extra
-fields. The *Import fields* only make sense with data imported from an external
+fields.
+- The *Import fields* only make sense with data imported from an external
 source or for data to be exported to OSM cf. to the :ref:`import section
-<importing>` of this documentation. *Associated items fields* are read only
-fields that list items associated to the current one (reference item of an
-amendment, associated file of a route).
+<importing>` of this documentation.
+- *Associated items fields* are read only fields that list items associated to
+the current one (reference item of an amendment, associated file of a route).
 
 Associated multimedia items are at the bottom of the form. You can freely add,
 change items and change their order with drag and drop.