diff --git a/ChangeLog b/ChangeLog
index 67949178c..617d83674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-17  Pavel Roskin  <proski@gnu.org>
+
+	* doc/mc.sgml: made compatible with sgml-tools 1.0.9
+	* doc/linuxdoc-sgml.diff: removed
+	* doc/Makefile.in: don't distribute linuxdoc-sgml.diff,
+	distribute gnome.sgml
+
 2000-08-15  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.in: fixes for improper usage of $(srcdir), cleanup
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5eef4f60c..ad252e9c5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -8,7 +8,7 @@ rootdir = $(srcdir)/..
 # Distribution variables
 #
 
-DISTDOC =	Makefile.in LSM DEVEL FILES mc.sgml linuxdoc-sgml.diff \
+DISTDOC =	Makefile.in LSM DEVEL FILES mc.sgml gnome.sgml \
 		mc.1.in mcedit.1.in mcserv.8.in
 LINUXDOCDIR =	/usr/local/linuxdoc-sgml
 
diff --git a/doc/linuxdoc-sgml.diff b/doc/linuxdoc-sgml.diff
deleted file mode 100644
index b84eef855..000000000
--- a/doc/linuxdoc-sgml.diff
+++ /dev/null
@@ -1,814 +0,0 @@
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/bin/format linuxdoc-sgml/bin/format
---- /home/jj/src/mc-old/linuxdoc-sgml/bin/format	Sun Sep 17 23:34:49 1995
-+++ linuxdoc-sgml/bin/format	Mon Sep 18 23:00:26 1995
-@@ -134,6 +134,16 @@
- 		$SGMLS | $SGMLSASP $USERREP $REP | expand $TABS | \
- 			mkinfo $SGMLFILE
- 	;;
-+	texi)
-+		# format the document, writing to standard out
-+		TYPE=info
-+		SGML_PATH=$REPDIR/$TYPE/%N:$SGML_PATH
-+		REP=$REPDIR/$TYPE/mapping;
-+
-+		sed 's/\@/\@\@/g' $SGMLFILE | \
-+		$SGMLS | $SGMLSASP $USERREP $REP | expand $TABS | \
-+			mkinfo $SGMLFILE -texi
-+	;;
- 	*)
- 		# format the document, writing to standard out
- 		REP=$REPDIR/$TYPE/mapping;
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/bin/mkinfo linuxdoc-sgml/bin/mkinfo
---- /home/jj/src/mc-old/linuxdoc-sgml/bin/mkinfo	Thu Aug 24 20:24:19 1995
-+++ linuxdoc-sgml/bin/mkinfo	Mon Sep 18 22:43:43 1995
-@@ -171,7 +171,11 @@
-    }
- }
- ' $TMP > $TMP2
-+if test -n "$2"; then
-+cat $TMP2
-+else
- $MAKEINFO $TMP2 -o $INFO
-+fi
- 
- rm -f $TMP $TMP2
- # end of mkinfo script 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/dtd/linuxdoc.dtd linuxdoc-sgml/dtd/linuxdoc.dtd
---- /home/jj/src/mc-old/linuxdoc-sgml/dtd/linuxdoc.dtd	Sun Jun 18 21:02:42 1995
-+++ linuxdoc-sgml/dtd/linuxdoc.dtd	Fri Sep 22 16:34:38 1995
-@@ -8,7 +8,7 @@
- 
- <!-- url added by HG; htmlurl added by esr -->
- <!entity % xref
--	" label|ref|pageref|cite|url|htmlurl|ncite " >
-+	" label|ref|lnk|pageref|cite|url|htmlurl|ncite " >
- 
- <!entity % inline 
- 	" (#pcdata | f| x| %emph; |sq| %xref | %index )* " >
-@@ -138,7 +138,7 @@
-       "^" circ
-       "{" lcub
-       "}" rcub
--      "|" verbar>
-+      "|" verbar >
- -->
- 
- <!element figure - - ((eps | ph ), caption?)>
-@@ -257,7 +257,7 @@
-       "^" circ
-       "{" lcub
-       "}" rcub
--      "|" verbar>
-+      "|" verbar >
- 
- <!usemap   fmap     f >
- 
-@@ -274,7 +274,7 @@
-       "^" circ
-       "{" lcub
-       "}" rcub
--      "|" verbar>
-+      "|" verbar >
- 
- <!usemap dmmap (dm,eq)>
- <!element  fr       - - (nu,de) >
-@@ -312,7 +312,7 @@
-       "%" percnt
-       "^" circ
-       "{" lcub
--      "}" rcub >
-+      "}" rcub  >
- 
- <!usemap   arrmap   ar >
- <!element  sup      - - ((%fbutxt;)*) -(tu) >
-@@ -350,7 +350,7 @@
-       "^" circ
-       "{" lcub
-       "}" rcub
--      "|" verbar>
-+      "|" verbar >
- 
- <!usemap global linuxdoc>
- <!element label - o empty>
-@@ -362,6 +362,12 @@
-         id cdata #required
-         name cdata "&refnam">
- 
-+<!-- lnk -->
-+<!element lnk - o empty>
-+<!attlist lnk   
-+        id cdata #required
-+        name cdata "&refnam">
-+
- <!-- url entity added to have direct url references HG -->
- <!element url - o empty>
- <!attlist url   
-@@ -405,7 +411,14 @@
-         opts cdata "null">
- 
- <!-- Hacked by mdw, abstract now part of titlepag -->
--<!element titlepag o o (title, author, date?, abstract?)>
-+<!element titlepag o o (mantitle?, title, author, date?, abstract?)>
-+<!element mantitle - o empty>
-+<!attlist mantitle   
-+        title cdata ""
-+        sectnum cdata "1"
-+	date cdata "1 January 1995"
-+	name cdata "">
-+
- <!element title - o (%inline, subtitle?) +(newline)>
- <!element subtitle - o (%inline)>
- <!usemap oneline titlepag>
-@@ -532,7 +545,7 @@
-       "^" circ
-       "{" lcub
-       "}" rcub
--      "|" verbar>
-+      "|" verbar >
- 
- <!usemap manpage  manpage >
- <!-- end of linuxdoc dtd -->
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/lib/linuxdoc-sgml.sty linuxdoc-sgml/lib/linuxdoc-sgml.sty
---- /home/jj/src/mc-old/linuxdoc-sgml/lib/linuxdoc-sgml.sty	Tue Jun  7 21:13:36 1994
-+++ linuxdoc-sgml/lib/linuxdoc-sgml.sty	Mon Sep 18 23:22:36 1995
-@@ -69,7 +69,8 @@
- \noindent
- {\huge\sf \@title}\\
- \rule{\textwidth}{1mm}\\
--\mbox{} \@author\ \hfill \@date\ \\
-+\mbox{} \@author\ \\
-+\mbox{} \@date\ \\
- \vskip 1 ex
- \noindent{\sf \@abstract}
- \setcounter{footnote}{0}%
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/grops/general linuxdoc-sgml/rep/grops/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/grops/general	Tue Jun  7 21:13:44 1994
-+++ linuxdoc-sgml/rep/grops/general	Fri Sep 22 23:43:44 1995
-@@ -88,6 +88,9 @@
- <!entity commat sdata "\(at" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\\" >
-+<!entity bslshd sdata "\\" >
-+<!entity bslshv sdata "\\" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "{" >
- <!entity verbar sdata "\(ba" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/grops/mapping linuxdoc-sgml/rep/grops/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/grops/mapping	Tue Jun  7 21:13:44 1994
-+++ linuxdoc-sgml/rep/grops/mapping	Fri Sep 22 23:57:42 1995
-@@ -562,6 +562,9 @@
- 
- <ps>		+	".LP\np.s."
- 
-+<url>			"[URL]"
-+</url>
-+
- 
- % end of roff replacement file
- 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/general linuxdoc-sgml/rep/hlp/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/general	Thu Jan  1 01:00:00 1970
-+++ linuxdoc-sgml/rep/hlp/general	Fri Sep 22 23:43:59 1995
-@@ -0,0 +1,114 @@
-+
-+<!-- hlp translation for general purpose qwertz characters.  If I
-+was unable to think of an intuitive ASCII representation for some
-+symbol or character, I just used its SGML representation. -->
-+
-+
-+<!entity AElig sdata "AE" >
-+<!entity Aacute sdata "A" >
-+<!entity Acirc sdata "A" >
-+<!entity Agrave sdata "A" >
-+<!entity Atilde sdata "A" >
-+<!entity Ccedil sdata "C" >
-+<!entity Eacute sdata "E" >
-+<!entity Egrave sdata "E" >
-+<!entity Euml sdata "E" >
-+<!entity Iacute sdata "I" >
-+<!entity Icirc sdata "I" >
-+<!entity Igrave sdata "I" >
-+<!entity Iuml sdata "I" >
-+<!entity Ntilde sdata "N" >
-+<!entity Oacute sdata "O" >
-+<!entity Ocirc sdata "O" >
-+<!entity Ograve sdata "O" >
-+<!entity Oslash sdata "O" >
-+<!entity Uacute sdata "U" >
-+<!entity Ugrave sdata "U" >
-+<!entity Yacute sdata "Y" >
-+<!entity aacute sdata "a" >
-+<!entity acirc sdata "a" >
-+<!entity aelig sdata "ae" >
-+<!entity agrave sdata "a" >
-+<!entity aring sdata "a" >
-+<!entity atilde sdata "a" >
-+<!entity ccedil sdata "c" >
-+<!entity eacute sdata "e" >
-+<!entity ecirc sdata "e" >
-+<!entity egrave sdata "e" >
-+<!entity euml sdata "e" >
-+<!entity iacute sdata "i" >
-+<!entity icirc sdata "i" >
-+<!entity igrave sdata "i" >
-+<!entity iuml sdata "i" >
-+<!entity ntilde sdata "n" >
-+<!entity oacute sdata "o" >
-+<!entity ocirc sdata "o" >
-+<!entity ograve sdata "o" >
-+<!entity oslash sdata "o" >
-+<!entity otilde sdata "o" >
-+<!entity uacute sdata "u" >
-+<!entity ucirc sdata "u" >
-+<!entity ugrave sdata "u" >
-+<!entity yacute sdata "y" >
-+<!entity yuml sdata "y" >
-+<!entity lt sdata "<" >
-+<!entity amp sdata "&" >
-+<!entity ero sdata "&" >
-+<!entity etago sdata "</" >
-+<!entity dquot sdata '"' >
-+<!entity num sdata "#" >
-+<!entity percnt sdata "%" >
-+<!entity quot sdata "'" >
-+<!entity lpar sdata "(" >
-+<!entity rpar sdata ")" >
-+<!entity ast sdata "*" >
-+<!entity plus sdata "+" >
-+<!entity comma sdata "," >
-+<!entity hyphen sdata "-" >
-+<!entity colon sdata ":" >
-+<!entity semi sdata ";" >
-+<!entity equals sdata "=" >
-+<!entity commat sdata "@" >
-+<!entity lsqb sdata "[" >
-+<!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\" >
-+<!entity bslshd sdata "\" >
-+<!entity bslshv sdata "\" >
-+<!entity circ sdata "^" >
-+<!entity lowbar sdata "_" >
-+<!entity lcub sdata "{" >
-+<!entity verbar sdata "|" >
-+<!entity rcub sdata "}" >
-+<!entity tilde sdata "~" >
-+<!entity bsol sdata "\e" >
-+<!entity dollar sdata "$" >
-+<!entity nbsp sdata " " >
-+<!entity emsp sdata " " >
-+<!entity ensp sdata " " >
-+<!entity thinsp sdata " " >
-+<!entity mdash sdata "--" >
-+<!entity ndash sdata "-" >
-+<!entity hellip sdata "..." >
-+<!entity Auml sdata "Ae" >
-+<!entity auml sdata "ae" >
-+<!entity Ouml sdata "Oe" >
-+<!entity ouml sdata "oe" >
-+<!entity Uuml sdata "Ue" >
-+<!entity uuml sdata "ue" >
-+<!entity szlig sdata "ss" >
-+<!entity gt sdata ">" >
-+<!entity sect sdata "&sect " >
-+<!entity para sdata "&para " >
-+<!entity copy sdata "&copy " >
-+<!entity iexcl sdata "&iexcl " >
-+<!entity iquest sdata "&iquest " >
-+<!entity cent sdata "&cent " >
-+<!entity pound sdata "&pound " >
-+<!entity bull sdata "-" >
-+<!entity times sdata "*" >
-+<!entity plusmn sdata "+-" >
-+<!entity divide sdata "/" >
-+<!entity mu sdata "u" >
-+<!entity not sdata "~" >
-+<!entity refnam sdata "">
-+<!entity urlnam sdata "">
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/mapping linuxdoc-sgml/rep/hlp/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/mapping	Thu Jan  1 01:00:00 1970
-+++ linuxdoc-sgml/rep/hlp/mapping	Thu Sep 21 23:04:06 1995
-@@ -0,0 +1,95 @@
-+
-+
-+% qwertz manual replacement file
-+% produces GNU Midnight Commander's hlp format
-+
-+<article>
-+</article>
-+
-+<title>		+	"\""
-+</title>
-+<author>	+	"\""
-+</author>
-+<date>		+	"\""
-+</date>
-+
-+<sect>		+	"\["
-+</sect>
-+<sect1>		+	"\[  "
-+</sect1>
-+<sect2>		+	"\[    "
-+</sect2>
-+<sect3>		+	"\[      "
-+</sect3>
-+<sect4>		+	"\[        "
-+</sect4>
-+<sect5>		+	"\[          "
-+</sect5>
-+
-+<heading>	
-+</heading>		"\n\n"
-+
-+<p>		+	"\n"		+
-+</p>	
-+
-+
-+<enum>			"7"
-+</enum>			"1\n\n"
-+<itemize>		"7"
-+</itemize>		"1\n\n"
-+<descrip>		"7"
-+</descrip>		"1\n\n"
-+
-+% number register bi means "begin item".  Used in the .P macro to print
-+% bullets or numbers at beginning of first paragraph of an item.
-+% If bi=1 then the paragraph is the first one of the item.
-+
-+<item>			"\n4\n\no  7"		
-+</item>	
-+
-+<tag>			"\n4\n\n"
-+</tag>			"/7"
-+
-+<sq>			""
-+</sq>			""	
-+
-+<lq>			""
-+</lq>		
-+
-+<em>			""			
-+</em>		 	""			
-+
-+<bf>			""			
-+</bf>			""			
-+
-+<it>			""			
-+</it>			""		
-+
-+<sf>			""		
-+</sf>			""			
-+
-+<sl>			""		
-+</sl>			""			
-+
-+<tt>			""
-+</tt>			""
-+
-+
-+<comment>	+	""		+
-+</comment>	+	""			+
-+
-+<x>
-+</x>
-+
-+% within code and verb, first turn off the escape mechanism
-+
-+<code>		+	"\nv"
-+</code>		+	"n"
-+<verb>		+	"\nv"
-+</verb>		+	"n"
-+<lnk>		+	"
[NAME][ID]"
-+</lnk>
-+<ref>		+	"
[NAME][ID]"
-+</ref>
-+<url>		+	"[URL]"
-+</url>
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/math linuxdoc-sgml/rep/hlp/math
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/hlp/math	Thu Jan  1 01:00:00 1970
-+++ linuxdoc-sgml/rep/hlp/math	Tue Jun  7 21:13:42 1994
-@@ -0,0 +1,114 @@
-+<!--
-+
-+Math symbols and Greek letters.  Sed script for groff Also adds the
-+"delim $$" declaration to the top of the file. Thus it is now
-+unnecessary to pipe the ms file through eqn (or geqn) unless the
-+file file contain formulas.
-+
-+1i\
-+.EQ\
-+delim $$\
-+.EN
-+-->
-+
-+<!entity circ sdata '{type "binary" \(ha}' >
-+<!entity le sdata '{type "relation" \(<=}' >
-+<!entity ge sdata '{type "relation" \(>=}' >
-+<!entity congr sdata '{type "relation" \(=~}' >
-+<!entity notin sdata '{type "relation" \(nm}' >
-+<!entity nequiv sdata "\*[nequiv]" >
-+<!entity divide sdata '{type "binary" \(di}' >
-+<!entity cir sdata '{type "binary" \(ci}' >
-+<!entity dot sdata '{type "binary" \(md}' >
-+<!entity larr sdata '{type "relation" \(<-}' >
-+<!entity rarr sdata '{type "relation" \(->}' >
-+<!entity uarr sdata '{type "relation" \(ua}' >
-+<!entity darr sdata '{type "relation" \(da}' >
-+<!entity equiv sdata '{type "relation" \(==}' >
-+<!entity ap sdata '{type "relation" \(~~}' >
-+<!entity cap sdata '{type "binary" \(ca}' >
-+<!entity cup sdata '{type "binary" \(cu}' >
-+<!entity sub sdata '{type "relation" \(sb}' >
-+<!entity sup sdata '{type "relation" \(sp}' >
-+<!entity isin sdata '{type "relation" \(mo}' >
-+<!entity sube sdata '{type "relation" \(ib}' >
-+<!entity supe sdata '{type "relation" \(ip}' >
-+<!entity not sdata "\(no" >
-+<!entity infin sdata "\(if" >
-+<!entity minus sdata "-" >
-+<!entity ne sdata '{type "relation" \(!=}' >
-+<!entity prop sdata "\(pt" >
-+<!entity prime sdata "\(fm" >
-+<!entity Prime sdata "\(sd" >
-+<!entity empty sdata "\(es" >
-+<!entity oplus sdata '{type "binary" \(c+}' >
-+<!entity otimes sdata '{type "binary" \(c*}' >
-+<!entity setmn sdata '{type "binary" \(rs}' >
-+<!entity mid sdata '{type "binary" \(br}' >
-+<!entity nsub sdata '\*[nsub]' >
-+<!entity nsube sdata '\*[nsube]' >
-+<!entity nsup sdata '\*[nsup]' >
-+<!entity nsupe sdata '\*[nsupe]' >
-+<!entity harr sdata '{type "relation" \(<>}' >
-+<!entity and sdata '{type "relation" \(AN}' >
-+<!entity or sdata '{type "relation" \(OR}' >
-+<!entity bottom sdata "\(pp" >
-+<!entity exist sdata "\(te" >
-+<!entity forall sdata "\(fa" >
-+<!entity hArr sdata '{type "relation" \(hA}' >
-+<!entity lArr sdata '{type "relation" \(lA}' >
-+<!entity rArr sdata '{type "relation" \(rA}' >
-+<!entity vDash sdata '{type "relation" "\z\(br="}' >
-+<!entity nvDash sdata '\*[nvDash]' >
-+<!entity nvdash sdata '\*[nvdash]' >
-+<!entity vdash sdata '{type "relation" "\z\(br\(en"}' >
-+<!entity lang sdata '{type "opening" \(la}' >
-+<!entity rang sdata '{type "closing" \(ra}' >
-+<!entity uArr sdata '{type "relation" \(uA}' >
-+<!entity dArr sdata '{type "relation" \(dA}' >
-+<!entity square sdata "\(sq" >
-+<!entity aleph sdata "\(Ah" >
-+<!entity image sdata "\(Im" >
-+<!entity real sdata "\(Re" >
-+<!entity part sdata "\(pd" >
-+<!entity nabla sdata "\(gr" >
-+<!entity clubs sdata "\(CL" >
-+<!entity hearts sdata "\(HE" >
-+<!entity diams sdata "\(DI" >
-+<!entity spades sdata "\(SP" >
-+<!entity ang sdata " \(/_ " >
-+<!entity alpha sdata " alpha " >
-+<!entity beta sdata " beta " >
-+<!entity gamma sdata " gamma " >
-+<!entity Gamma sdata " GAMMA " >
-+<!entity delta sdata " delta " >
-+<!entity Delta sdata " DELTA " >
-+<!entity epsi sdata " epsilon " >
-+<!entity zeta sdata " zeta " >
-+<!entity eta sdata " eta " >
-+<!entity thetas sdata " theta " >
-+<!entity Theta sdata " THETA " >
-+<!entity iota sdata " iota " >
-+<!entity kappa sdata " kappa " >
-+<!entity lambda sdata " lambda " >
-+<!entity mu sdata "\(*m" >
-+<!entity nu sdata " nu " >
-+<!entity xi sdata " xi " >
-+<!entity Xi sdata " XI " >
-+<!entity pi sdata " pi " >
-+<!entity Pi sdata " PI " >
-+<!entity rho sdata " rho " >
-+<!entity sigma sdata " sigma " >
-+<!entity sigmav sdata "\(ts" >
-+<!entity Sigma sdata " SIGMA " >
-+<!entity tau sdata " tau " >
-+<!entity upsi sdata " upsilon " >
-+<!entity Upsi sdata " UPSILON " >
-+<!entity phis sdata " phi " >
-+<!entity Phi sdata " PHI " >
-+<!entity chi sdata " chi " >
-+<!entity psi sdata " psi " >
-+<!entity Psi sdata " PSI " >
-+<!entity omega sdata " omega " >
-+<!entity Omega sdata " OMEGA " >
-+
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/html/general linuxdoc-sgml/rep/html/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/html/general	Tue Aug 15 06:15:35 1995
-+++ linuxdoc-sgml/rep/html/general	Fri Sep 22 23:44:19 1995
-@@ -66,7 +66,10 @@
- <!entity commat sdata "&commat;" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
--<!entity circ sdata "&circ;" >
-+<!entity bslsh sdata "\" >
-+<!entity bslshd sdata "\" >
-+<!entity bslshv sdata "\" >
-+<!entity circ sdata "^" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "{" >
- <!entity verbar sdata "|" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/html/mapping linuxdoc-sgml/rep/html/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/html/mapping	Wed Aug 16 04:36:12 1995
-+++ linuxdoc-sgml/rep/html/mapping	Sun Sep 17 22:48:50 1995
-@@ -171,6 +171,11 @@
- 			"<@@endref>"		+
- </ref>
- 
-+<lnk>		+	"<@@ref>[ID]\n"
-+			"[NAME] </a>\n"
-+			"<@@endref>"		+
-+</lnk>
-+
- <href>		+	"<@@ref>[ID]"		+
- </href>
- 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/info/general linuxdoc-sgml/rep/info/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/info/general	Sun Jun 25 04:13:41 1995
-+++ linuxdoc-sgml/rep/info/general	Fri Sep 22 23:44:34 1995
-@@ -69,6 +69,9 @@
- <!entity commat sdata "@@" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\" >
-+<!entity bslshd sdata "\" >
-+<!entity bslshv sdata "\" >
- <!entity circ sdata "^" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "@{" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/info/mapping linuxdoc-sgml/rep/info/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/info/mapping	Sun Jun 25 04:13:41 1995
-+++ linuxdoc-sgml/rep/info/mapping	Fri Sep 22 23:58:20 1995
-@@ -166,6 +166,9 @@
- <ref>		+	"@REF [ID]"
- </ref>
- 
-+<lnk>		+	"[NAME]\n@REF [ID]"
-+</lnk>
-+
- <pageref>		"@REF [ID]"
- </pageref>
- 
-@@ -330,6 +333,9 @@
- 
- <hline>		+	"\\hline"	+
- </hline>
-+
-+<url>			"[URL]"
-+</url>
- 
- % end of texinfo replacement file
- 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/latex/general linuxdoc-sgml/rep/latex/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/latex/general	Tue Aug 15 06:13:56 1995
-+++ linuxdoc-sgml/rep/latex/general	Fri Sep 22 23:44:54 1995
-@@ -67,6 +67,9 @@
- <!entity commat sdata "@" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "$\backslash$" >
-+<!entity bslshd sdata "$\backslash$" >
-+<!entity bslshv sdata "\" >
- <!entity circ sdata "\verb+^+" >
- <!entity lowbar sdata "\_" >
- <!entity lcub sdata "\{" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/latex/mapping linuxdoc-sgml/rep/latex/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/latex/mapping	Sun Jun 25 05:42:46 1995
-+++ linuxdoc-sgml/rep/latex/mapping	Mon Sep 18 23:15:50 1995
-@@ -71,7 +71,7 @@
- <inst>			" \\\\\n\\\\" 	+
- </inst>
- 
--<date>		+	"\\date{"
-+<date>		+	"\n\n\\date{"
- </date>			"}"		  +
- 
- <newline>		"\\\\ "		  
-@@ -201,6 +201,9 @@
- 
- <ref>			"\\ref{[ID]}"
- </ref>
-+
-+<lnk>			"[NAME] (see \\ref{[ID]})"
-+</lnk>
- 
- <pageref>		"\\pageref{[ID]}"
- </pageref>
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/latin1/general linuxdoc-sgml/rep/latin1/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/latin1/general	Tue Jun  7 21:13:40 1994
-+++ linuxdoc-sgml/rep/latin1/general	Fri Sep 22 23:45:09 1995
-@@ -66,6 +66,9 @@
- <!entity commat sdata "@" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\\" >
-+<!entity bslshd sdata "\\\\" >
-+<!entity bslshv sdata "\\" >
- <!entity circ sdata "^" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "{" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/latin1/mapping linuxdoc-sgml/rep/latin1/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/latin1/mapping	Tue Jun  7 21:13:41 1994
-+++ linuxdoc-sgml/rep/latin1/mapping	Fri Sep 22 23:58:51 1995
-@@ -541,6 +541,9 @@
- 
- <ps>		+	".LP\np.s."
- 
-+<url>			"[URL]"
-+</url>
-+
- 
- % end of roff replacement file
- 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/man/general linuxdoc-sgml/rep/man/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/man/general	Sun Aug  6 22:00:58 1995
-+++ linuxdoc-sgml/rep/man/general	Fri Sep 22 23:45:23 1995
-@@ -71,6 +71,9 @@
- <!entity commat sdata "@" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\\" >
-+<!entity bslshd sdata "\\\\" >
-+<!entity bslshv sdata "\\" >
- <!entity circ sdata "^" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "{" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/man/mapping linuxdoc-sgml/rep/man/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/man/mapping	Thu Jul 13 18:57:50 1995
-+++ linuxdoc-sgml/rep/man/mapping	Fri Sep 22 23:59:07 1995
-@@ -3,12 +3,13 @@
- % qwertz manual replacement file
- % produces nroff using the man macros
- 
-+<mantitle>	+	".TH [TITLE] [SECTNUM] \"[DATE]\"\n.SH NAME\n[NAME]\n"
- 
--<manpage>	+	".if n .ds Q \\&\"\n"
-+
-+<article>	+	".if n .ds Q \\&\"\n"
- 			".if t .ds Q ``\n"
- 			".if n .ds U \\&\"\n"
- 			".if t .ds U ''\n"	
--			".TH [TITLE] [SECTNUM] \n" 
- 
- 			% James Clark's trick to prevent unintended paragraph
- 			% breaks
-@@ -56,10 +57,27 @@
- ".\\}\n"
- "..\n"	
- 
--</manpage>
-+</article>
-+
-+<title>		+	".\\\""
-+</title>
-+<author>	+	".\\\""
-+</author>
-+<date>		+	".\\\""
-+</date>
- 
-+<sect>		+	".SH "
-+</sect>
- <sect1>		+	".SH "
- </sect1>
-+<sect2>		+	".SH "
-+</sect2>
-+<sect3>		+	".SH "
-+</sect3>
-+<sect4>		+	".SH "
-+</sect4>
-+<sect5>		+	".SH "
-+</sect5>
- 
- <heading>	
- </heading>		"\n\n"
-@@ -154,4 +172,11 @@
- 			".ft P\n"
- 			".sp"	+
- 
-+<lnk>		+	"[NAME]"
-+</lnk>
-+
-+<ref>		+	"[NAME]"
-+</ref>
- 
-+<url>		+	"[URL]"
-+</url>
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/max/general linuxdoc-sgml/rep/max/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/max/general	Tue Jun  7 21:13:39 1994
-+++ linuxdoc-sgml/rep/max/general	Fri Sep 22 23:45:39 1995
-@@ -66,6 +66,9 @@
- <!entity commat sdata "&commat;" >
- <!entity lsqb sdata "&lsqb;" >
- <!entity rsqb sdata "&rsqb;" >
-+<!entity bslsh sdata "&bslsh;" >
-+<!entity bslshd sdata "&bslshd;" >
-+<!entity bslshv sdata "&bslshv;" >
- <!entity circ sdata "&circ;" >
- <!entity lowbar sdata "&lowbar;" >
- <!entity lcub sdata "&lcub;" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/max/mapping linuxdoc-sgml/rep/max/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/max/mapping	Tue Jun  7 21:13:38 1994
-+++ linuxdoc-sgml/rep/max/mapping	Fri Sep 22 23:59:46 1995
-@@ -10,6 +10,9 @@
- <article>	+ 	"<ARTICLE OPTS=\"[OPTS]\">"	+
- </article>	+	"</ARTICLE>"	+
- 
-+<mantitle>	+	"<MANTITLE TITLE=\"[TITLE]\" SECTNUM=\"[SECTNUM]\" DATE=\"[DATE]\" NAME=\"[NAME]\""
-+</mantitle>
-+
- <report>	+ 	"<REPORT OPTS=\"[OPTS]\">"	+
- </report>	+	"</REPORT>"		+
- 
-@@ -385,6 +388,9 @@
- 
- <ps>		+	"<PS>"		+
- </ps>		+	"</PS>"		+
-+
-+<url>			"<URL>"
-+</url>			"</URL>"
- 
- 
- % end of max replacement file 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/mgm/mapping linuxdoc-sgml/rep/mgm/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/mgm/mapping	Tue Jun  7 21:13:37 1994
-+++ linuxdoc-sgml/rep/mgm/mapping	Sat Sep 23 00:00:06 1995
-@@ -517,6 +517,9 @@
- 
- <ps>		+	".P 0\np.s."
- 
-+<url>			"[URL]"
-+</url>
-+
- 
- % end of roff replacement file
- 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/min/general linuxdoc-sgml/rep/min/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/min/general	Tue Jun  7 21:13:40 1994
-+++ linuxdoc-sgml/rep/min/general	Fri Sep 22 23:45:56 1995
-@@ -66,6 +66,9 @@
- <!entity commat sdata "&commat;" >
- <!entity lsqb sdata "&lsqb;" >
- <!entity rsqb sdata "&rsqb;" >
-+<!entity bslsh sdata "&bslsh;" >
-+<!entity bslshd sdata "&bslshd;" >
-+<!entity bslshv sdata "&bslshv;" >
- <!entity circ sdata "&circ;" >
- <!entity lowbar sdata "&lowbar;" >
- <!entity lcub sdata "&lcub;" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/min/mapping linuxdoc-sgml/rep/min/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/min/mapping	Tue Jun  7 21:13:39 1994
-+++ linuxdoc-sgml/rep/min/mapping	Sat Sep 23 00:00:28 1995
-@@ -11,6 +11,9 @@
- <article>	+ 	"<article opts=\"[opts]\">"	+
- </article>	+	"</article>"	+
- 
-+<mantitle>	+	"<mantitle title=\"[title]\" sectnum=\"[sectnum]\" date=\"[date]\" name=\"[name]\""
-+</mantitle>
-+
- <report>	+ 	"<report opts=\"[opts]\">"	+
- </report>	+	"</report>"		+
- 
-@@ -385,6 +388,9 @@
- 
- <ps>		+	"<ps>"		+
- </ps>		+	""		+
-+
-+<url>			"[URL]"
-+</url>
- 
- 
- % end of min replacement file 
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/nroff/general linuxdoc-sgml/rep/nroff/general
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/nroff/general	Tue Jul 18 04:51:59 1995
-+++ linuxdoc-sgml/rep/nroff/general	Sat Sep 23 00:01:38 1995
-@@ -72,6 +72,9 @@
- <!entity commat sdata "@" >
- <!entity lsqb sdata "[" >
- <!entity rsqb sdata "]" >
-+<!entity bslsh sdata "\\" >
-+<!entity bslshd sdata "\\\\" >
-+<!entity bslshv sdata "\" >
- <!entity circ sdata "^" >
- <!entity lowbar sdata "_" >
- <!entity lcub sdata "{" >
-diff -u -r -N /home/jj/src/mc-old/linuxdoc-sgml/rep/nroff/mapping linuxdoc-sgml/rep/nroff/mapping
---- /home/jj/src/mc-old/linuxdoc-sgml/rep/nroff/mapping	Sun Jun 18 18:56:03 1995
-+++ linuxdoc-sgml/rep/nroff/mapping	Sat Sep 23 00:00:48 1995
-@@ -637,5 +637,8 @@
- 
- <ps>		+	".LP\np.s."
- 
-+<url>			"[URL]"
-+</url>
-+
- 
- % end of roff replacement file
diff --git a/doc/mc.sgml b/doc/mc.sgml
index e524b321a..74c0cd4b7 100644
--- a/doc/mc.sgml
+++ b/doc/mc.sgml
@@ -2,7 +2,7 @@
 <!--
   This is Linuxdoc-sgml source for GNU Midnight Commander documentation.
   In order to compile this into different formats, you have to use
