From 7209095dbd23b037824b0c7a8c71f3249c0680cd Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Wed, 10 Dec 2014 17:39:17 +0000
Subject: Bug 1103029 - Remove the deprecated backward compatible key names in
 Bugzilla.time. r=gerv, a=dkl.

---
 Bugzilla/WebService/Bugzilla.pm      | 24 ------------------------
 docs/en/rst/api/core/v1/bugzilla.rst | 18 +-----------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm
index 8333f99c4..b4ebd55ae 100644
--- a/Bugzilla/WebService/Bugzilla.pm
+++ b/Bugzilla/WebService/Bugzilla.pm
@@ -112,10 +112,6 @@ sub time {
     return {
         db_time       => $self->type('dateTime', $db_time),
         web_time      => $self->type('dateTime', $now_utc),
-        web_time_utc  => $self->type('dateTime', $now_utc),
-        tz_name       => $self->type('string', 'UTC'),
-        tz_offset     => $self->type('string', '+0000'),
-        tz_short_name => $self->type('string', 'UTC'),
     };
 }
 
@@ -357,26 +353,6 @@ a different source. If it's any more different than a second, then there is
 likely some problem with this Bugzilla instance. In this case you should
 rely on the C<db_time>, not the C<web_time>.
 
-=item C<web_time_utc>
-
-Identical to C<web_time>. (Exists only for backwards-compatibility with
-versions of Bugzilla before 3.6.)
-
-=item C<tz_name>
-
-C<string> The literal string C<UTC>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
-=item C<tz_short_name>
-
-C<string> The literal string C<UTC>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
-=item C<tz_offset>
-
-C<string> The literal string C<+0000>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
 =back
 
 =item B<History>
diff --git a/docs/en/rst/api/core/v1/bugzilla.rst b/docs/en/rst/api/core/v1/bugzilla.rst
index 2dd40e0cb..b066eca0c 100644
--- a/docs/en/rst/api/core/v1/bugzilla.rst
+++ b/docs/en/rst/api/core/v1/bugzilla.rst
@@ -110,12 +110,8 @@ what timezone it's running in.
 .. code-block:: js
 
    {
-     "web_time_utc": "2014-09-26T18:01:30Z",
      "db_time": "2014-09-26T18:01:30Z",
      "web_time": "2014-09-26T18:01:30Z",
-     "tz_offset": "+0000",
-     "tz_short_name": "UTC",
-     "tz_name": "UTC"
    }
 
 =============  ======  ==========================================================
@@ -128,7 +124,7 @@ db_time        string  The current time in UTC, according to the Bugzilla
                        webserver are running in the same time zone. However,
                        if the web server and the database server aren't
                        synchronized or some reason, *this* is the time that
-                       you should rely on or doing searches and other input
+                       you should rely on for doing searches and other input
                        to the WebService.
 web_time       string  This is the current time in UTC, according to
                        Bugzilla's web server.
@@ -139,18 +135,6 @@ web_time       string  This is the current time in UTC, according to
                        some problem with this Bugzilla instance. In this
                        case you should rely  on the ``db_time``, not the
                        ``web_time``.
-web_time_utc   string  Identical to ``web_time``. (Exists only for
-                       backwards-compatibility with versions of Bugzilla
-                       before 3.6.)
-tz_name        string  The literal string ``UTC``. (Exists only for
-                       backwards-compatibility with versions of Bugzilla
-                       before 3.6.)
-tz_short_name  string  The literal string ``UTC``. (Exists only for
-                       backwards-compatibility with versions of Bugzilla
-                       before 3.6.)
-tz_offset      string  The literal string ``+0000``. (Exists only for
-                       backwards-compatibility with versions of Bugzilla
-                       before 3.6.)
 =============  ======  ==========================================================
 
 Parameters
-- 
cgit v1.2.3-24-g4f1b