diff --git a/ChangeLog b/ChangeLog
index c1f101b65a..d9348d3065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lib/reLyX/acinclude.m4 (RELYX_CHECK_ERRORS): remove useless message.
+
+	* lib/configure.m4 (latex_to_html_command): avoid spaces around =
+	for variable assignment.
+
+2000-11-07 Rob Lahaye <lahaye@postech.edu>
+
+	* src/lib/ui/default.ui: added sub/superscripts to menu as
+	Insert->Special characters  and  cleaned-up the file a bit
+
 2000-11-07  Allan Rae  <rae@lyx.org>
 
 	* src/frontends/xforms/FormPreferences.C (feedback): make sure
diff --git a/lib/configure b/lib/configure
index f97358fd9b..c6d83d0db8 100755
--- a/lib/configure
+++ b/lib/configure
@@ -995,7 +995,7 @@ if test -z "$TOHTML" ; then
   TOHTML=none
 fi
 
-latex_to_html_command = $TOHTML
+latex_to_html_command=$TOHTML
 case $TOHTML in
 	tth) latex_to_html_command="tth -t -e2 -L\$\$BaseName < \$\$FName > \$\$OutName";;
  latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$FName";;
diff --git a/lib/configure.m4 b/lib/configure.m4
index d6b3b88400..22b2ba5cf7 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -308,7 +308,7 @@ case $LPR in
 esac
 
 SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea)
-latex_to_html_command = $TOHTML
+latex_to_html_command=$TOHTML
 case $TOHTML in
 	tth) latex_to_html_command="tth -t -e2 -L\$\$BaseName < \$\$FName > \$\$OutName";;
  latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$FName";;
diff --git a/lib/reLyX/acinclude.m4 b/lib/reLyX/acinclude.m4
index c694681a20..be15785219 100644
--- a/lib/reLyX/acinclude.m4
+++ b/lib/reLyX/acinclude.m4
@@ -1,6 +1,5 @@
 dnl Usage: RELYX_WARNING(message)  Displays the warning "message" and sets
-the
-dnl flag lyx_warning to yes.
+dnl the flag lyx_warning to yes.
 AC_DEFUN(RELYX_WARNING,[
 relyx_warning_txt="$relyx_warning_txt
 == $1
@@ -90,10 +89,5 @@ cat <<EOF
 $relyx_warning_txt
 EOF
 fi
-cat <<EOF
-Configuration of LyX was successful.  
-Type 'make' to compile the program, 
-and then 'make install' to install it.
-EOF
 fi])
 
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index f88364c6f7..bf34d925d3 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -7,7 +7,7 @@ Menuset
 
     Menubar "main_nobuffer"
 	Submenu "File|F" "file_nobuffer"
-        Submenu "Edit|E" "edit_nobuffer"
+	Submenu "Edit|E" "edit_nobuffer"
 	Submenu "Help|H" "help"
     End
 
@@ -16,8 +16,8 @@ Menuset
 	Submenu "Edit|E" "edit"
 	Submenu "Insert|I" "insert"
 	Submenu "Layout|L" "layout"
-        Submenu "View|V" "view"
-        Submenu "Navigate|N" "navigate"
+	Submenu "View|V" "view"
+	Submenu "Navigate|N" "navigate"
 	Submenu "Documents|D" "documents"
 	Submenu "Help|H" "help"
     End
@@ -29,7 +29,8 @@ Menuset
 	Item "New...|N" "buffer-new"
 	Item "New from template...|t" "buffer-new-template"
 	Item "Open...|O" "buffer-open"
-	Submenu "Import|I" "fileimport"
+	Separator
+	Submenu "Import|I" "file_import"
 	Separator
 	Item "Exit|x" "lyx-quit"
 	Separator
@@ -47,10 +48,10 @@ Menuset
 	Item "Revert to saved|R" "buffer-reload"
 	Submenu "Version control|V" "file_vc"
 	Separator
-	Submenu "Import|m" "fileimport"
-        Submenu "Insert|I" "fileinsert"
+	Submenu "Import|m" "file_import"
+	Submenu "Insert|I" "file_insert"
 	Separator
