aboutsummaryrefslogtreecommitdiff
path: root/share/man/man9/utopia.9
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2004-07-03 22:53:50 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2004-07-03 22:53:50 +0000
commit651aa6348e02b29d51f3b0153eeb0b80f833a901 (patch)
tree9e3fd2e88cd548e4aca100c668d74175a7dfa0d5 /share/man/man9/utopia.9
parent30950a21e11892bddfb8f6b190ee2b693803cddf (diff)
Merge junk.
Notes
Notes: svn path=/head/; revision=131540
Diffstat (limited to 'share/man/man9/utopia.9')
-rw-r--r--share/man/man9/utopia.97
1 files changed, 1 insertions, 6 deletions
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index f35fca62533c..170eebc2d051 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -230,14 +230,9 @@ Twisted pair diagnostic loopback.
Diagnostic path loopback.
.El
.It Va chip
-<<<<<<< utopia.9
This points the a function vector for chip specific functions.
Two fields
-in this vector a publically available:
-=======
-This points the a function vector for chip specific functions. Two fields
-in this vector are publicly available:
->>>>>>> 1.3
+in this vector are publically available:
.Bl -tag -width XXX
.It Va type
This is the type of the detected PHY chip.