diff options
| author | ru <ru@FreeBSD.org> | 2004-07-02 23:13:00 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-07-02 23:13:00 +0000 |
| commit | 6294018a208cf7742b1c021a9b75c26962505571 (patch) | |
| tree | 502f17eb951b74c914af346cd4dbff252350c082 /usr.sbin/mergemaster | |
| parent | 3f44360851448f8816c22f6b72e8dd5c9924c27f (diff) | |
| download | FreeBSD-src-6294018a208cf7742b1c021a9b75c26962505571.zip FreeBSD-src-6294018a208cf7742b1c021a9b75c26962505571.tar.gz | |
Mechanically kill hard sentence breaks.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 359ffe2..699120b 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -100,7 +100,8 @@ it is not recommended. The .Nm utility checks your umask and issues a warning for anything -other than 022. While it is not mandatory to grant +other than 022. +While it is not mandatory to grant world read permissions for most configuration files, you may run into problems without them. If you choose a @@ -294,7 +295,9 @@ comparison, use: .Pp The .Nm -utility will . (source) these files if they exist. +utility will +.Ic .\& +(source) these files if they exist. Command line options will override rc file options. .Pa $HOME/.mergemasterrc @@ -387,7 +390,8 @@ The utility was first publicly available on one of my web pages in a much simpler form under the name .Pa comproot -on 13 March 1998. The idea for creating the +on 13 March 1998. +The idea for creating the temporary root environment comes from Nik Clayton's make world tutorial which is referenced above. .Sh AUTHORS |
