[Monotone-commits-diffs] net.venge.monotone: cba0cf982fec26804dd0eb574089b2f7bf9a1759

[code]

revision:            cba0cf982fec26804dd0eb574089b2f7bf9a1759
date:                2011-01-09T16:48:31
author:              address@hidden
branch:              net.venge.monotone
changelog:
* monotone.texi: clean up discussion of and references to rcfiles

manifest:
format_version "1"

new_manifest [df6d968359098313c096d84191ef240c3328db3a]

old_revision [f634b1d5464d66ce110a997b22464d51e270d2b7]

patch "monotone.texi"
 from [bcb935878bb1dcc0bd1c9c56e8138acad569587d]
   to [d6ca2921cbcacbc1e7ae596cc0d8b402a5781dc8]
============================================================
--- monotone.texi	bcb935878bb1dcc0bd1c9c56e8138acad569587d
+++ monotone.texi	d6ca2921cbcacbc1e7ae596cc0d8b402a5781dc8
@@ -4906,18 +4906,20 @@ @section Global Options
 @file{~/.monotone} on Unix and Cygwin, @file{%APPDATA%\monotone%} on
 Windows MinGW). This is where monotone finds:
 
address@hidden
address@hidden keys, in @file{conf_dir/keys}; see @ref{Certificates},
address@hidden Keys}. The location of the keys directory can be
-overridden separately with the @command{--keydir} option.
address@hidden @code
address@hidden keys
+in @file{conf_dir/keys}; see @ref{Certificates}, @ref{Generating
+Keys}. The location of the keys directory can be overridden separately
+with the @command{--keydir} option.
 
address@hidden rcfiles, which are per-user configuration files containing Lua code
-(see @ref{Lua Reference}) that are run each time monotone starts up.
address@hidden rcfiles
+which are per-user configuration files containing Lua code
+(see @ref{rcfiles}) that are run each time monotone starts up.
 
 @item default database
 See option @command{--db} below.
 
address@hidden itemize
address@hidden table
 
 In addition, monotone writes a dump file to the configuration
 directory when it fails.
@@ -4974,7 +4976,7 @@ @section Global Options
 @itemx --builtin-rcfile
 Do not load the built-in rcfile with the default hooks. This means
 all hooks will have null definitions (unless overridden by other
-rcfiles). See @ref{Hooks}.
address@hidden).
 
 @item --no-default-confdir
 @itemx --allow-default-confdir
@@ -4989,7 +4991,7 @@ @section Global Options
 Do not load the standard rcfiles, which are
 @file{~/.monotone/monotonerc} on Unix or
 @file{%APPDATA%\monotone\monotonerc} on Windows, and
address@hidden/monotonerc} in the current workspace.
address@hidden/monotonerc} in the current workspace. See @ref{rcfiles}.
 
 @item --no-workspace
 @itemx --allow-workspace
@@ -5008,11 +5010,11 @@ @section Global Options
 debug, information, warning, and none. The default is information.
 
 @item --rcfile <arg>
-Specify an extra rcfile to load.
+Specify an extra rcfile to load. See @ref{rcfiles}.
 
 @itemx --clear-rcfiles
-Cancel all previous @command{rcfile} options (standard rcfiles are
-still loaded).
+Cancel all previous @command{--rcfile} options (standard rcfiles are
+still loaded). See @ref{rcfiles}.
 
 @itemx --root <arg>
 Limit the search for a workspace to the specified root directory
@@ -11282,17 +11284,29 @@ @chapter Lua Reference
 help monotone to make a particular decision, set a suitable default or
 preference or perform a certain action.
 
-You can put Lua functions in a file @file{$HOME/.monotone/monotonerc},
-or in your workspace in @file{_MTN/monotonerc}, both of which will be
-read every time monotone runs. Definitions in @file{_MTN/monotonerc}
-shadow (override) definitions made in your
address@hidden/.monotone/monotonerc}. You can also tell monotone to
-interpret extra hook functions from any other @var{file} using the
address@hidden@var{file}} option; hooks defined in files specified
-on the command-line will shadow hooks from the other predefined
-locations.  By specifying @address@hidden you can
-automatically load all the files contained in @var{directory}.
address@hidden can put Lua functions in ``rcfiles'' which will be
+read every time monotone runs. @file{rcfiles} consist of:
 
address@hidden
address@hidden
address@hidden/.monotone/monotonerc} on Unix or
address@hidden on Windows
+
address@hidden
address@hidden/monotonerc} in the current workspace
+
address@hidden
+Files given in the @address@hidden option on the command line.
+
address@hidden
+All files in a directory given by @address@hidden on
+the command line.
address@hidden itemize
+
+The files are loaded in the order @file{.monotone/monotonerc},
address@hidden/monotonerc}, @option{--rcfile} in the command line order.
+Definitions loaded later shadow (override) earlier definitions.
+
 There are two uses for Lua functions; hooks and user-defined
 commands. This section documents hooks; see @ref{register_command} for
 user-defined commands. The source distribution contains some example
@@ -13271,7 +13285,7 @@ @appendix Default hooks
 This section contains the entire source code of the standard hook file,
 that is built in to the monotone executable, and read before any user
 hooks files (unless @option{--no-builtin-rcfiles} is passed).  It contains the
-default values for all hooks.
+default values for all hooks. See @ref{rcfiles}.
 
 @verbatiminclude std_hooks.lua