From 7b08d49e9d8eea1097ce61b1295a45d4da00a144 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 11 Jan 2016 14:52:01 -0800 Subject: [PATCH] Fix typos in README.md/CHANGES.txt --- CHANGES.txt | 20 ++++++++++---------- cmake/README.md | 6 +++--- csharp/CHANGES.txt | 2 +- objectivec/README.md | 2 +- protoc-artifacts/README.md | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c710cd5e7f..3023c812cd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,6 @@ -2015-08-26 version 3.0.0-beta-1 (C++/Java/Python/Ruby/Nano/Objective-C/C#/JavaSript) +2015-08-26 version 3.0.0-beta-1 (C++/Java/Python/Ruby/Nano/Objective-C/C#/JavaScript) General - * Intorduced a new language implementaion: JavaScript. + * Introduced a new language implementation: JavaScript. * Added a new field option "json_name". By default proto field names are converted to "lowerCamelCase" in proto3 JSON format. This option can be used to override this behavior and specify a different JSON name for the @@ -176,7 +176,7 @@ still disable packed serialization by setting packed to false for now. * Added well-known type protos (any.proto, empty.proto, timestamp.proto, duration.proto, etc.). Users can import and use these protos just like - regular proto files. Addtional runtime support will be added for them in + regular proto files. Additional runtime support will be added for them in future releases (in the form of utility helper functions, or having them replaced by language specific types in generated code). * Added a "reserved" keyword in both proto2 and proto3 syntax. User can use @@ -218,7 +218,7 @@ https://github.com/jskeet/protobuf-csharp-port. The original project was frozen and all the new development will happen here. * Codegen plugin for C# was completely rewritten to C++ and is now an - intergral part of protoc. + integral part of protoc. * Some refactorings and cleanup has been applied to the C# runtime library. * Only proto2 is supported in C# at the moment, proto3 support is in progress and will likely bring significant breaking changes to the API. @@ -382,7 +382,7 @@ This release (v3.0.0-alpha-1) includes partial proto3 support for C++ and Java. Items 6 (well-known types) and 7 (JSON format) in the above feature - list are not impelmented. + list are not implemented. A new notion "syntax" is introduced to specify whether a .proto file uses proto2 or proto3: @@ -483,7 +483,7 @@ } * Files, services, enums, messages, methods and enum values can be marked as deprecated now. - * Added Support for list values, including lists of mesaages, when + * Added Support for list values, including lists of messages, when parsing text-formatted protos in C++ and Java. For example: foo: [1, 2, 3] @@ -563,7 +563,7 @@ Python * Added support for dynamic message creation. DescriptorDatabase, - DescriptorPool, and MessageFactory work like their C++ couterparts to + DescriptorPool, and MessageFactory work like their C++ counterparts to simplify Descriptor construction from *DescriptorProtos, and MessageFactory provides a message instance from a Descriptor. * Added pickle support for protobuf messages. @@ -577,7 +577,7 @@ 2011-05-01 version 2.4.1: C++ - * Fixed the frendship problem for old compilers to make the library now gcc 3 + * Fixed the friendship problem for old compilers to make the library now gcc 3 compatible again. * Fixed vcprojects/extract_includes.bat to extract compiler/plugin.h. @@ -844,7 +844,7 @@ * Fixed tendency for TextFormat's parsing to overflow the stack when parsing large string values. The underlying problem is with Java's regex implementation (which unfortunately uses recursive backtracking - rather than building an NFA). Worked around by making use of possesive + rather than building an NFA). Worked around by making use of possessive quantifiers. * Generated service classes now also generate pure interfaces. For a service Foo, Foo.Interface is a pure interface containing all of the service's @@ -858,7 +858,7 @@ RPC implementations will have to implement the new interfaces in order to support blocking mode. * New I/O methods parseDelimitedFrom(), mergeDelimitedFrom(), and - writeDelimitedTo() read and write "delemited" messages from/to a stream, + writeDelimitedTo() read and write "delimited" messages from/to a stream, meaning that the message size precedes the data. This way, you can write multiple messages to a stream without having to worry about delimiting them yourself. diff --git a/cmake/README.md b/cmake/README.md index b3042e6cf2..58aae8e9ff 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -28,11 +28,11 @@ Create a folder where protobuf headers/libraries/binaries will be installed afte C:\Path\to>mkdir install -If *cmake* command is not avaliable from *Command Prompt*, add it to system *PATH* variable: +If *cmake* command is not available from *Command Prompt*, add it to system *PATH* variable: C:\Path\to>set PATH=%PATH%;C:\Program Files (x86)\CMake\bin -If *git* command is not avaliable from *Command Prompt*, add it to system *PATH* variable: +If *git* command is not available from *Command Prompt*, add it to system *PATH* variable: C:\Path\to>set PATH=%PATH%;C:\Program Files\Git\cmd @@ -218,7 +218,7 @@ It sounds not so strange and it works. This will create the following folders under the *install* location: * bin - that contains protobuf *protoc.exe* compiler; - * inclue - that contains C++ headers and protobuf *.proto files; + * include - that contains C++ headers and protobuf *.proto files; * lib - that contains linking libraries and *CMake* configuration files for *protobuf* package. Now you can if needed: diff --git a/csharp/CHANGES.txt b/csharp/CHANGES.txt index b29debb894..a87cd4d5df 100644 --- a/csharp/CHANGES.txt +++ b/csharp/CHANGES.txt @@ -128,7 +128,7 @@ Fixes: - Issue 12: default value for enumerate fields must be filled out Other: -- Rewrite of build using MSBbuild instead of NAnt +- Rewrite of build using MSbuild instead of NAnt - Moved to NUnit Version 2.2.8.0 - Changed to using secure .snk for releases diff --git a/objectivec/README.md b/objectivec/README.md index 452feca466..c7313e4fe9 100644 --- a/objectivec/README.md +++ b/objectivec/README.md @@ -10,7 +10,7 @@ This directory contains the Objective C Protocol Buffers runtime library. Requirements ------------ -The Objective C implemention requires: +The Objective C implementation requires: - Objective C 2.0 Runtime (32bit & 64bit iOS, 64bit OS X). - Xcode 7.0 (or later). diff --git a/protoc-artifacts/README.md b/protoc-artifacts/README.md index 06091cfe98..4320f6516d 100644 --- a/protoc-artifacts/README.md +++ b/protoc-artifacts/README.md @@ -55,7 +55,7 @@ read [this page](http://central.sonatype.org/pages/apache-maven.html) on how to configure GPG and Sonatype account. You need to perform the deployment for every platform that you want to -suppport. DO NOT close the staging repository until you have done the +support. DO NOT close the staging repository until you have done the deployment for all platforms. Currently the following platforms are supported: - Linux (x86_32 and x86_64) - Windows (x86_32 and x86_64) with @@ -134,7 +134,7 @@ stored: ``` ### Tested build environments -We have succesfully built artifacts on the following environments: +We have successfully built artifacts on the following environments: - Linux x86_32 and x86_64: - Centos 6.6 (within Docker 1.6.1) - Ubuntu 14.04.2 64-bit