diff --git a/.gitignore b/.gitignore
index 6c3dc3ec0e..2f4d7b2aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,18 +3,21 @@ IMG/artoff*
 IMG/arton*
 IMG/autoff*
 IMG/auton*
+IMG/bin
 IMG/breveoff*
 IMG/breveon*
 IMG/cache-*
 IMG/jpg
 IMG/motoff*
 IMG/moton*
+IMG/pdf
 IMG/png
 IMG/ruboff*
 IMG/rubon*
 IMG/siteoff*
 IMG/siteon*
 IMG/test_*
+IMG/txt
 config/*.php
 config/.htaccess
 ecrire/inc_connect.php3
diff --git a/ecrire/inc/documenter.php b/ecrire/inc/documenter.php
index f0cd112cf1..cc8a78fa7e 100644
--- a/ecrire/inc/documenter.php
+++ b/ecrire/inc/documenter.php
@@ -44,11 +44,14 @@ function inc_documenter_dist(
 	// On passe &$tous dans la boucle pour verifier si on a bien
 	// le droit de supprimer tous les documents
 	$tous = (count($docs) > 3);
-	$res = documenter_boucle($docs, $type, $ancre, $tous, $appelant, $opt);
-	$s = ($ancre =='documents' ? '': '-');
-
-	if (is_int($doc))
+	if (preg_match('/_edit$/', _request('script'))) {
+	  $res = " ";
+	} else {
+	  $res = documenter_boucle($docs, $type, $ancre, $tous, $appelant, $opt);
+	  if (is_int($doc))
 		$res = documenter_bloc($doc, $res, $s, $appelant, $ancre, $tous, $type);
+	}
+	$s = ($ancre =='documents' ? '': '-');
 	return ajax_action_greffe("documenter", "$s$doc", $res);
 }
 
diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php
index 5617df6fc3..92ec614424 100644
--- a/ecrire/inc/documents.php
+++ b/ecrire/inc/documents.php
@@ -382,8 +382,8 @@ function afficher_case_document($id_document, $id, $script, $type, $deplier=fals
 	$ret = "";
 	if ($mode == 'document') {
 
-		$ret .= "<a id='document$id_document' name='document$id_document'></a>\n";
-		$ret .= debut_cadre_enfonce("doc-24.gif", true, "", lignes_longues(typo($cadre),20));
+		$ret .= debut_cadre_enfonce("doc-24.gif", true, "", lignes_longues(typo($cadre),20), "document$id_document");
+		$ret .= "<a name='document$id_document'></a>\n";
 
 		if ($distant == 'oui') {
 			$dist = "\n<div class='verdana1' style='float: $spip_lang_right; text-align: $spip_lang_right;'>";
@@ -451,7 +451,7 @@ function afficher_case_document($id_document, $id, $script, $type, $deplier=fals
 	// Afficher une image inserable dans l'article
 	//
 	
-		$ret .= debut_cadre_relief("image-24.gif", true, "", lignes_longues(typo($cadre),20));
+	  $ret .= debut_cadre_relief("image-24.gif", true, "", lignes_longues(typo($cadre),20), "document$id_document");
 
 		//
 		// Afficher un apercu (pour les images)
diff --git a/ecrire/inc/legender.php b/ecrire/inc/legender.php
index 7d340266d2..9acb107e30 100644
--- a/ecrire/inc/legender.php
+++ b/ecrire/inc/legender.php
@@ -131,7 +131,7 @@ function inc_legender_dist($id_document, $document, $script, $type, $id, $ancre,
 	$s = ($ancre =='documents' ? '': '-');
 
 	if (preg_match('/_edit$/', $script)) {
-		$action = redirige_action_auteur('documenter', "$s$id/$type/$id_document", $script, "id_$type=$id&type=$type&s=$s#$ancre");
+		$action = ajax_action_auteur('documenter', "$s$id/$type/$id_document", $script, "id_$type=$id&type=$type&s=$s#$ancre", array($texte), '', 'function() {jQuery(this).remove()}');
 	}
 	else {
 		if (test_espace_prive())