--- a/mercurial.tex
+++ b/mercurial.tex
@@ -4,6 +4,9 @@
 \lstdefinelanguage{hgshell}{
   moredelim=[l][\bfseries]{\%},
 }
+\lstdefinelanguage{ini}{
+  moredelim=[s][\bfseries]{[}{]},
+}
 \lstset{
   language=hgshell,
   basicstyle=\footnotesize\ttfamily,
@@ -428,6 +431,21 @@
 \end{lstlisting}
 \end{frame}
 
+\begin{frame}[fragile]{Settings}
+  You configure Mercurial using configuration files:
+  \begin{itemize}
+  \item \path{/etc/mercurial/hgrc} holds global settings
+  \item \path{~/.hgrc} holds per-user settings
+  \item \path{.hg/hgrc} holds per-repository settings
+  \item username in previous commit came from \path{~/.hgrc}:
+\begin{lstlisting}[language=ini]
+[ui]
+username = Martin Geisler <mg@lazybytes.net>
+\end{lstlisting}
+  \end{itemize}
+\end{frame}
+
+
 \begin{frame}[fragile]{Examining Differences}
 Change the output from ``hello, world'' to ``Hello World!''.
 
@@ -454,8 +472,6 @@
 \end{frame}
 
 
-\begin{frame}{Settings}
-\end{frame}
 
 \subsection{Working with a Repository}