-  linuxdoc-sgml utilities by Matt Welsh with a small patch for MC's sake.
+  sgml-tools by Matt Welsh.
 
   Note for those who will write this:
   Special characters ([ ] \ < > " | $ ~ # %) bring some troubles and should
@@ -11,7 +11,7 @@
    to achieve   |  Normal use  |  Inside tag (tag, em, tt, etc.)  |  Verbatim
      [		     &lsqb;            &lsqb;                          [
      ]		     &rsqb;            &rsqb;                          ]
-     \               &bslsh;           &bslshd;                     &bslshv;
+     \               &bsol;            &bsol;                        &bsol;
      <               &lt;              &lt;                            <
      >               &gt;              &gt;                            >
      </              &etago;           &etago;                       &etago;
@@ -31,7 +31,6 @@
 
 <article>
 
-<mantitle title="mc" sectnum="1" date="30 October 1998" name="mc - Visual shell for Unix-like systems">
 <title>GNU Midnight Commander User's Guide
 <author>Written by the Midnight Commander development team <tt/mc-devel@nuclecu.unam.mx/
 <date>v 3.0, 16 September 1995
@@ -59,11 +58,11 @@ for Unix-like operating systems.
 <descrip>
 <tag/-a/ Disables the usage of graphics characters for line drawing.
 <tag/-b/ Forces black and white display.
-<tag/-c/ Force color mode, please check the section <lnk name="Colors" id="Colors"> for
+<tag/-c/ Force color mode, please check the section <ref name="Colors" id="Colors"> for
 more information.
 <tag/-C arg/ Used to specify a different color set in the
 command line. The format of arg is documented in the
-<lnk name="Colors" id="Colors"> section.
+<ref name="Colors" id="Colors"> section.
 <tag/-d/ Disables mouse support.
 <tag/-f/ Displays the compiled-in search paths for Midnight
 Commander files.
@@ -138,7 +137,7 @@ parts. Almost all of the screen space is taken up by two
 directory panels. By default, the second bottommost line
 of the screen is the shell command line, and the bottom
 line shows the function key labels. The topmost line is
-the <lnk name="menu bar line" id="Menu Bar">. The menu bar line may not be visible,
+the <ref name="menu bar line" id="Menu Bar">. The menu bar line may not be visible,
 but appears if you click the topmost line with the mouse
 or press the F9 key.
 
@@ -149,14 +148,14 @@ operations take place on the current panel. Some file
 operations like Rename and Copy by default use the
 directory of the unselected panel as a destination (don't
 worry, they always ask you for confirmation first). For
-more information, see the sections on the <lnk name="Directory
-Panels" id="Directory Panels">, the <lnk name="Left and Right Menus" id="Left and Right Menus"> and the <lnk name="File Menu" id="File Menu">.
+more information, see the sections on the <ref name="Directory
+Panels" id="Directory Panels">, the <ref name="Left and Right Menus" id="Left and Right Menus"> and the <ref name="File Menu" id="File Menu">.
 
 You can execute system commands from the Midnight
 Commander by simply typing them. Everything you type will
 appear on the shell command line, and when you press Enter
 the Midnight Commander will execute the command line you
-typed; read the <lnk name="Shell Command Line" id="Shell Command Line"> and <lnk name="Input Line Keys" id="Input Line Keys">
+typed; read the <ref name="Shell Command Line" id="Shell Command Line"> and <ref name="Input Line Keys" id="Input Line Keys">
 sections to learn more about the command line.
 
 <sect>Mouse Support<label id="Mouse Support">
@@ -175,7 +174,7 @@ state).
 
 Double-clicking on a file will try to execute the command
 if it is an executable program; and if the
