diff --git a/google/protobuf/source_location.proto b/google/protobuf/source_location.proto deleted file mode 100644 index 397a1ef6c..000000000 --- a/google/protobuf/source_location.proto +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2014, Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.protobuf; - -option java_multiple_files = true; -option java_outer_classname = "SourceLocationProto"; -option java_package = "com.google.protobuf"; - - -// `SourceLocation` represents the location of the original .proto source of a -// protobuf element described by Api, Type, or Enum. -message SourceLocation { - // The path-qualified name of the .proto file that contained the associated - // protobuf element. For example: `"google/protobuf/source.proto"`. - string file_name = 1; -} diff --git a/google/pubsub/v1beta2/pubsub.proto b/google/pubsub/v1beta2/pubsub.proto index 8e5d0f113..d3a38f1c8 100644 --- a/google/pubsub/v1beta2/pubsub.proto +++ b/google/pubsub/v1beta2/pubsub.proto @@ -364,9 +364,11 @@ message ModifyAckDeadlineRequest { // The acknowledgment ID. string ack_id = 2; - // The new ack deadline. For example, if the value is 10, the new ack - // deadline will expire 10 seconds after this call was made. Specifying zero - // may immediately make the message available for another pull request. + // The new ack deadline with respect to the time this request was sent to the + // Pub/Sub system. Must be >= 0. For example, if the value is 10, the new ack + // deadline will expire 10 seconds after the ModifyAckDeadline call was made. + // Specifying zero may immediately make the message available for another pull + // request. int32 ack_deadline_seconds = 3; } diff --git a/google/rpc/error_details.proto b/google/rpc/error_details.proto index a5b368719..e0a7b5587 100644 --- a/google/rpc/error_details.proto +++ b/google/rpc/error_details.proto @@ -16,7 +16,6 @@ syntax = "proto3"; package google.rpc; -import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; option java_multiple_files = true; @@ -42,7 +41,7 @@ message RetryInfo { google.protobuf.Duration retry_delay = 1; } -// Describes additional debugging info. This is only meant for internal clients. +// Describes additional debugging info. message DebugInfo { // The stack trace entries indicating where the error occurred. repeated string stack_entries = 1; diff --git a/google/type/date.proto b/google/type/date.proto index 38ced0b10..a12090b8a 100644 --- a/google/type/date.proto +++ b/google/type/date.proto @@ -28,7 +28,7 @@ option java_package = "com.google.type"; // represent a year and month where the day is not significant, e.g. credit card // expiration date. The year may be 0 to represent a month and day independent // of year, e.g. anniversary date. Related types are [google.type.TimeOfDay][google.type.TimeOfDay] -// and [google.protobuf.Timestamp][]. +// and [google.protobuf.Timestamp][google.protobuf.Timestamp]. message Date { // Year of date. Must be from 1 to 9,999, or 0 if specifying a date without // a year. diff --git a/google/type/latlng.proto b/google/type/latlng.proto index 4166d7fdc..198decc0e 100644 --- a/google/type/latlng.proto +++ b/google/type/latlng.proto @@ -22,17 +22,15 @@ option java_outer_classname = "LatLngProto"; option java_package = "com.google.type"; -// An object representing a latitude,longitude pair. This is expressed as a pair +// An object representing a latitude/longitude pair. This is expressed as a pair // of doubles representing degrees latitude and degrees longitude. Unless -// specified otherwise, this should conform to the WGS84 standard. Values should -// be within normalized ranges. An API may allow wider ranges in which case it -// should convert them to normalized values. +// specified otherwise, this must conform to the +// WGS84 +// standard. Values must be within normalized ranges. message LatLng { - // The latitude in degrees. It should be in the range [-90.0, +90.0]. An API - // may allow a wider range and should convert to normalized values. + // The latitude in degrees. It must be in the range [-90.0, +90.0]. double latitude = 1; - // The longitude in degrees. It should be in the range [-180.0, +180.0]. An - // API may allow a wider range and should convert to normalized values. + // The longitude in degrees. It must be in the range [-180.0, +180.0]. double longitude = 2; } diff --git a/google/type/timeofday.proto b/google/type/timeofday.proto index c9114ed84..f39266e00 100644 --- a/google/type/timeofday.proto +++ b/google/type/timeofday.proto @@ -24,7 +24,7 @@ option java_package = "com.google.type"; // Represents a time of day. The date and time zone are either not significant // or are specified elsewhere. An API may chose to allow leap seconds. Related -// types are [google.type.Date][google.type.Date] and [google.protobuf.Timestamp][]. +// types are [google.type.Date][google.type.Date] and [google.protobuf.Timestamp][google.protobuf.Timestamp]. message TimeOfDay { // Hours of day in 24 hour format. Should be from 0 to 23. An API may choose // to allow the value "24:00:00" for scenarios like business closing time.