Skip to content

Commit

Permalink
Merge pull request #309 from jwilk/spelling
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
vitaut committed May 1, 2016
2 parents 4e279e2 + e0ac51c commit b64d13a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ endif ()

if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
# If Microsoft SDK is installed create script run-msbuild.bat that
# calls SetEnv.cmd to to set up build environment and runs msbuild.
# calls SetEnv.cmd to set up build environment and runs msbuild.
# It is useful when building Visual Studio projects with the SDK
# toolchain rather than Visual Studio.
include(FindSetEnv)
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ Fixes
`@MariadeAnton <https://github.com/MariadeAnton>`_ and
`@franramirez688 <https://github.com/franramirez688>`_.

* Improved support for bulding with `Android NDK
* Improved support for building with `Android NDK
<https://developer.android.com/tools/sdk/ndk/index.html>`_
(`#107 <https://github.com/fmtlib/fmt/pull/107>`_).
Thanks to `@newnon <https://github.com/newnon>`_.
Expand Down Expand Up @@ -621,7 +621,7 @@ Fixes

Apart from a more natural syntax, this also improves performance as there
is no need to construct temporary formatter objects and control arguments'
lifetimes. Because the wrapper functions are very ligthweight, this doesn't
lifetimes. Because the wrapper functions are very lightweight, this doesn't
cause code bloat even in pre-C++11 mode.

* Simplified common case of formatting an ``std::string``. Now it requires a
Expand Down
2 changes: 1 addition & 1 deletion doc/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ the previous section. Then compile the ``doc`` target/project, for example::

make doc

This will generate the HTML documenation in ``doc/html``.
This will generate the HTML documentation in ``doc/html``.

Android NDK
===========
Expand Down
4 changes: 2 additions & 2 deletions fmt/posix.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class BufferedFile {
// A "move constructor" for moving from a temporary.
BufferedFile(Proxy p) FMT_NOEXCEPT : file_(p.file) {}

// A "move constructor" for for moving from an lvalue.
// A "move constructor" for moving from an lvalue.
BufferedFile(BufferedFile &f) FMT_NOEXCEPT : file_(f.file_) {
f.file_ = 0;
}
Expand Down Expand Up @@ -251,7 +251,7 @@ class File {
// A "move constructor" for moving from a temporary.
File(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {}

// A "move constructor" for for moving from an lvalue.
// A "move constructor" for moving from an lvalue.
File(File &other) FMT_NOEXCEPT : fd_(other.fd_) {
other.fd_ = -1;
}
Expand Down

0 comments on commit b64d13a

Please sign in to comment.