-<lnk name="extension file" id="Extension File Edit">
+<ref name="extension file" id="Extension File Edit">
 has a program specified for the file's extension, the
 specified program is executed.
 
@@ -186,12 +185,12 @@ If a mouse button is clicked on the top frame line of the
 directory panel, it is scrolled one pageful backward.
 Correspondingly, a click on the bottom frame line will
 cause a scroll of one pageful forward. This frame line
-method works also in the <lnk name="Help Viewer" id="How to use help"> and the
-<lnk name="Directory Tree" id="Directory Tree">.
+method works also in the <ref name="Help Viewer" id="How to use help"> and the
+<ref name="Directory Tree" id="Directory Tree">.
 
 The default auto repeat rate for the mouse buttons is 400
 milliseconds. This may be changed to other values by
-editing the <lnk name="~/.mc/ini" id="Save Setup"> file and changing the
+editing the <ref name="~/.mc/ini" id="Save Setup"> file and changing the
 <em/mouse_repeat_rate/ parameter.
 
 If you are running the Commander with the mouse support,
@@ -221,26 +220,26 @@ approximation to the GNU Emacs editor's key bindings.
 There are many sections which tell about the keys. The
 following are the most important.
 
-The <lnk name="File Menu" id="File Menu"> section documents
+The <ref name="File Menu" id="File Menu"> section documents
 the keyboard shortcuts for the commands appearing in the File menu.
 This section
 includes the function keys. Most of these commands perform
 some action, usually on the selected file or the tagged
 files.
 