-	Submenu "Export|E" "exportfile"
+	Submenu "Export|E" "file_export"
 	Item "Print...|P" "buffer-print"
 	Item "Fax...|F" "buffer-export fax"
 	Separator
@@ -59,13 +60,22 @@ Menuset
 	Lastfiles
     End
 
-    Menu "fileimport"
+    Menu "file_vc"
+	OptItem "Register|R" "vc-register"
+	OptItem "Check In Changes|I" "vc-check-in"
+	OptItem "Check Out for Edit|O" "vc-check-out"
+	OptItem "Revert to last version|l" "vc-revert"
+	OptItem "Undo last check in|U" "vc-undo-last"
+	OptItem "Show History|H" "vc-history"
+    End
+
+    Menu "file_import"
 	Item "Ascii text as lines...|A" "buffer-import text"
 	Item "Ascii text as paragraphs...|p" "buffer-import textparagraph"
 	ImportFormats
     End
 
-    Menu "fileinsert"
+    Menu "file_insert"
 	Item "File...|F" "buffer-child-insert"
 	Item "LyX file...|X" "file-insert"
 	Item "Ascii as lines...|l" "file-insert-ascii lines"
@@ -74,16 +84,7 @@ Menuset
     End
 
 
-    Menu "file_vc"
-	OptItem "Register|R" "vc-register"
-        OptItem "Check In Changes|I" "vc-check-in"
-	OptItem "Check Out for Edit|O" "vc-check-out"
-	OptItem "Revert to last version|l" "vc-revert"
-	OptItem "Undo last check in|U" "vc-undo-last"
-	OptItem "Show History|H" "vc-history"
-    End
-
-    Menu "exportfile"
+    Menu "file_export"
 	ExportFormats
     End
 
@@ -91,8 +92,8 @@ Menuset
 # EDIT MENU
 #
     Menu "edit_nobuffer"
-	Item "Reconfigure|R"    "reconfigure"
 	Item "Preferences...|P" "dialog-preferences"
+	Item "Reconfigure|R" "reconfigure"
     End
 
     Menu "edit"
@@ -103,14 +104,14 @@ Menuset
 	Item "Copy|o" "copy"
 	Item "Paste|P" "paste"
 	Submenu "Paste external selection|x" "edit_paste"
-        Separator
+	Separator
 	Item "Find & Replace...|F" "find-replace"
-        Separator
+	Separator
 	Submenu "Floats & Insets|I" "edit_floats"
 	Submenu "Tabular|T" "edit_tabular"
 	Item "Spellchecker...|S" "spellchecker"
 	Item "Check TeX|h" "buffer-chktex"
-        Separator
+	Separator
 	Item "Preferences...|e" "dialog-preferences"
 	Item "Reconfigure|g" "reconfigure"
     End
@@ -123,16 +124,16 @@ Menuset
     Menu "edit_floats"
 	Item "Open/Close|O" "open-stuff"
 	Item "Melt|M" "melt"
-        Item "Open All Footnotes/Margin Notes|A" "floats-operate openfoot"
-        Item "Close All Footnotes/Margin Notes|C" "floats-operate closefoot"
-        Item "Open All Figures/Tables|F" "floats-operate openfig"
-        Item "Close All Figures/Tables|T" "floats-operate closefig"
+	Item "Open All Footnotes/Margin Notes|A" "floats-operate openfoot"
+	Item "Close All Footnotes/Margin Notes|C" "floats-operate closefoot"
+	Item "Open All Figures/Tables|F" "floats-operate openfig"
+	Item "Close All Figures/Tables|T" "floats-operate closefig"
 	Separator
-        Item "Remove all Error Boxes|R" "error-remove-all"
+	Item "Remove all Error Boxes|R" "error-remove-all"
     End
 
     Menu "edit_tabular"
-    	Item "Multicolumn|M" "tabular-feature multicolumn"
+	Item "Multicolumn|M" "tabular-feature multicolumn"
 	Separator
 	Item "Line Top|T" "tabular-feature toggle-line-top"
 	Item "Line Bottom|B" "tabular-feature toggle-line-bottom"
