From 91685a2c0e1d2192c65d065143aad927010b3191 Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Thu, 14 Aug 2003 12:41:40 +0000
Subject: [PATCH] Add manpath for OpenBSD manual pages, with this change manual
 page entities for OpenSSH (ssh(1), etc.) will work.  A vendor attribute
 'openbsd' was added for this purpose.

---
 share/sgml/freebsd.dsl  |  1 +
 share/sgml/man-refs.ent | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl
index dfd7cb4621..a281d3b667 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/sgml/freebsd.dsl
@@ -193,6 +193,7 @@
               (("current") (string-append u "&" "manpath=FreeBSD+5.1-current"))
               (("xfree86") (string-append u "&" "manpath=XFree86+4.3.0"))
               (("netbsd")  (string-append u "&" "manpath=NetBSD+1.6.1"))
+              (("openbsd") (string-append u "&" "manpath=OpenBSD+3.3"))
               (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
               (else u))))
 
diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index 2aa857d8bf..15007d6a4d 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -9,9 +9,9 @@
 
      If the manual page does not belong to the base system, you have to
      set the vendor attribute, in order to select the right manual page
-     collection.  Four different vendor values are available at this
-     moment: xfree86, ports, netbsd and current.  Look at man.X.7 entry for an
-     example.
+     collection.  Five different vendor values are available at this
+     moment: xfree86, ports, netbsd, openbsd and current.
+     Look at man.XFree86.1 entry for an example.
 
      Please keep these in order so that the lazier types can automate
      the task of editing this file.  All the man pages in one section
@@ -525,7 +525,7 @@
 <!ENTITY man.sccs.1 "<citerefentry/<refentrytitle/sccs/<manvolnum/1//">
 <!ENTITY man.sched.1 "<citerefentry/<refentrytitle/sched/<manvolnum/1//">
 <!ENTITY man.scon.1 "<citerefentry/<refentrytitle/scon/<manvolnum/1//">
-<!ENTITY man.scp.1 "<citerefentry/<refentrytitle/scp/<manvolnum/1//">
+<!ENTITY man.scp.1 "<citerefentry vendor='openbsd'/<refentrytitle/scp/<manvolnum/1//">
 <!ENTITY man.script.1 "<citerefentry/<refentrytitle/script/<manvolnum/1//">
 <!ENTITY man.sdiff.1 "<citerefentry/<refentrytitle/sdiff/<manvolnum/1//">
 <!ENTITY man.sed.1 "<citerefentry/<refentrytitle/sed/<manvolnum/1//">
@@ -537,7 +537,7 @@
 <!ENTITY man.settc.1 "<citerefentry/<refentrytitle/settc/<manvolnum/1//">
 <!ENTITY man.setty.1 "<citerefentry/<refentrytitle/setty/<manvolnum/1//">
 <!ENTITY man.setvar.1 "<citerefentry/<refentrytitle/setvar/<manvolnum/1//">
-<!ENTITY man.sftp.1 "<citerefentry/<refentrytitle/sftp/<manvolnum/1//">
+<!ENTITY man.sftp.1 "<citerefentry vendor='openbsd'/<refentrytitle/sftp/<manvolnum/1//">
 <!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'/<refentrytitle/sgmlnorm/<manvolnum/1//">
 <!ENTITY man.sgsc.1 "<citerefentry/<refentrytitle/sgsc/<manvolnum/1//">
 <!ENTITY man.sh.1 "<citerefentry/<refentrytitle/sh/<manvolnum/1//">
@@ -553,11 +553,11 @@
 <!ENTITY man.sort.1 "<citerefentry/<refentrytitle/sort/<manvolnum/1//">
 <!ENTITY man.source.1 "<citerefentry/<refentrytitle/source/<manvolnum/1//">
 <!ENTITY man.split.1 "<citerefentry/<refentrytitle/split/<manvolnum/1//">
