diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /src/google/protobuf/duration.proto | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'src/google/protobuf/duration.proto')
| -rw-r--r-- | src/google/protobuf/duration.proto | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/duration.proto b/src/google/protobuf/duration.proto index 59420cc0..0ab970d3 100644 --- a/src/google/protobuf/duration.proto +++ b/src/google/protobuf/duration.proto @@ -44,7 +44,7 @@ option csharp_namespace = "Google.ProtocolBuffers"; // two Timestamp values is a Duration and it can be added or subtracted // from a Timestamp. Range is approximately +-10,000 years. // -// Example 1: compute Duration from two Timestamps in pseudo code. +// Example 1: Compute Duration from two Timestamps in pseudo code. // // Timestamp start = ...; // Timestamp end = ...; @@ -61,7 +61,7 @@ option csharp_namespace = "Google.ProtocolBuffers"; // duration.nanos += 1000000000; // } // -// Example 2: compute Timestamp from Timestamp + Duration in pseudo code. +// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. // // Timestamp start = ...; // Duration duration = ...; @@ -85,9 +85,9 @@ message Duration { // Signed fractions of a second at nanosecond resolution of the span // of time. Durations less than one second are represented with a 0 - // seconds field and a positive or negative nanos field. For durations - // of one second or more, a non-zero value for the nanos field must be - // of the same sign as the seconds field. Must be from -999,999,999 + // `seconds` field and a positive or negative `nanos` field. For durations + // of one second or more, a non-zero value for the `nanos` field must be + // of the same sign as the `seconds` field. Must be from -999,999,999 // to +999,999,999 inclusive. int32 nanos = 2; } |