aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2018-09-24 13:52:52 -0700
committerGitHub <noreply@github.com>2018-09-24 13:52:52 -0700
commit4426cb573356c5ff710bff8ac8a1170baac7dcf0 (patch)
tree06576f99fdb8df9022d4a14d794e1fcb5bffc3eb /src
parent54176b26a9be6c9903b375596b778f51f5947921 (diff)
parent10360e342ff842bb2e828b8c038710d6f9dc6d4f (diff)
downloadprotobuf-4426cb573356c5ff710bff8ac8a1170baac7dcf0.tar.gz
protobuf-4426cb573356c5ff710bff8ac8a1170baac7dcf0.tar.bz2
protobuf-4426cb573356c5ff710bff8ac8a1170baac7dcf0.zip
Merge pull request #5172 from shields/smear-comments
Smear comments
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/timestamp.proto24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/google/protobuf/timestamp.proto b/src/google/protobuf/timestamp.proto
index 3faa3ab7..05d988a4 100644
--- a/src/google/protobuf/timestamp.proto
+++ b/src/google/protobuf/timestamp.proto
@@ -40,17 +40,19 @@ option java_outer_classname = "TimestampProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
-// A Timestamp represents a point in time independent of any time zone
-// or calendar, represented as seconds and fractions of seconds at
-// nanosecond resolution in UTC Epoch time. It is encoded using the
-// Proleptic Gregorian Calendar which extends the Gregorian calendar
-// backwards to year one. It is encoded assuming all minutes are 60
-// seconds long, i.e. leap seconds are "smeared" so that no leap second
-// table is needed for interpretation. Range is from
-// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
-// By restricting to that range, we ensure that we can convert to
-// and from RFC 3339 date strings.
-// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
+// A Timestamp represents a point in time independent of any time zone or local
+// calendar, encoded as a count of seconds and fractions of seconds at
+// nanosecond resolution. The count is relative to an epoch at UTC midnight on
+// January 1, 1970, in the proleptic Gregorian calendar which extends the
+// Gregorian calendar backwards to year one.
+//
+// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
+// second table is needed for interpretation, using a [24-hour linear
+// smear](https://developers.google.com/time/smear).
+//
+// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
+// restricting to that range, we ensure that we can convert to and from [RFC
+// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
//
// # Examples
//