1.1 --- a/en/collab.tex	Wed May 09 17:04:06 2007 -0700
     1.2 +++ b/en/collab.tex	Wed May 30 19:59:52 2007 -0700
     1.3 @@ -1028,10 +1028,10 @@
     1.4  \item[\rcitem{web}{contact}] String.  A free-form (but preferably
     1.5    brief) string identifying the person or group in charge of the
     1.6    repository.  This often contains the name and email address of a
     1.7 -  person.
     1.8 -\item[\rcitem{web}{description}] String.  A free-form (but preferably
     1.9 -  brief) string that describes the contents or purpose of the
    1.10 -  repository.
    1.11 +  person or mailing list.  It often makes sense to place this entry in
    1.12 +  a repository's own \sfilename{.hg/hgrc} file, but it can make sense
    1.13 +  to use in a global \hgrc\ if every repository has a single
    1.14 +  maintainer.
    1.15  \item[\rcitem{web}{maxchanges}] Integer.  The default maximum number
    1.16    of changesets to display in a single page of output.
    1.17  \item[\rcitem{web}{maxfiles}] Integer.  The default maximum number
    1.18 @@ -1060,6 +1060,20 @@
    1.19  convenience.  These items are \rcitem{web}{motd} and
    1.20  \rcitem{web}{style}.
    1.21  
    1.22 +\subsubsection{Options specific to an individual repository}
    1.23 +
    1.24 +A few \rcsection{web} configuration items ought to be placed in a
    1.25 +repository's local \sfilename{.hg/hgrc}, rather than a user's or
    1.26 +global \hgrc.
    1.27 +\begin{itemize}
    1.28 +\item[\rcitem{web}{description}] String.  A free-form (but preferably
    1.29 +  brief) string that describes the contents or purpose of the
    1.30 +  repository.
    1.31 +\item[\rcitem{web}{name}] String.  The name to use for the repository
    1.32 +  in the web interface.  This overrides the default name, which is the
    1.33 +  last component of the repository's path.
    1.34 +\end{itemize}
    1.35 +
    1.36  \subsubsection{Options specific to the \hgcmd{serve} command}
    1.37  
    1.38  Some of the items in the \rcsection{web} section of a \hgrc\ file are
    1.39 @@ -1082,6 +1096,22 @@
    1.40    server should listen.  The default port number used is~8000.
    1.41  \end{itemize}
    1.42  
    1.43 +\subsubsection{Choosing the right \hgrc\ file to add \rcsection{web}
    1.44 +  items to}
    1.45 +
    1.46 +It is important to remember that a web server like Apache or
    1.47 +\texttt{lighttpd} will run under a user~ID that is different to yours.
    1.48 +CGI scripts run by your server, such as \sfilename{hgweb.cgi}, will
    1.49 +usually also run under that user~ID.
    1.50 +
    1.51 +If you add \rcsection{web} items to your own personal \hgrc\ file, CGI
    1.52 +scripts won't read that \hgrc\ file.  Those settings will thus only
    1.53 +affect the behaviour of the \hgcmd{serve} command when you run it.  To
    1.54 +cause CGI scripts to see your settings, either create a \hgrc\ file in
    1.55 +the home directory of the user ID that runs your web server, or add
    1.56 +those settings to a system-wide \hgrc\ file.
    1.57 +
    1.58 +
    1.59  %%% Local Variables: 
    1.60  %%% mode: latex
    1.61  %%% TeX-master: "00book"