diff --git a/general/sysutils/mc.xml b/general/sysutils/mc.xml
index e32ecb1412..7046292584 100644
--- a/general/sysutils/mc.xml
+++ b/general/sysutils/mc.xml
@@ -73,10 +73,10 @@
     <para>Midnight Commander without the Debian patch is completely unusable
     in multibyte locales because it assumes that characters and
     bytes are the same thing. The issue manifests itself as massive screen
-    contents corruption similar to what is depicted in
+    content corruption similar to what is depicted in
     <ulink url="&files-anduin;/mc-bad.png">this screenshot</ulink>
     (taken in the ru_RU.UTF-8 locale). For a general discussion of this type
-    of issues, see the <xref linkend="locale-issues"/> page. The Debian patch
+    of issue, see the <xref linkend="locale-issues"/> page. The Debian patch
     mostly fixes this issue, and adds support for recoding remote FTP
     filenames. Debian also fixed 64-bit issues, rare segfaults in
     <command>mcedit</command>, and improved syntax highlighting.</para>
@@ -87,7 +87,8 @@
     in the past it caused unacceptable regressions for non-UTF-8 locale users.
     Thus, failsafe instructions without the patch are left in the book just
     in case. Due to the size and unofficial nature of the patch, please
-    do not report bugs in the patched MC to the original MC developers.</para>
+    do not report bugs in the patched <application>MC</application> to the
+    original <application>MC</application> developers.</para>
 
     <bridgehead renderas="sect3">MC Dependencies</bridgehead>
 
@@ -112,10 +113,13 @@
   <sect2 role="installation">
     <title>Installation of MC</title>
 
-    <para>Fix incompatibility of MC-&mc-version; with Bash-3.2:</para>
+    <para>Fix incompatibility of <application>MC</application>-&mc-version;
+    with <application>Bash</application>-3.2:</para>
+
 <screen><userinput>patch -Np1 -i ../mc-&mc-version;-bash32-1.patch</userinput></screen>
 
     <para>If desired, apply Debian fixes:</para>
+
 <screen><userinput>patch -Np1 -i ../mc-&mc-version;-debian_fixes-1.patch</userinput></screen>
 
     <para>Install <application>MC</application> by
@@ -123,14 +127,15 @@
 
 <screen><userinput>CPPFLAGS="-DUTF8" ./configure --prefix=/usr \
             --enable-charset &amp;&amp;
-make
-</userinput></screen>
+make</userinput></screen>
 
-    <para>MC with Debian patches expects its documentation to be stored in the
-    UTF-8 encoding on disk, and automatically converts it to the locale
-    encoding when displaying on the terminal. This is different from the
-    expectations of the unpatched MC, so the documentation files have to be
+    <para><application>MC</application> with Debian patches expects its
+    documentation to be stored in UTF-8 encoding on disk, and automatically
+    converts it to the locale encoding when displaying on the terminal. This
+    is different from the expectations of the unpatched
+    <application>MC</application>, so the documentation files have to be
     converted if (and only if) the Debian patch has been applied:</para>
+
 <screen><userinput>convert-mans ISO-8859-1 UTF-8 lib/mc.hint{,.es,.it,.nl} &amp;&amp;
 convert-mans ISO-8859-2 UTF-8 lib/mc.hint{.cs,.hu,.pl} &amp;&amp;
 convert-mans ISO-8859-5 UTF-8 lib/mc.hint.sr &amp;&amp;
@@ -155,29 +160,33 @@ chmod 1755 /usr/lib/mc/cons.saver</userinput></screen>
     <title>Command Explanations</title>
     
     <para><parameter>CPPFLAGS="-DUTF8"</parameter>: This parameter activates
-    UTF-8 support in the Debian patch and has no effect without this patch.</para>
+    UTF-8 support in the Debian patch and has no effect without this
+    patch.</para>
 
     <para><parameter>--enable-charset</parameter>: This option adds support
-    to <command>mcedit</command> for editing files in encodings different from the one implied
-    by the current locale. This feature works in non-UTF-8 locales only,
-    even with the Debian patch.</para>
+    to <command>mcedit</command> for editing files in encodings different
+    from the one implied by the current locale. This feature works in
+    non-UTF-8 locales only, even with the Debian patch.</para>
     
     <para><parameter>--with-screen=(slang|mcslang|ncurses)</parameter>: This
-    parameter selects the screen library used by MC. NCurses support is
+    parameter selects the screen library used by <application>MC</application>.
+    <application>NCurses</application> support is
     currently buggy (MC does not handle mouse events in xterm correctly).
     UTF-8 support in the Debian patch is functional
     only when external <xref linkend="slang"/> is used as a screen library
     (this is the default).</para>
     
-    <para><parameter>--with-codepagedir=DIR</parameter>: This parameter was useful
-    only with SAMBA-2.x. New versions of SAMBA do not have codepage files.</para>
+    <para><parameter>--with-codepagedir=DIR</parameter>: This parameter was
+    useful only with <application>SAMBA</application>-2.x. New versions of
+    <application>SAMBA</application> do not have codepage files.</para>
     
     <para><command>chmod 1755 /usr/lib/mc/cons.saver</command>: The
-    <command>cons.saver</command> program on LFS has to be installed setuid root,
-    because on LFS regular users have no access to <filename>/dev/vcsa*</filename>
-    devices. This step is optional if MC is going to be started from X terminal
-    emulators or ssh sessions only (thus rendering the <command>cons.saver</command>
-    binary completely unneeded).</para>
+    <command>cons.saver</command> program has to be installed setuid
+    root, because on LFS regular users have no access to
+    <filename>/dev/vcsa*</filename> devices. This step is optional if
+    <application>MC</application> is going to be started from X terminal
+    emulators or <command>ssh</command> sessions only (thus rendering the
+    <command>cons.saver</command> binary completely unneeded).</para>
 
     <!-- Other distributions make the devices owned by the vcsa group
          and make the cons.saver program setgid vcsa instead -->
@@ -235,7 +244,7 @@ chmod 1755 /usr/lib/mc/cons.saver</userinput></screen>
         <term><command>cons.saver</command></term>
         <listitem>
           <para>is used internally by <command>mc</command> for saving and
-	  restoring the text behind the panels on Linux text console.</para>
+          restoring the text behind the panels on Linux text console.</para>
           <indexterm zone="mc conssaver">
             <primary sortas="b-conssaver">cons.saver</primary>
           </indexterm>
@@ -265,7 +274,8 @@ chmod 1755 /usr/lib/mc/cons.saver</userinput></screen>
       <varlistentry id="mcmfmt">
         <term><command>mcmfmt</command></term>
         <listitem>
-          <para>is used internally by <command>mcview</command> when viewing mailbox files.</para>
+          <para>is used internally by <command>mcview</command> when viewing
+          mailbox files.</para>
           <indexterm zone="mc mcmfmt">
             <primary sortas="b-mcmfmt">mcmfmt</primary>
           </indexterm>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 62d778d640..91224d7d91 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -55,7 +55,7 @@
       <itemizedlist>
         <listitem>
           <para>[alexander] - Added Debian patch and bash-3.2
-	  compatibility patch to MC. Fixes #2189.</para>
+          compatibility patch to MC. Fixes #2189.</para>
         </listitem>
       </itemizedlist>
     </listitem>