diff --git a/internal/loadups/man-page/loadup.1 b/internal/loadups/man-page/loadup.1 index 25e88f57..4702ca50 100644 --- a/internal/loadups/man-page/loadup.1 +++ b/internal/loadups/man-page/loadup.1 @@ -111,7 +111,7 @@ output directory called \f[I]gitinfo\f[R] which contains the git commit, git branch and git status information for the directory at the time the loadup is run. .PP -Only one instance (per ) of loadup can be run at a time. +Only one instance (per ) of loadup can be run at a time. There is lock file to prevent simultaneous loadups in the work directory (named \f[B]\f[BI]lock\f[B]\f[R]) that can be manually removed. The lock can also be automatically overridden (see the --override flag diff --git a/internal/loadups/man-page/loadup.1.gz b/internal/loadups/man-page/loadup.1.gz index e808af77..8500f0a9 100644 Binary files a/internal/loadups/man-page/loadup.1.gz and b/internal/loadups/man-page/loadup.1.gz differ diff --git a/internal/loadups/man-page/loadup.1.md b/internal/loadups/man-page/loadup.1.md index e9318ec4..44bfcbc3 100644 --- a/internal/loadups/man-page/loadup.1.md +++ b/internal/loadups/man-page/loadup.1.md @@ -52,7 +52,7 @@ Loadup does all of its work in a work directory (\/loadups/build). T If \ is a git directory, then a file is created in the loadups output directory called *gitinfo* which contains the git commit, git branch and git status information for the directory at the time the loadup is run. -Only one instance (per \) of loadup can be run at a time. There is lock file to prevent simultaneous loadups in the work directory (named ***lock***) that can be manually removed. The lock can also be automatically overridden (see the \-\-override flag below). Alternatively, if a lock is encountered at run time, the user will be asked to choose whether to override or simply exit the loadup. +Only one instance (per \) of loadup can be run at a time. There is lock file to prevent simultaneous loadups in the work directory (named ***lock***) that can be manually removed. The lock can also be automatically overridden (see the \-\-override flag below). Alternatively, if a lock is encountered at run time, the user will be asked to choose whether to override or simply exit the loadup. Note: **MEDLEYDIR** is an environment variable set by the loadup script. It is set to the top level directory of the Medley installation that contains the specific loadup script that is invoked after all symbolic links are resolved. In the standard global installation this will diff --git a/internal/loadups/man-page/man_loadup.html b/internal/loadups/man-page/man_loadup.html index 41e4f4f2..94868db4 100644 --- a/internal/loadups/man-page/man_loadup.html +++ b/internal/loadups/man-page/man_loadup.html @@ -83,7 +83,7 @@ the work directory after the loadup completes.

the loadups output directory called gitinfo which contains the git commit, git branch and git status information for the directory at the time the loadup is run.

-

Only one instance (per <MEDLEIDIR>) of loadup can be run at a +

Only one instance (per <MEDLEYDIR>) of loadup can be run at a time. There is lock file to prevent simultaneous loadups in the work directory (named lock) that can be manually removed. The lock can also be automatically overridden (see the