diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mktemp/mktemp.1 | 11 | ||||
| -rw-r--r-- | usr.bin/rcs/merge.1 | 24 |
2 files changed, 16 insertions, 19 deletions
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1 index dddd39a2927..412e2c7aa91 100644 --- a/usr.bin/mktemp/mktemp.1 +++ b/usr.bin/mktemp/mktemp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mktemp.1,v 1.28 2013/08/07 06:19:36 deraadt Exp $ +.\" $OpenBSD: mktemp.1,v 1.29 2018/06/07 11:37:21 jmc Exp $ .\" .\" Copyright (c) 1996, 2000, 2001, 2003, 2010, 2013 .\" Todd C. Miller <Todd.Miller@courtesan.com> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 7 2013 $ +.Dd $Mdocdate: June 7 2018 $ .Dt MKTEMP 1 .Os .Sh NAME @@ -142,11 +142,6 @@ This is slightly better than but still introduces a race condition. Use of this option is not encouraged. .El -.Pp -The -.Nm -utility -exits with a value of 0 on success or 1 on failure. .Sh ENVIRONMENT .Bl -tag -width TMPDIR .It Ev TMPDIR @@ -154,6 +149,8 @@ directory in which to place the temporary file when in .Fl t mode .El +.Sh EXIT STATUS +.Ex -std mktemp .Sh EXAMPLES The following .Xr sh 1 diff --git a/usr.bin/rcs/merge.1 b/usr.bin/rcs/merge.1 index cf4405ac299..7794d78594a 100644 --- a/usr.bin/rcs/merge.1 +++ b/usr.bin/rcs/merge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: merge.1,v 1.3 2010/10/28 15:08:50 jmc Exp $ +.\" $OpenBSD: merge.1,v 1.4 2018/06/07 11:37:21 jmc Exp $ .\" .\" Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -14,7 +14,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: October 28 2010 $ +.Dd $Mdocdate: June 7 2018 $ .Dt MERGE 1 .Os .Sh NAME @@ -57,16 +57,7 @@ Be quiet about reporting. .It Fl V Print RCS's version number. .El -.Sh EXAMPLES -Using labels: -.Bd -literal -offset indent -$ merge -q -p -L one -L two -L three file1 file2 file3 -<<<<<<< one -======= -bar ->>>>>>> three -.Ed -.Sh DIAGNOSTICS +.Sh EXIT STATUS The .Nm utility exits with one of the following values: @@ -79,6 +70,15 @@ Overlaps were found. .It 2 An error occurred. .El +.Sh EXAMPLES +Using labels: +.Bd -literal -offset indent +$ merge -q -p -L one -L two -L three file1 file2 file3 +<<<<<<< one +======= +bar +>>>>>>> three +.Ed .Sh SEE ALSO .Xr co 1 , .Xr diff 1 , |