2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f5d6b0e6f..12a217f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051213
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2005/11/30 11:18:27
+     [ssh.1]
+     timezone -> time zone
+
 20051201
  - (djm) [envpass.sh] Remove regress script that was accidentally committed 
    in top level directory and not noticed for over a year :)
@@ -3389,4 +3395,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.4016 2005/12/01 01:51:59 djm Exp $
+$Id: ChangeLog,v 1.4017 2005/12/13 08:25:21 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 8e0f37719..6342d3cdc 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.212 2005/09/19 23:31:31 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.213 2005/11/30 11:18:27 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -975,7 +975,7 @@ with the current shell or command.
 If the current session has no tty,
 this variable is not set.
 .It Ev TZ
-The timezone variable is set to indicate the present timezone if it
+The time zone variable is set to indicate the present time zone if it
 was set when the daemon was started (i.e., the daemon passes the value
 on to new connections).
 .It Ev USER