Index: standard/src/main/webapp/templates/renameStep1.vm
===================================================================
--- standard/src/main/webapp/templates/renameStep1.vm	(revision 22772)
+++ standard/src/main/webapp/templates/renameStep1.vm	(working copy)
@@ -51,6 +51,22 @@
       #end
     #end
   #end
+  #set($children = $doc.getChildren())
+  #if($children.size() > 0)
+    <h2><span>$msg.get("core.rename.title.updateChildren")</span></h2>
+    #foreach($child in $children)
+      #if(!$xwiki.hasAccessLevel("edit", $context.user, $child))
+        #set ($alink = "<a href='$xwiki.getURL($child)' target='_blank' style='color: #999;'>$child</a>")
+        <div><input type="checkbox" disabled="disabled"/> $alink</div>
+      #elseif($xwiki.getDocument($backlink).isProgrammaticContent())
+        #set ($alink = "<a href='$xwiki.getURL($child)' target='_blank' style='color: #900;'>$child</a>")
+        <div><input type="checkbox" name="child_$child"/> $alink</div>
+      #else
+        #set ($alink = "<a href='$xwiki.getURL($child)' target='_blank'>$child</a>")
+        <div><input type="checkbox" name="child_$child" checked="checked"/> $alink</div>
+      #end
+    #end
+  #end
   <div class="padded">
     <span class="buttonwrapper"><input class="button" type="submit" name="formactioncancel" value="$msg.get("cancel")" onclick="document.forms[0].action='$doc.getURL("view")'; if (document.forms[0].onsubmit) document.forms[0].onsubmit();"/></span>
     <span class="buttonwrapper"><input class="button" type="submit" name="formactionrename" value="$msg.get("core.rename.submit")" onclick="document.forms[0].action='$doc.getURL("view", "xpage=rename&amp;step=2")'; if (document.forms[0].onsubmit) document.forms[0].onsubmit();"/></span>
Index: standard/src/main/webapp/templates/rename.vm
===================================================================
--- standard/src/main/webapp/templates/rename.vm	(revision 22772)
+++ standard/src/main/webapp/templates/rename.vm	(working copy)
@@ -42,9 +42,12 @@
         #template('renameStep1.vm')
       #else
         #set($renamedBLs = $util.arrayList)
+        #set($children = $util.arrayList)
         #foreach($param in $request.parameterNames)
           #if($param.startsWith("backlink_"))
             #set($discard = $renamedBLs.add($param.substring(9)))
+          #elseif($param.startsWith("child_"))
+            #set($discard = $children.add($param.substring(6)))
           #end
         #end
 
@@ -52,7 +55,7 @@
         ## doc points to the new name!
         #set ($oldDocName = $doc.fullName)
 
-        $doc.rename($newFullName, $renamedBLs)
+        $doc.rename($newFullName, $renamedBLs, $children)
 
         #xwikimessageboxstart("$msg.get('notice')" "$msg.get('core.rename.success', [$oldDocName, $doc.fullName, $xwiki.getURL($doc.fullName)])")
         #xwikimessageboxend()
@@ -61,4 +64,4 @@
 <div class="clearfloats"></div>
 </div>## main
 #template("endpage.vm")
-#end
\ No newline at end of file
+#end