@@ -, +, @@ 
---
 pkg-mgr-commands.tex |   38 +++++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 15 deletions(-)
--- a/pkg-mgr-commands.tex	
+++ a/pkg-mgr-commands.tex	
@@ -339,14 +339,20 @@ that can be passed to \t{dohtml} are as follows:
 \end{algorithm}
 
 \item[doman] Installs a man page into the appropriate subdirectory of \t{/usr/share/man} depending
-    upon its apparent section suffix (e.g. \t{foo.1} goes to \t{/usr/share/man/man1/foo.1} with file
-    mode \t{0644}.
+    upon its apparent section suffix (e.\,g.\ \t{foo.1} goes to \t{/usr/share/man/man1/foo.1} with
+    file mode \t{0644}.
 
-    \featurelabel{doman-langs} In EAPIs listed in table~\ref{tab:doman-table} as supporting language
-    codes, a man page with name of the form\t{foo.lang.1} shall go to
-    \t{/usr/share/man/lang/man1/foo.1}, where \t{lang} refers to a pair of lower-case ASCII letters
-    optionally followed by an underscore and a pair of upper-case ASCII letters. Failure behaviour
-    is EAPI dependent as per section~\ref{sec:failure-behaviour}.
+    \featurelabel{doman-langs} In EAPIs listed in table~\ref{tab:doman-table} as supporting
+    language detection by filename, a man page with name of the form \t{foo.}\i{lang}\t{.1} shall
+    go to \t{/usr/share/man/}\i{lang}\t{/man1/foo.1}, where \i{lang} refers to a pair of lower-case
+    ASCII letters optionally followed by an underscore and a pair of upper-case ASCII letters.
+    Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}.
+
+    With option \t{-i18n=}\i{lang}, a man page shall be installed into an appropriate subdirectory
+    of \t{/usr/share/man/}\i{lang} (e.\,g.\ \t{/usr/share/man/}\i{lang}\t{/man1/foo.pl.1} would be
+    the destination for \t{foo.pl.1}). The \i{lang} subdirectory level is skipped if \i{lang} is
+    the empty string. In EAPIs specified by table~\ref{tab:doman-table}, the \t{-i18n} option takes
+    precedence over the language code in the filename.
 
 \item[domo] Installs a \t{.mo} file with file mode \t{0644} into the appropriate subdirectory of
     \t{DESTTREE/share/locale}, generated by taking the basename of the file, removing the \t{.*}
@@ -425,17 +431,19 @@ that can be passed to \t{dohtml} are as follows:
     \end{tabular}
 \end{centertable}
 
-\begin{centertable}{EAPIs supporting \t{doman} languages} \label{tab:doman-table}
-    \begin{tabular}{ l l }
+\begin{centertable}{\t{doman} language support options for EAPIs}
+    \label{tab:doman-table}
+    \begin{tabular}{ l l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{doman} languages?}} \\
+            \multicolumn{1}{c}{\textbf{Language detection by filename?}} &
+            \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\
             \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
+    \t{0} & No & Not applicable \\
+    \t{1} & No & Not applicable \\
+    \t{2} & Yes & No \\
+    \t{3} & Yes & No \\
+    \t{4} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}
--