Module Name:    src
Committed By:   wiz
Date:           Sun Apr 16 06:36:03 UTC 2017

Modified Files:
        src/share/man/man9: bus_space.9 klua_lock.9

Log Message:
Merge "userland" to be consistent with other man pages.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/share/man/man9/bus_space.9
cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/klua_lock.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/bus_space.9
diff -u src/share/man/man9/bus_space.9:1.50 src/share/man/man9/bus_space.9:1.51
--- src/share/man/man9/bus_space.9:1.50	Fri Sep 16 08:26:16 2016
+++ src/share/man/man9/bus_space.9	Sun Apr 16 06:36:03 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: bus_space.9,v 1.50 2016/09/16 08:26:16 wiz Exp $
+.\" $NetBSD: bus_space.9,v 1.51 2017/04/16 06:36:03 wiz Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1921,7 +1921,7 @@ That has a potentially significant perfo
 .It
 Exporting the
 .Nm
-functions to user-land so that applications
+functions to userland so that applications
 (such as X servers) have easier, more portable access to device space.
 .It
 Redefining bus space tags and handles so that machine-independent bus

Index: src/share/man/man9/klua_lock.9
diff -u src/share/man/man9/klua_lock.9:1.4 src/share/man/man9/klua_lock.9:1.5
--- src/share/man/man9/klua_lock.9:1.4	Sat Apr 15 18:03:02 2017
+++ src/share/man/man9/klua_lock.9	Sun Apr 16 06:36:03 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: klua_lock.9,v 1.4 2017/04/15 18:03:02 sevan Exp $
+.\"	$NetBSD: klua_lock.9,v 1.5 2017/04/16 06:36:03 wiz Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -86,13 +86,13 @@ The second element
 is used to protect integrity during cross-thread access to the Lua state.
 The third element
 .Ft ks_user
-indicates whether the structure was created from the kernel space or user land.
+indicates whether the structure was created from the kernel space or userland.
 This parameter is used in the logic of
 .Xr luactl 8 ,
 to prohibit the destruction of state from an opposing side.
-Destroying kernel state from user land for example.
+Destroying kernel state from userland for example.
 .Pp
-The kernel Lua API is designed after the user land Lua API.
+The kernel Lua API is designed after the userland Lua API.
 .Ss List of Functions
 .Bl -column "kluaL_newstateX" "luaL_newstateX" "create a Lua state with custom allocatorX"
 .It Sy kernel API Ta Sy userland API Ta Sy Description

Reply via email to