-<!ENTITY man.ssh.1 "<citerefentry/<refentrytitle/ssh/<manvolnum/1//">
-<!ENTITY man.ssh-add.1 "<citerefentry/<refentrytitle/ssh-add/<manvolnum/1//">
-<!ENTITY man.ssh-agent.1 "<citerefentry/<refentrytitle/ssh-agent/<manvolnum/1//">
-<!ENTITY man.ssh-keygen.1 "<citerefentry/<refentrytitle/ssh-keygen/<manvolnum/1//">
-<!ENTITY man.ssh-keyscan.1 "<citerefentry/<refentrytitle/ssh-keyscan/<manvolnum/1//">
+<!ENTITY man.ssh.1 "<citerefentry vendor='openbsd'/<refentrytitle/ssh/<manvolnum/1//">
+<!ENTITY man.ssh-add.1 "<citerefentry vendor='openbsd'/<refentrytitle/ssh-add/<manvolnum/1//">
+<!ENTITY man.ssh-agent.1 "<citerefentry vendor='openbsd'/<refentrytitle/ssh-agent/<manvolnum/1//">
+<!ENTITY man.ssh-keygen.1 "<citerefentry vendor='openbsd'/<refentrytitle/ssh-keygen/<manvolnum/1//">
+<!ENTITY man.ssh-keyscan.1 "<citerefentry vendor='openbsd'/<refentrytitle/ssh-keyscan/<manvolnum/1//">
 <!ENTITY man.startslip.1 "<citerefentry/<refentrytitle/startslip/<manvolnum/1//">
 <!ENTITY man.startx.1 "<citerefentry vendor='xfree86'/<refentrytitle/startx/<manvolnum/1//">
 <!ENTITY man.stat.1 "<citerefentry/<refentrytitle/stat/<manvolnum/1//">
@@ -3622,8 +3622,8 @@
 <!ENTITY man.services.5 "<citerefentry/<refentrytitle/services/<manvolnum/5//">
 <!ENTITY man.shells.5 "<citerefentry/<refentrytitle/shells/<manvolnum/5//">
 <!ENTITY man.skey.access.5 "<citerefentry/<refentrytitle/skey.access/<manvolnum/5//">
-<!ENTITY man.ssh.config.5 "<citerefentry/<refentrytitle/ssh_config/<manvolnum/5//">
-<!ENTITY man.sshd.config.5 "<citerefentry/<refentrytitle/sshd_config/<manvolnum/5//">
+<!ENTITY man.ssh.config.5 "<citerefentry vendor='openbsd'/<refentrytitle/ssh_config/<manvolnum/5//">
+<!ENTITY man.sshd.config.5 "<citerefentry vendor='openbsd'/<refentrytitle/sshd_config/<manvolnum/5//">
 <!ENTITY man.stab.5 "<citerefentry/<refentrytitle/stab/<manvolnum/5//">
 <!ENTITY man.sysctl.conf.5 "<citerefentry/<refentrytitle/sysctl.conf/<manvolnum/5//">
 <!ENTITY man.syslog.conf.5 "<citerefentry/<refentrytitle/syslog.conf/<manvolnum/5//">
@@ -4115,7 +4115,7 @@
 <!ENTITY man.setfsmac.8 "<citerefentry/<refentrytitle/setfsmac/<manvolnum/8//">
 <!ENTITY man.setkey.8 "<citerefentry/<refentrytitle/setkey/<manvolnum/8//">
 <!ENTITY man.setpmac.8 "<citerefentry/<refentrytitle/setpmac/<manvolnum/8//">
-<!ENTITY man.sftp-server.8 "<citerefentry/<refentrytitle/sftp-server/<manvolnum/8//">
+<!ENTITY man.sftp-server.8 "<citerefentry vendor='openbsd'/<refentrytitle/sftp-server/<manvolnum/8//">
 <!ENTITY man.showmount.8 "<citerefentry/<refentrytitle/showmount/<manvolnum/8//">
 <!ENTITY man.shutdown.8 "<citerefentry/<refentrytitle/shutdown/<manvolnum/8//">
 <!ENTITY man.sicontrol.8 "<citerefentry/<refentrytitle/sicontrol/<manvolnum/8//">
@@ -4127,8 +4127,8 @@
 <!ENTITY man.spkrtest.8 "<citerefentry/<refentrytitle/spkrtest/<manvolnum/8//">
 <!ENTITY man.spppcontrol.8 "<citerefentry/<refentrytitle/spppcontrol/<manvolnum/8//">
 <!ENTITY man.spray.8 "<citerefentry/<refentrytitle/spray/<manvolnum/8//">
-<!ENTITY man.ssh-keysign.8 "<citerefentry/<refentrytitle/ssh-keysign/<manvolnum/8//">
-<!ENTITY man.sshd.8 "<citerefentry/<refentrytitle/sshd/<manvolnum/8//">
+<!ENTITY man.ssh-keysign.8 "<citerefentry vendor='openbsd'/<refentrytitle/ssh-keysign/<manvolnum/8//">
+<!ENTITY man.sshd.8 "<citerefentry vendor='openbsd'/<refentrytitle/sshd/<manvolnum/8//">
 <!ENTITY man.ssl.8 "<citerefentry/<refentrytitle/ssl/<manvolnum/8//">
 <!ENTITY man.sticky.8 "<citerefentry/<refentrytitle/sticky/<manvolnum/8//">
 <!ENTITY man.stlload.8 "<citerefentry/<refentrytitle/stlload/<manvolnum/8//">