-The <lnk name="Directory Panels" id="Directory Panels">
+The <ref name="Directory Panels" id="Directory Panels">
 section documents the keys which
 select a file or tag files as a target for a later action
 (the action is usually one from the file menu).
 
-The <lnk name="Shell Command Line" id="Shell Command Line">
+The <ref name="Shell Command Line" id="Shell Command Line">
 section list the keys which are
 used for entering and editing command lines. Most of these
 copy file names and such from the directory panels to the
 command line (to avoid excessive typing) or access the
 command line history.
 
-<lnk name="Input Line Keys" id="Input Line Keys">
+<ref name="Input Line Keys" id="Input Line Keys">
 are used for editing input lines. This
 means both the command line and the input lines in the
 query dialogs.
@@ -260,13 +259,13 @@ Commander does a <bf/chdir(2)/ to the selected directory and
 reloads the information on the panel; if the selection is
 an executable file then it is executed. Finally, if the
 extension of the selected file name matches one of the
-extensions in the <lnk name="extensions file" id="Extension File Edit"> then the corresponding
+extensions in the <ref name="extensions file" id="Extension File Edit"> then the corresponding
 command is executed.
 <tag/C-l/ Repaint all the information in the Midnight
 Commander.
-<tag/C-x c/ Run the <lnk name="Chmod" id="Chmod"> command on a file or on the tagged
+<tag/C-x c/ Run the <ref name="Chmod" id="Chmod"> command on a file or on the tagged
 files.
