[docs] Updated license and texts

LICENSE

@@ -173,30 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2011-2015 MAPS.ME, My.com, Benstar Limited
+Copyright 2011-2015 My.com B.V.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@ by other people and organizations and licensed in different ways:
 refer to their LICENCE, COPYING or NOTICE files for terms of use.
 See also data/copyright.html file for a full list.
 
-All images and media content are Copyright (C) 2011-2015 MAPS.ME,
+All images and media content are Copyright (C) 2011-2015 My.com B.V.,
 published under CC-BY 4.0 license.

README.md

@@ -45,27 +45,25 @@ format description, instructions on building a style and some links.
 
 ## Development
 
-You would need Qt 5 for development, most other libraries are included into the
-repository, see `3party` directory. The team uses mostly XCode and Qt Creator,
+You would need Boost and Qt 5 for development, most other libraries are included into the
+repository: see `3party` directory. The team uses mostly XCode and Qt Creator,
 though these are not mandatory. We have an established
 [coding style](https://github.com/mapsme/omim/blob/master/docs/CPP_STYLE.md).
-Our pull request review process may be intimidating, but it ensures a consistent
-code quality.
-
-All contributors must sign a [Contributor Agreement](https://github.com/mapsme/omim/blob/master/docs/CLA.md),
-so both ours and theirs rights are protected.
 
 See [CONTRIBUTING.md](https://github.com/mapsme/omim/blob/master/docs/CONTRIBUTING.md)
 for the repository initialization process, the description of all the directories
 of this repository and other development-related information.
 
+All contributors must sign a [Contributor Agreement](https://github.com/mapsme/omim/blob/master/docs/CLA.md),
+so both our and their rights are protected.
+
 ## Feedback
 
 Please report bugs and suggestions to [the issue tracker](https://github.com/mapsme/omim/issues),
 or by mail to [email protected].
 
 ## Authors and License
 
-This source code is Copyright (C) 2011-2015 MAPS.ME, published under Apache Public License 2.0,
+This source code is Copyright (C) 2011-2015 My.com B.V., published under Apache Public License 2.0,
 except third-party libraries. See [NOTICE](https://github.com/mapsme/omim/blob/master/NOTICE)
 and [copyright.html](data/coyright.html) files for more information.

docs/CLA.md

@@ -1,7 +1,7 @@
 # Contributor License Agreement
 
-To participate in MAPS.ME development, you need to sign an agreement, which
-enforces your and our rights to the code. Please read
+To participate in MAPS.ME development you need to sign an agreement.
+It protects your and our rights to the code. Please read
 [this nice article](http://infrequently.org/2008/06/why-do-i-need-to-sign-this/)
 for an elaboration on reasons to sign such agreements.
 

docs/CONTRIBUTING.md

@@ -4,9 +4,9 @@
 
 The simplest way to contribute is to [submit an issue](https://github.com/mapsme/omim/issues).
 Please give developers as much information as possible: OS and application versions,
-list of actions leading to a bug, a log file that the app produces.
+list of actions leading to a bug, a log file produced by the app.
 
-When using an app on a device, use the built-in "Report a bug" option:
+When using the MAPS.ME app on a device, use the built-in "Report a bug" option:
 it creates a new e-mail with a log file attached. Your issue will be processed much
 faster if you send it to [email protected].
 
@@ -58,8 +58,7 @@ See [CPP_STYLE.md](CPP_STYLE.md). Use `clang-format` when in doubt.
 All contributions to MAPS.ME source code should be submitted via github pull requests.
 Each pull request is reviewed by MAPS.ME employees, to ensure consistent code style
 and quality. Sometimes the review process even for smallest commits can be
-very thorough. Please be patient: you may learn something about C++ or our
-project in the process.
+very thorough.
 
 To contribute you must sign the [license agreement](CLA.md): the same one you
 sign for Google or Facebook open-source projects.
@@ -112,4 +111,4 @@ Some of these contain their own README files.
 ## Questions?
 
 For any questions about developing MAPS.ME and relevant services - virtually about anything related,
-please write us at [email protected], we'll be happy to help.
+please write to us at [email protected], we'll be happy to help.

docs/CPP_STYLE.md

@@ -7,7 +7,7 @@ Below are our specific (but not all!) exceptions to the Google's coding standard
 - We use `.cpp` and `.hpp` files, not `.cc` and `.h` (`.c` and `.h` are used for C code), in UTF-8 encoding.
 - File names are lowercase with underscores, like `file_reader.cpp`.
 - We use `#pragma once` instead of the `#define` Guard in header files.
-- We don't include system, std and boost headers directly, use `#include "../std/<wrapper.hpp>"`.
+- We don't include system, std and boost headers directly, use `#include "std/<wrapper.hpp>"`.
 - We ARE using C++ exceptions.
 - We are using all features of C++11 (the only known exception is thread_local which is not fully supported on all platforms).
 - We don't use boost libraries which require linking (and prefer C++11 types over their boost counterparts).
@@ -26,10 +26,10 @@ Naming and formatting
 - Space after double dash.
 - Compile-time constants must be named in camelCase, starting with a lower-case `k`, e.g. `kCompileTimeConstant`.
 - Values of enum classes must be named in CamelCase, e.g. `enum class Color { Red, Green, LightBlue };`.
-- Macroses and C-style enums must be named in UPPER_CASE, and enum values must be prefixed with a capitalized enum name.
+- Macros and C-style enums must be named in UPPER_CASE, and enum values must be prefixed with a capitalized enum name.
 
-    Note that macroses complicate debugging, and old-style enums have dangerous implicit conversions to integers, and tend to clutter
-    containing namespaces. Avoid them when possible - use `const` or `constexpr` instead of macroses, and enum classes instead of enums.
+    Note that macros complicate debugging, and old-style enums have dangerous implicit conversions to integers, and tend to clutter
+    containing namespaces. Avoid them when possible - use `const` or `constexpr` instead of macros, and enum classes instead of enums.
 
 **We write code without warnings!**
 
@@ -45,9 +45,9 @@ To automatically format a file, install `clang-format` and run:
 ```cpp
 #pragma once
 
-#include "../std/math.hpp"
+#include "std/math.hpp"
 
-const uint16_t kBufferSize = 255;
+uint16_t const kBufferSize = 255;
 
 // C-style enum. Do not use these.
 enum Type