@@ -161,7 +162,7 @@ Menuset
 	Item "Math text|M" "math-mode"
 	Item "Math Display|D" "math-display"
 	Item "Math Panel...|P" "math-panel"
-        Separator
+	Separator
 	Submenu "Special character|S" "insert_special"
 	Item "Citation reference...|C" "citation-insert"
 	Item "Cross reference...|r" "reference-insert"
@@ -176,10 +177,23 @@ Menuset
 	Item "Figure...|g" "figure-insert"
 	Item "Tabular...|T" "dialog-tabular-insert"
 	Submenu "Floats|a" "insert_floats"
-        Separator
+	Separator
 	Submenu "Lists & TOC|i" "insert_toc"
     End
 
+    Menu "insert_special"
+	Item "Subscript|S" "math-insert _"
+	Item "Superscript|u" "math-insert ^"
+	Item "HFill|H" "hfill-insert"
+	Item "Hyphenation point|p" "hyphenation-point-insert"
+	Item "Protected blank|b" "protected-space-insert"
+	Item "Linebreak|L" "break-line"
+	Item "Ellipsis|i" "dots-insert"
+	Item "End of sentence|E" "end-of-sentence-period-insert"
+	Item "Ordinary Quote|Q" "quote-insert"
+	Item "Menu Separator|M" "menu-separator-insert"
+    End
+
     Menu "insert_floats"
 	Item "Figure float|F" "buffer-float-insert figure"
 	Item "Table float|T" "buffer-float-insert table"
@@ -198,17 +212,6 @@ Menuset
 	Item "BibTeX reference...|B" "bibtex-insert"
     End
 
-    Menu "insert_special"
-	Item "HFill|H" "hfill-insert"
-	Item "Hyphenation point|p" "hyphenation-point-insert"
-	Item "Protected blank|b" "protected-space-insert"
-	Item "Linebreak|L" "break-line"
-	Item "Ellipsis|i" "dots-insert"
-	Item "End of sentence|E" "end-of-sentence-period-insert"
-	Item "Ordinary Quote|Q" "quote-insert"
-	Item "Menu Separator|M" "menu-separator-insert"
-    End
-
 #
 # LAYOUT MENU
 #
@@ -222,7 +225,7 @@ Menuset
 	Item "Noun Style|N" "font-noun"
 	Item "Bold Style|B" "font-bold"
 	Item "TeX Style|X" "tex-mode"
-        Separator
+	Separator
 	Item "Change environment depth|v" "depth-increment"
 	Item "LaTeX preamble...|L" "layout-preamble"
 	Item "Toggle Appendix|A" "appendix"
@@ -237,8 +240,8 @@ Menuset
     Menu "view"
 	ViewFormats
 	OptItem "Build program|B" "build-program"
-        Submenu "Update|U" "update"
-        Separator
+	Submenu "Update|U" "update"
+	Separator
 	Item "LaTeX log file|L" "latex-view-log"
 	Item "Table of Contents|T" "toc-view"
     End
@@ -251,10 +254,10 @@ Menuset
 # NAVIGATE MENU
 #
     Menu "navigate"
-        Item "Error|E" "error-next"
+	Item "Error|E" "error-next"
 	Item "Note|N" "note-next"
-        Separator
-        Toc
+	Separator
+	Toc
     End
 
     Menu "documents"
@@ -272,7 +275,7 @@ Menuset
 	Item "Table of contents|a" "help-open TOC"
 	Item "Known Bugs|K" "help-open BUGS"
 	Item "LaTeX Configuration|L" "help-open LaTeXConfig"
-        Separator
+	Separator
 	Item "Copyright and Warranty...|o" "help-copyright"
 	Item "Credits...|e" "help-credits"
 	Item "Version...|V" "help-version"
@@ -314,13 +317,13 @@ Toolbar
     Icon "font-noun"
     Icon "font-free"
     Separator
+    Icon "tex-mode"
+    Icon "math-mode"
+    Separator
     Icon "footnote-insert"
     Icon "marginpar-insert"
     Icon "depth-next"
     Separator
-    Icon "tex-mode"
-    Icon "math-mode"
-    Separator
     Icon "figure-insert"
     Icon "dialog-tabular-insert"
 End