-<tag/C-x o/ Run the <lnk name="Chown" id="Chown"> command on the current file or on the
+<tag/C-x o/ Run the <ref name="Chown" id="Chown"> command on the current file or on the
 tagged files.
 <tag/C-x l/ Run the link command.
 <tag/C-x s/ Run the symbolic link command.
@@ -275,12 +274,12 @@ the place specified in the dialog (defaults to a symlink in the other
 panel's directory), using a relative shortest possible symlink.
 <tag/C-x i/ Set the other panel display mode to information.
 <tag/C-x q/ Set the other panel display mode to quick view.
-<tag/C-x !/ Execute the <lnk name="External panelize" id="External panelize"> command.
-<tag/C-x h/ Run the <lnk name="add directory to hotlist" id="Hotlist"> command.
+<tag/C-x !/ Execute the <ref name="External panelize" id="External panelize"> command.
+<tag/C-x h/ Run the <ref name="add directory to hotlist" id="Hotlist"> command.
 <tag/M-!/ Executes the Filtered view command, described in the
-<lnk name="view command" id="Internal File Viewer">.
-<tag/M-?/ Executes the <lnk name="Find file" id="Find File"> command.
-<tag/M-c/ Pops up the <lnk name="quick cd" id="Quick cd"> dialog.
+<ref name="view command" id="Internal File Viewer">.
+<tag/M-?/ Executes the <ref name="Find file" id="Find File"> command.
+<tag/M-c/ Pops up the <ref name="quick cd" id="Quick cd"> dialog.
 <tag/C-o/ When the program is being run in the Linux or SCO console or
 under an xterm, it will show you the output of the
 previous command. When ran on the Linux console, the
@@ -301,7 +300,7 @@ suspended application.
 <p>
 This section lists the keys which operate on the directory
 panels. If you want to know how to change the appearance
-of the panels take a look at the section on <lnk name="Left and Right
+of the panels take a look at the section on <ref name="Left and Right
 Menus" id="Left and Right Menus">.
 
 <descrip>
@@ -326,8 +325,8 @@ match is searched for.
 <tag/M-t/Toggle the current display listing to show the next display listing
 mode.  With this it is possible to quickly switch from long listing
 to regular listing and the user defined listing mode.
-<tag/C-&bslshd; (control-backslash)/ Show the
-<lnk name="directory hotlist" id="Hotlist"> and change to the selected
+<tag/C-&bsol; (control-backslash)/ Show the
+<ref name="directory hotlist" id="Hotlist"> and change to the selected
 directory.
 <tag/+ (plus)/ This is used to select (tag) a group of files.
 The Midnight Commander will prompt for a regular
@@ -339,7 +338,7 @@ If <em/Shell Patterns/ is off, then the tagging of files is done with
 normal regular expressions (see <bf/ed (1)/).
 If the expression starts or ends with a slash (<tt>/</tt>), then it
 will select directories instead of files.
-<tag/&bslshd; (backslash)/ Use the "&bslsh;" key to unselect a group of
+<tag/&bsol; (backslash)/ Use the "&bsol;" key to unselect a group of
 files. This is the opposite of the Plus key.
 <tag/up-key, C-p/ Move the selection bar to the previous entry
 in the panel.
@@ -380,7 +379,7 @@ command line.
 <tag/C-Enter/ Same a M-Enter, this one only works on the Linux
 console.
 <tag/M-Tab/ Does the filename, command, variable, username and
-hostname <lnk name="completion" id="Completion"> for you.
+hostname <ref name="completion" id="Completion"> for you.
 <tag/C-x t, C-x C-t/ Copy the tagged files (or if there are no
 tagged files, the selected file) of the current panel (<tt/C-x t/) 
 or of the other panel (<tt/C-x C-t/) to the command line.
@@ -433,7 +432,7 @@ backward.
 <sect1>Input Line Keys<label id="Input Line Keys">
 
 <p>
-The input lines (they are used for the <lnk name="command line" id="Shell Command Line"> and
+The input lines (they are used for the <ref name="command line" id="Shell Command Line"> and
 for the query dialogs in the program) accept these keys:
 
 <descrip>
@@ -458,7 +457,7 @@ history. <tt/M-p/ takes you to the last entry, <tt/M-n/ takes you to
 the next one.
 <tag/M-C-h, M-Backspace/ delete one word backward.
 <tag/M-Tab/ does the filename, command, variable, username and
-hostname <lnk name="completion" id="Completion"> for you.
+hostname <ref name="completion" id="Completion"> for you.
 </descrip>
 
 <sect>Menu Bar<label id="Menu Bar">
@@ -468,13 +467,13 @@ The menu bar pops up when you press F9 or click the mouse
 on the top row of the screen. The menu bar has five menus:
 <em/Left/, <em/File/, <em/Command/, <em/Options/ and <em/Right/.
 
-The <lnk name="Left and Right Menus" id="Left and Right Menus"> allow you to modify the
+The <ref name="Left and Right Menus" id="Left and Right Menus"> allow you to modify the
 appearance of the left and right directory panels.
 
-The <lnk name="File Menu" id="File Menu"> lists the actions you can perform on the
+The <ref name="File Menu" id="File Menu"> lists the actions you can perform on the
 currently selected file or the tagged files.
 
-The <lnk name="Command Menu" id="Command Menu"> lists the actions which are more general
+The <ref name="Command Menu" id="Command Menu"> lists the actions which are more general
 and bear no relation to the currently selected file or the
 tagged files.
 
@@ -585,11 +584,11 @@ Panels may also be set to the following modes:
 <tag/Info/ The info view display information related to the
 currently selected file and if possible information about
 the current file system.
-<tag/Tree/ The tree view is quite similar to the <lnk name="directory
+<tag/Tree/ The tree view is quite similar to the <ref name="directory
 tree" id="Directory Tree"> feature. See the section about it for more
 information.
 <tag/Quick View/ In this mode, the panel will switch to a
-reduced <lnk name="viewer" id="Internal File Viewer"> that displays the contents of the
+reduced <ref name="viewer" id="Internal File Viewer"> that displays the contents of the
 currently selected file, if you select the panel (with the
 tab key or the mouse), you will have access to the usual
 viewer commands.
@@ -606,7 +605,7 @@ sort order and you may also specify if you want to sort in
 reverse order by checking the reverse box.
 
 By default directories are sorted before files but this
-can be changed from the <lnk name="Configuration" id="Configuration">
+can be changed from the <ref name="Configuration" id="Configuration">
 (option <em/"Mix all files"/).
 
 <sect2>Filter...<label id="Filter...">
@@ -625,7 +624,7 @@ The reread command reload the list of files in the
 directory. It is useful if other processes have created or
 removed files. If you have panelized file names in a panel
 this will reload the directory contents and remove the
-panelized information (See the section <lnk name="External panelize" id="External panelize">
+panelized information (See the section <ref name="External panelize" id="External panelize">
 for more information).
 
 <sect1>File Menu<label id="File Menu">
@@ -645,18 +644,18 @@ shortcuts in parentheses):
 
 <descrip>
 <tag/Help (F1)/ Invokes the built-in hypertext help viewer. Inside the
-<lnk name="help viewer" id="How to use help">, you can use the Tab key to select the next
+<ref name="help viewer" id="How to use help">, you can use the Tab key to select the next
 link and the Enter key to follow that link. The keys Space
 and Backspace are used to move forward and backward in a
 help page. Press F1 again to get the full list of accepted
 keys.
-<tag/Menu (F2)/ Invoke the <lnk name="user menu" id="Menu File Edit">.
+<tag/Menu (F2)/ Invoke the <ref name="user menu" id="Menu File Edit">.
 The user menu provides an easy way
 to provide users with a menu and add extra features to the
 Midnight Commander.
 <tag/View (F3, Shift-F3)/ View the currently selected file.
 By default this invokes
-the <lnk name="Internal File Viewer" id="Internal File Viewer"> but if the option
+the <ref name="Internal File Viewer" id="Internal File Viewer"> but if the option
 <em/Use internal view/ is off, it invokes an external file viewer specified
 by the <tt/PAGER/ environment variable. If <tt/PAGER/ is undefined,
 the <bf/view/ command is invoked. If you use <tt/Shift-F3/
@@ -668,7 +667,7 @@ the output from such command is shown in the internal file
 viewer.
 <tag/Edit (F4)/ Currently it invokes the <tt/vi/ editor, or the editor
 specified in the <tt/EDITOR/ environment variable, or the
-<lnk name="Internal File Editor" id="Internal File Editor">
+<ref name="Internal File Editor" id="Internal File Editor">
 if the use_internal_edit option is on.
 <tag/Copy (F5)/ Pop up an input dialog with destination that defaults to
 the directory in the non-selected panel and copies the
@@ -676,12 +675,12 @@ currently selected file (or the tagged files, if there is
 at least one file tagged) to the directory specified by
 the user in the input dialog. During this process, you can
 press C-c or ESC to abort the operation. For details about
-source mask (which will be usually either * or ^&bslsh;(.*&bslsh;)&dollar;
+source mask (which will be usually either * or ^&bsol;(.*&bsol;)&dollar;
 depending on setting of Use shell patterns) and possible
-wildcards in the destination see <lnk name="Mask copy/rename" id="Mask Copy/Rename">.
+wildcards in the destination see <ref name="Mask copy/rename" id="Mask Copy/Rename">.
 On some systems, it is possible to do the copy in the background by
 clicking on the background button (or pressing M-b in the dialog
-box). The <lnk name="Background Jobs" id="Background jobs"> command is
+box). The <ref name="Background Jobs" id="Background jobs"> command is
 used to control the background process.
 <tag/Link (C-x l)/ Create a hard link to the current file.
 <tag/SymLink (C-x s)/ Create a symbolic link to the current file. To those of
@@ -719,14 +718,14 @@ abort the operation. For more details look at Copy
 operation above, most of the things are quite similar.
 On some systems, it is possible to do the copy in the background by
 clicking on the background button (or pressing M-b in the dialog
-box). The <lnk name="Background Jobs" id="Background jobs"> command is
+box). The <ref name="Background Jobs" id="Background jobs"> command is
 used to control the background process.
 <tag/Mkdir (F7)/ Pop up an input dialog and creates the directory
 specified.
 <tag/Delete (F8)/ Delete the currently selected file or the tagged files in
 the currently selected panel. During the process, you can
 press <tt/C-c/ or <tt/ESC/ to abort the operation.
-<tag/Quick cd (M-c)/ Use the <lnk name="quick cd" id="Quick cd"> command if you have full
+<tag/Quick cd (M-c)/ Use the <ref name="quick cd" id="Quick cd"> command if you have full
 command line and want to cd somewhere.
 <tag/Select group (+)/ This is used to select (tag) a group of files. The
 Midnight Commander will prompt for a regular expression
@@ -738,7 +737,7 @@ then the tagging of files is done with normal regular
 expressions (see <bf/ed (1)/).
 To mark directories instead of files, the expression must
 start or end with a <tt>/</tt>.
-<tag/Unselect group (&bslshd;)/ Used for unselecting a group of files.
+<tag/Unselect group (&bsol;)/ Used for unselecting a group of files.
 This is the opposite of the <em/Select group/ command.
 <tag/Quit (F10, Shift-F10)/ Terminate the Midnight Commander.
 <tt/Shift-F10/ is used when you want to quit and you are using the shell wrapper.
@@ -751,21 +750,21 @@ at the directory where you started the Midnight Commander.
 
 <p>
 This command is useful if you have a full command line and
-want to <lnk name="cd" id="The cd internal command"> somewhere without
+want to <ref name="cd" id="The cd internal command"> somewhere without
 having to yank and paste the command line. This command pops up a
 small dialog,
 where you enter everything you would enter after <tt/cd/ on
 the command line and then you press enter. This features
-all the things that are already in the <lnk name="internal cd
+all the things that are already in the <ref name="internal cd
 command" id="The cd internal command">.
 
 <sect1>Command Menu<label id="Command Menu">
 
 <p>
-The <lnk name="Directory tree" id="Directory Tree"> command shows a tree figure of the
+The <ref name="Directory tree" id="Directory Tree"> command shows a tree figure of the
 directories.
 
-The <lnk name="Find file" id="Find File"> command allows you to search for a specific
+The <ref name="Find file" id="Find File"> command allows you to search for a specific
 file. The "Swap panels" command swaps the contents of the
 two directory panels.
 
@@ -788,17 +787,17 @@ commands. The selected command is copied to the command
 line. The command history can also be accessed by typing
 <tt/M-p/ or <tt/M-n/.
 
-The <lnk name="Directory hotlist" id="Hotlist"> (C-&bslsh;) command makes changing of the
+The <ref name="Directory hotlist" id="Hotlist"> (C-&bsol;) command makes changing of the
 current directory to often used directories faster.
 
-The <lnk name="External panelize" id="External panelize"> allows you to execute an external
+The <ref name="External panelize" id="External panelize"> allows you to execute an external
 program, and make the output of that program the contents
 of the current panel.
 
-<lnk name="Extension file edit" id="Extension File Edit"> command allows you to specify
+<ref name="Extension file edit" id="Extension File Edit"> command allows you to specify
 programs to executed when you try to execute, view, edit
 and do a bunch of other thing on files with certain
-extensions (filename endings). The <lnk name="Menu file edit" id="Menu File Edit">
+extensions (filename endings). The <ref name="Menu file edit" id="Menu File Edit">
 command may be used for editing the user menu (which
 appears by pressing <tt/F2/).
 
@@ -821,7 +820,7 @@ missing, move to its parent directory and press <tt/C-r/ (or
 
 You can use the following keys:
 
-<lnk name="General movement keys" id="General Movement Keys"> are accepted.
+<ref name="General movement keys" id="General Movement Keys"> are accepted.
 
 <descrip>
 <tag/Enter/ In the directory tree, exits the directory tree and
@@ -872,7 +871,7 @@ directory.
 </descrip>
 
 The mouse is supported. A double-click behaves like <tt/Enter/.
-See also the section on <lnk name="mouse support" id="Mouse Support">.
+See also the section on <ref name="mouse support" id="Mouse Support">.
 
 <sect2>Find File<label id="Find File">
 
@@ -880,12 +879,12 @@ See also the section on <lnk name="mouse support" id="Mouse Support">.
 The Find File feature first asks for the start directory
 for the search and the filename to be searched for. By
 pressing the Tree button you can select the start
-directory from the <lnk name="directory tree" id="Directory Tree"> figure. 
+directory from the <ref name="directory tree" id="Directory Tree"> figure. 
 
 The contents field accepts regular expressions similar to egrep(1). That
 means you have to escape characters with a special meaning to egrep with
-"&bslsh;", e.g. if you search for "strcmp (" you will have to input 
-"strcmp &bslsh;(" (without the double quotes).
+"&bsol;", e.g. if you search for "strcmp (" you will have to input 
+"strcmp &bsol;(" (without the double quotes).
 
 You can start the search by pressing the Ok button. During the search you 
 can stop from the Stop button and continue from the Start button.
@@ -916,7 +915,7 @@ example:
 find_ignore_dirs=/cdrom:/nfs/wuarchive:/afs
 </verb></tscreen>
 
-You may consider using the <lnk name="External panelize" id="External panelize"> command
+You may consider using the <ref name="External panelize" id="External panelize"> command
 instead. <bf/Find file command/ is for simple queries only,
 while using <bf/External panelize/ you can do as mysterious
 searches as you would like.
@@ -974,7 +973,7 @@ for a label for the directory.
 
 This makes cd to often used directories faster. You may also
 consider using the <tt/CDPATH/ variable as described in
-<lnk name="internal cd command" id="The cd internal command"> description.
+<ref name="internal cd command" id="The cd internal command"> description.
 
 <sect2>Extension File Edit<label id="Extension File Edit">
 
@@ -1017,7 +1016,7 @@ extension dependent pop-up menu). <em/Icon/ name is reserved
 for future use by mc.
 
 <tt/command/ is any one-line shell command, with the simple
-<lnk name="macro substitution" id="Macro Substitution">.
+<ref name="macro substitution" id="Macro Substitution">.
 
 Target are evaluated from top to bottom (order is thus
 important). If some actions are missing, search continues
@@ -1057,7 +1056,7 @@ directory (usually <tt>/usr/tmp</tt>) and then that file is
 executed. This allows the user to put normal shell
 constructs in the menus. Also simple macro substitution
 takes place before executing the menu code. For more
-information, see <lnk name="macro substitution" id="Macro Substitution">.
+information, see <ref name="macro substitution" id="Macro Substitution">.
 
 Here is a sample mc.menu file:
 
@@ -1199,27 +1198,27 @@ off in several dialogs which are accessible from this menu. Options
 are enabled if they have an asterisk or "x" in front of them. 
 
 <p>
-The <lnk name="Configuration" id="Configuration"> command pops up a dialog from which you
+The <ref name="Configuration" id="Configuration"> command pops up a dialog from which you
 can change most of settings of the Midnight Commander.
 
-The <lnk name="Display bits" id="Display bits"> command pops up a dialog from which you
+The <ref name="Display bits" id="Display bits"> command pops up a dialog from which you
 may select which characters is your terminal able to
 display.
 
-The <lnk name="Confirmation" id="Confirmation"> command pops up a dialog from which you
+The <ref name="Confirmation" id="Confirmation"> command pops up a dialog from which you
 specify which actions you want to confirm.
 
-The <lnk name="Learn keys" id="Learn keys"> command pops up a dialog from which you
+The <ref name="Learn keys" id="Learn keys"> command pops up a dialog from which you
 test some keys which are not working on some terminals and
 you may fix them.
 
-The <lnk name="Virtual FS" id="Virtual FS"> command pops up a dialog from which you
+The <ref name="Virtual FS" id="Virtual FS"> command pops up a dialog from which you
 specify some VFS related options.
 
-The <lnk name="Layout" id="Layout"> command pops up a dialog from which you specify
+The <ref name="Layout" id="Layout"> command pops up a dialog from which you specify
 a bunch of options how mc looks like on the screen.
 
-The <lnk name="Save setup" id="Save Setup"> command saves the current settings of the
+The <ref name="Save setup" id="Save Setup"> command saves the current settings of the
 Left, Right and Options menus. A small number of other
 settings is saved, too.
 
@@ -1311,16 +1310,16 @@ non-unixers.
 built-in file editor is used to edit files. If the option
 is disabled, the editor specified in the <tt/EDITOR/ environment
 variable is used. If no editor is specified, <bf/vi/
-is used. See the section on the <lnk name="internal file
+is used. See the section on the <ref name="internal file
 editor" id="Internal File Editor">.
 <tag/Use internal viewer/ If this option is enabled, the
 built-in file viewer is used to view files. If the option
 is disabled, the pager specified in the <tt/PAGER/ environment
 variable is used. If no pager is specified, the <bf/view/
-command is used. See the section on the <lnk name="internal file
+command is used. See the section on the <ref name="internal file
 viewer" id="Internal File Viewer">.
 <tag/Complete: show all/ By default the Midnight Commander
-pops up all possible <lnk name="completions" id="Completion"> if the completion is
+pops up all possible <ref name="completions" id="Completion"> if the completion is
 ambiguous if you press <tt/M-Tab/ for the second time, for the
 first time it just completes as much as possible and in
 the case of ambiguity beeps. If you want to see all the
@@ -1334,9 +1333,9 @@ you may use the arrows keys to automatically chdir if the
 current selection is a subdirectory and the shell command
 line is empty. By default, this setting is off.
 <tag/Advanced chown/ If this option is enabled, the 
-<lnk name="Advanced Chown" id="Advanced Chown"> 
+<ref name="Advanced Chown" id="Advanced Chown"> 
 command will be invoked if you run the 
-<lnk name="Chmod" id="Chmod"> or <lnk name="Chown" id="Chown"> command.
+<ref name="Chmod" id="Chmod"> or <ref name="Chown" id="Chown"> command.
 <tag/Cd follows links/ This option, if set, causes the Midnight
 Commander to follow the logical chain of directories when
 changing current directory either in the panels, or using
@@ -1412,7 +1411,7 @@ were working properly and you had not to fix any key, then
 
 <p>
 This option gives you control over the settings of the
-<lnk name="Virtual File System" id="Virtual File System"> information cache.
+<ref name="Virtual File System" id="Virtual File System"> information cache.
 
 The Midnight Commander keeps in memory the information
 related to some of the virtual file systems to speed up
@@ -1450,7 +1449,7 @@ timeout, all of the resources associated with the
 file system will be freed. The default timeout is set to
 one minute.
 
-The <lnk name ="FTP File System" id="FTP File System">
+The <ref name ="FTP File System" id="FTP File System">
 keeps the directory listing it fetches from a ftp server
 in a cache.  The cache
 expire time is configurable with the option 
@@ -1461,7 +1460,7 @@ ftp server.
 
 Moreover you can define a proxy host for doing ftp transfers 
 and configure the Midnight Commander to always use the proxy host. See
-the section on <lnk name ="FTP File System" id="FTP File System">
+the section on <ref name ="FTP File System" id="FTP File System">
 for more information.
 
 <sect2>Layout<label id="Layout">
@@ -1480,9 +1479,9 @@ be equal or you can specify an unequal split.
 
 By default all contents of the directory panels are displayed with 
 the same color, but you can specify whether <em/permissions/ and 
-<em/file types/ are highlighted with special <lnk name="Colors" id="Colors">.
+<em/file types/ are highlighted with special <ref name="Colors" id="Colors">.
 If permission highlighting is enabled, the parts of the <em/perm/ 
-and <em/mode/ <lnk name="display fields" lnk id="Listing Mode..."> 
+and <em/mode/ <ref name="display fields" id="Listing Mode..."> 
 which are valid for the user running Midnight Commander
 are highlighted with the color defined with the <em/selected/ 
 keyword.
@@ -1504,15 +1503,15 @@ the system-wide configuration file, located in
 file doesn't exist, MC uses the default settings.
 
 The <em/Save Setup/ command creates the <tt>&tilde;/.mc/ini</tt> file by
-saving the current settings of the <lnk name="Left, Right" id="Left and Right Menus"> and
-<lnk name="Options" id="Options Menu"> menus.
+saving the current settings of the <ref name="Left, Right" id="Left and Right Menus"> and
+<ref name="Options" id="Options Menu"> menus.
 
 If you activate the <em/auto save setup/ option, MC will always
 save the current settings when exiting.
 
 There also exist settings which can't be changed from the
 menus. To change these settings you have to edit the setup
-file with your favorite editor. See the section on <lnk name="Special
+file with your favorite editor. See the section on <ref name="Special
 Settings" id="Special Settings"> for more information.
 
 <sect>Executing operating system commands<label id="Executing operating system commands">
@@ -1525,9 +1524,9 @@ of the panels and hitting <tt/Enter/.
 
 If you press Enter over a file that is not executable, the
 Midnight Commander checks the extension of the selected
-file against the extensions in the <lnk name="Extensions File" id="Extension File Edit">. If a
+file against the extensions in the <ref name="Extensions File" id="Extension File Edit">. If a
 match is found then the code associated with that
-extension is executed. A very simple <lnk name="macro expansion" id="Macro Substitution">
+extension is executed. A very simple <ref name="macro expansion" id="Macro Substitution">
 takes place before executing the command.
 
 <sect1>The cd internal command<label id="The cd internal command">
@@ -1568,8 +1567,8 @@ it's relative name (for example cd linux could take you to
 <sect1>Macro Substitution<label id="Macro Substitution">
 
 <p>
-When accessing a <lnk name="user menu" id="Menu File Edit"> or executing an
-<lnk name="extension dependent command" id="Extension File Edit">
+When accessing a <ref name="user menu" id="Menu File Edit"> or executing an
+<ref name="extension dependent command" id="Extension File Edit">
 or running a command from the command
 line input, a simple macro substitution takes place.
 
@@ -1613,14 +1612,14 @@ because next time there will be no tagged files.
 there are any. Otherwise the current file.
 
 <tag/"&percnt;q"/ Dropped files. In all places except in the Drop
-action of the <lnk name="mc.ext file" id="Extension File Edit">, this will become a null
+action of the <ref name="mc.ext file" id="Extension File Edit">, this will become a null
 string, in the Drop action it will be replaced with a
 space separated list of files that were dropped on the
 file.
 
 <tag/"&percnt;cd"/ This is a special macro that is used to change the
 current directory to the directory specified in front of
-it. This is used primarily as an interface to the <lnk name="Virtual
+it. This is used primarily as an interface to the <ref name="Virtual
 File System" id="Virtual File System">.
 Possible to use only in mc.ext .
 
@@ -1678,7 +1677,7 @@ An extra added feature of using the subshell is that the
 prompt displayed by the Midnight Commander is the same
 prompt that you are currently using in your shell.
 
-The <lnk name="Options" id="Options"> section has more
+The <ref name="Options" id="Options"> section has more
 information on how you can control the subshell code.
 
 <sect1>Controlling Midnight Commander<label id="Controlling Midnight Commander">
@@ -1767,8 +1766,8 @@ file. The hot key for this command is <tt/C-x o/.
 <sect>Advanced Chown<label id="Advanced Chown">
 
 <p>
-The Advanced Chown command is the <lnk name="Chmod" id="Chmod">
-and <lnk name="Chown" id="Chown"> command combined into one
+The Advanced Chown command is the <ref name="Chmod" id="Chmod">
+and <ref name="Chown" id="Chown"> command combined into one
 window. You can change the permissions and owner/group of
 files at once.
 
@@ -1873,13 +1872,13 @@ will be respected.
 When the shell patterns option is on you can use the '*'
 and '?' wildcards in the source mask. They work like they
 do in the shell. In the target mask only the '*' and
-'&bslsh;&lt;digit&gt;' wildcards are allowed. The first '*' wildcard in
+'&bsol;&lt;digit&gt;' wildcards are allowed. The first '*' wildcard in
 the target mask corresponds to the first wildcard group in
 the source mask, the second '*' corresponds to the second
-group and so on. The '&bslsh;1' wildcard corresponds to the
-first wildcard group in the source mask, the '&bslsh;2' wildcard
+group and so on. The '&bsol;1' wildcard corresponds to the
+first wildcard group in the source mask, the '&bsol;2' wildcard
 corresponds to the second group and so on all the way up
-to '&bslsh;9'. The '&bslsh;0' wildcard is the whole filename of the
+to '&bsol;9'. The '&bsol;0' wildcard is the whole filename of the
 source file.
 
 Two examples:
@@ -1890,12 +1889,12 @@ the copy will be "foo.tgz" in "/bla".
 
 Let's suppose you want to swap basename and extension so
 that "file.c" will become "c.file" and so on. The source
-mask for this is "*.*" and the destination is "&bslsh;2.&bslsh;1".
+mask for this is "*.*" and the destination is "&bsol;2.&bsol;1".
 
 <tag/Use shell patterns off/
 
 When the shell patterns option is off the MC doesn't do
-automatic grouping anymore. You must use '&bslsh;(...&bslsh;)'
+automatic grouping anymore. You must use '&bsol;(...&bsol;)'
 expressions in the source mask to specify meaning for the
 wildcards in the target mask. This is more flexible but
 also requires more typing. Otherwise target masks are
@@ -1904,37 +1903,37 @@ on.
 
 Two examples:
 
-If the source mask is "^&bslsh;(.*&bslsh;)&bslsh;.tar&bslsh;.gz&dollar;", the destination
+If the source mask is "^&bsol;(.*&bsol;)&bsol;.tar&bsol;.gz&dollar;", the destination
 is "/bla/*.tgz" and the file to be copied is "foo.tar.gz",
 the copy will be "/bla/foo.tgz".
 
 Let's suppose you want to swap basename and extension so
 that "file.c" will become "c.file" and so on. The source
-mask for this is "^&bslsh;(.*&bslsh;)&bslsh;.&bslsh;(.*&bslsh;)&dollar;" and the destination is
-"&bslsh;2.&bslsh;1".
+mask for this is "^&bsol;(.*&bsol;)&bsol;.&bsol;(.*&bsol;)&dollar;" and the destination is
+"&bsol;2.&bsol;1".
 
 <tag/Case Conversions/
 
 You can also change the case of the filenames. If you use
-'&bslsh;u' or '&bslsh;l' in the target mask the next character will be
+'&bsol;u' or '&bsol;l' in the target mask the next character will be
 converted to uppercase or lowercase correspondingly.
 
-If you use '&bslsh;U' or '&bslsh;L' in the target mask the next
+If you use '&bsol;U' or '&bsol;L' in the target mask the next
 characters will be converted to uppercase or lowercase
-correspondingly up to the next '&bslsh;E' or next '&bslsh;U', '&bslsh;L' or
+correspondingly up to the next '&bsol;E' or next '&bsol;U', '&bsol;L' or
 the end of the file name.
 
-The '&bslsh;u' and '&bslsh;l' are stronger than '&bslsh;U' and '&bslsh;L'.
+The '&bsol;u' and '&bsol;l' are stronger than '&bsol;U' and '&bsol;L'.
 
 For example, if the source mask is '*' (shell patterns on)
-or '^&bslsh;(.*&bslsh;)&dollar;' (shell patterns off) and the target mask is
-'&bslsh;L&bslsh;u*' the file names will be converted to have initial
+or '^&bsol;(.*&bsol;)&dollar;' (shell patterns off) and the target mask is
+'&bsol;L&bsol;u*' the file names will be converted to have initial
 upper case and otherwise lower case.
 
 </descrip>
 
-You can also use '&bslsh;' as a quote character. For example,
-'&bslsh;&bslsh;' is a backslash and '&bslsh;*' is an asterisk.
+You can also use '&bsol;' as a quote character. For example,
+'&bsol;&bsol;' is a backslash and '&bsol;*' is an asterisk.
 
 <sect>Internal File Viewer<label id="Internal File Viewer">
 
@@ -2008,7 +2007,7 @@ label is the other mode than current.
 </descrip>
 
 It's possible to instruct the file viewer how to display a
-file, look at the <lnk name="Extension File Edit section" id="Extension File Edit">
+file, look at the <ref name="Extension File Edit section" id="Extension File Edit">
 
 <sect>Internal File Editor<label id="Internal File Editor">
 
@@ -2135,7 +2134,7 @@ on all input lines, command completion is command line
 specific. If the completion is ambiguous (there are more
 different possibilities), MC beeps and the following
 action depends on the setting of the <em/Complete: show all/
-option in the <lnk name="Configuration" id="Configuration">
+option in the <ref name="Configuration" id="Configuration">
 dialog. If it is enabled, a
 list of all possibilities pops up next to the current
 position and you can select with the arrow keys and <tt/Enter/
@@ -2148,7 +2147,7 @@ previous characters will be highlighted. As soon as there
 is no ambiguity, dialog disappears, but you can hide it by
 canceling keys <tt/Esc,/ <tt/F10/ and left and right arrow keys. If
 <em/Complete: show all/
-<lnk name="Configuration" id="Configuration"> is disabled, 
+<ref name="Configuration" id="Configuration"> is disabled, 
 the dialog pops up
 only if you press <tt/M-Tab/ for the second time, for the first
 time MC just beeps.
@@ -2210,11 +2209,11 @@ Examples:
 To connect to sites behind a firewall, you will need to use the prefix
 ftp://! (ie, with a bang character after the double slash) to make the
 Midnight Commander use a proxy host for doing the ftp transfer.  You
-can define the proxy host in the <lnk name="Virtual FS" id="Virtual FS">
+can define the proxy host in the <ref name="Virtual FS" id="Virtual FS">
 Virtual File System dialog box.
 
 Another option to set is the <em/Always use ftp proxy/
-option in the <lnk name="Virtual FS" id="Virtual FS">
+option in the <ref name="Virtual FS" id="Virtual FS">
 dialog box.  This will configure the program
 to always use the proxy host.  If this variable is set, the program
 will do two things: consult the <tt>@prefix@/lib/mc.no_proxy</tt> file for
@@ -2228,7 +2227,7 @@ want to force the program to use the passive-open mode.  To use this,
 set the <em/ftpfs_use_passive_connections/ option in the initialization file.
 
 The Midnight Commander keeps the directory listing in a cache.  The cache
-expire time is configurable in the <lnk name="Virtual FS" id="Virtual FS">
+expire time is configurable in the <ref name="Virtual FS" id="Virtual FS">
 dialog box.  This has the funny behavior that even if you make changes to a
 directory, they will not be reflected in the directory listing until you
 force a cache reload with the C-r key.  This is a feature (when you think
@@ -2248,7 +2247,7 @@ following syntax:
 
 The mc.ext file already provides a shortcut for tar files,
 this means that usually you just point to a tar file and
-press return to enter into the tar file, see the <lnk name="Extension
+press return to enter into the tar file, see the <ref name="Extension
 File Edit" id="Extension File Edit"> section for details on how this is done.
 
 Examples:
@@ -2439,7 +2438,7 @@ is used for a selected hyperlink.
 
 Special highlight colors determine how files are displayed 
 when file highlighting is enabled (see the section on
-<lnk name="Layout" id="Layout>).
+<ref name="Layout" id="Layout">).
 <em/directory/ is used for directories or symbolic links to directories; 
 <em/executable/ for executable files;
 <em/link/ is used for symbolic links which are neither stalled nor linked
@@ -2541,7 +2540,7 @@ bottom line, in such case it will move the selection to
 the last file name in the panel.
 <tag/use_file_to_guess_type/ If this variable is on (the
 default) it will spawn the file command to match the file
-types listed on the <lnk name="mc.ext file" id="Extension File Edit">.
+types listed on the <ref name="mc.ext file" id="Extension File Edit">.
 <tag/xterm_mode/If this variable is on (default is off) when you browse the file
 system on a Tree panel, it will automatically reload the other panel
 with the contents of the selected directory.
@@ -2559,7 +2558,7 @@ section "terminal:your-terminal-name" and then for the
 section "terminal:general", each line of the section
 contains a key symbol that you want to define, followed by
 an equal sign and the definition for the key. You can use
-the special &bslsh;E form to represent the escape character and
+the special &bsol;E form to represent the escape character and
 the ^x to represent the control-x character.
 
 The possible key symbols are:
@@ -2584,7 +2583,7 @@ For example, to define the key insert to be the
 <tt/Escape + &lsqb; + O + p/, you set this in the ini file:
 
 <tscreen><verb>
-insert=&bslshv;E[Op
+insert=&bsol;E[Op
 </verb></tscreen>
 
 The <em/complete/ key symbol represents the escape sequences
@@ -2618,7 +2617,7 @@ of nodes.
 
 The full key list of the help viewer:
 
-<lnk name="General movement keys" id="General Movement Keys"> are accepted.
+<ref name="General movement keys" id="General Movement Keys"> are accepted.
 
 <descrip>
 <tag/tab/Move to the next item.