luci-0.10: Merge r7384

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 1083a1618848510f163bb3a054f7a3783a45ea1f..372fa5971da2ef61ab5af189fbf819af8ca7ef63 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -78,6 +78,11 @@ $Id$
                                        ))
                                end
                        %></li>
+                       <li><% if keepconfig then %>
+                               <%:Configuration files will be kept.%>
+                       <% else %>
+                               <%:Note: Configuration files will be erased.%>
+                       <% end %></li>
                </ul>
        </p>
        <div class="cbi-page-actions right">