3 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ae9d4622..24c3a23bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20050309
  - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64
    so that regress tests behave.  From Chris Adams.
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2005/03/07 23:41:54
+     [ssh.1 ssh_config.5]
+     more macro simplification;
 
 20050307
  - (dtucker) [configure.ac] Disable gettext search when configuring with
@@ -2310,4 +2314,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3703 2005/03/08 23:02:55 dtucker Exp $
+$Id: ChangeLog,v 1.3704 2005/03/09 00:00:05 djm Exp $
diff --git a/ssh.1 b/ssh.1
index fbaaed5a2..e6f4b4a54 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.204 2005/03/02 11:45:01 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.205 2005/03/07 23:41:54 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -585,7 +585,7 @@ Port forwardings can also be specified in the configuration file.
 IPv6 addresses can be specified with an alternative syntax:
 .Sm off
 .Xo
-.Oo Ar bind_address No / Oc
+.Op Ar bind_address No /
 .Ar port No / Ar host No /
 .Ar hostport
 .Xc
@@ -761,7 +761,7 @@ IPv6 addresses can be specified by enclosing the address in square braces or
 using an alternative syntax:
 .Sm off
 .Xo
-.Oo Ar bind_address No / Oc
+.Op Ar bind_address No /
 .Ar host No / Ar port No /
 .Ar hostport
 .Xc .
diff --git a/ssh_config.5 b/ssh_config.5
index 32778edbb..06db04c27 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.46 2005/03/01 14:55:23 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.47 2005/03/07 23:41:54 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -504,12 +504,12 @@ The first argument must be a port number, and the second must be
 .Xc .
 IPv6 addresses can be specified by enclosing addresses in square brackets or
 by using an alternative syntax:
-.Xo
 .Sm off
-.Oo Ar bind_address No / Oc
+.Xo
+.Op Ar bind_address No /
 .Ar host No / Ar port
-.Sm on
 .Xc .
+.Sm on
 Multiple forwardings may be specified, and additional forwardings can be
 given on the command line.
 Only the superuser can forward privileged ports.
@@ -641,12 +641,12 @@ The first argument must be a port number, and the second must be
 .Xc .
 IPv6 addresses can be specified by enclosing any addresses in square brackets
 or by using the alternative syntax:
-.Xo
 .Sm off
-.Oo Ar bind_address No / Oc
+.Xo
+.Op Ar bind_address No /
 .Ar host No / Ar port
-.Sm on
 .Xc .
+.Sm on
 Multiple forwardings may be specified, and additional
 forwardings can be given on the command line.
 Only the superuser can forward privileged ports.