diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-03-01 11:43:07 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-03-01 11:43:07 -0500 |
| commit | 142d1b205803a4d2796444a7b9b1a1823033dd75 (patch) | |
| tree | 1da0bd4b654fc273b9f20820956e098b75b90766 | |
| parent | e652cebfb0812bf9a7c35aaeb9804bfa0ecc900d (diff) | |
| parent | a09cf71865330b0fb300fdbfcdd32a7850b47096 (diff) | |
| download | illumos-joyent-142d1b205803a4d2796444a7b9b1a1823033dd75.tar.gz | |
Merge commit 'refs/changes/11/2011/11' of https://code.illumos.org/illumos-gate into ipd4
| -rw-r--r-- | usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c | 4 | ||||
| -rw-r--r-- | usr/src/man/man1/pfexec.1 | 6 | ||||
| -rw-r--r-- | usr/src/man/man4i/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/man/man7/overlay.7 | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c b/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c index 0ef0dde39d..4682f4cf1f 100644 --- a/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c +++ b/usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c @@ -31,8 +31,8 @@ * * Project Location * ------- -------- - * Solaris usr/src/cmd/dcs/sparc/sun4u/%M% - * SMS src/sms/lib/librdr/%M% + * Solaris usr/src/cmd/dcs/sparc/sun4u/rdr_messages.c + * SMS src/sms/lib/librdr/rdr_messages.c * * In order for proper communication to occur, the files in the * above locations must match exactly. Any changes that are made diff --git a/usr/src/man/man1/pfexec.1 b/usr/src/man/man1/pfexec.1 index 90f6fda374..c058dab9fb 100644 --- a/usr/src/man/man1/pfexec.1 +++ b/usr/src/man/man1/pfexec.1 @@ -58,12 +58,6 @@ For \fBpfexec\fR to function correctly, the \fBpfexecd\fR daemon must be running in the current zone. This is normally managed by the "\fBsvc:/system/pfexec:default\fR" SMF service (see \fBsmf\fR(7)). .SH USAGE -.sp -.LP -For \fBpfexec\fR to function correctly, the \fBpfexecd\fR daemon must be running -in the current zone. This is normally managed by the -"\fBsvc:/system/pfexec:default\fR" SMF service (see \fBsmf\fR(5)). -.SH USAGE .LP \fBpfexec\fR is used to execute commands with predefined process attributes, such as specific user or group \fBID\fRs. diff --git a/usr/src/man/man4i/Makefile b/usr/src/man/man4i/Makefile index 4993b4a34d..4c8d7406af 100644 --- a/usr/src/man/man4i/Makefile +++ b/usr/src/man/man4i/Makefile @@ -41,9 +41,9 @@ MANFILES= audio.4i \ visual_io.4i \ vt.4i -MANLINKS= uccid.7i +MANLINKS= uccid.4i -uccid.7i := LINKSRC = ../man7d/ccid.7d +uccid.7i := LINKSRC = ../man4d/ccid.4d .KEEP_STATE: diff --git a/usr/src/man/man7/overlay.7 b/usr/src/man/man7/overlay.7 index e9be5b95cf..708281aeda 100644 --- a/usr/src/man/man7/overlay.7 +++ b/usr/src/man/man7/overlay.7 @@ -516,6 +516,6 @@ The overlay driver is self-healing. If the problem corrects itself on its own, it will clear the fault on the corresponding device. .Sh SEE ALSO +.Xr vxlan 4P , .Xr overlay_files 5 , -.Xr vxlan 7P , .Xr dladm 8 |