Merge branch 'master' of github.com:cppformat/cppformat

This commit is contained in:
vitaut 2015-05-19 08:13:29 -07:00
commit 56d5335e3f
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ throws a ``FormatError`` exception with description
``"forty-two"`` is a string while the format code ``d``
only applies to integers.
Where possible, errors are catched at compile time. For example, the code
Where possible, errors are caught at compile time. For example, the code
.. code:: c++

View File

@ -41,7 +41,7 @@ current directory. Now you can build C++ Format by running :command:`make`.
Once the library has been built you can invoke :command:`make test` to run
the tests.
If you use Windows and have Vistual Studio installed, a :file:`FORMAT.sln`
If you use Windows and have Visual Studio installed, a :file:`FORMAT.sln`
file and several :file:`.vcproj` files will be created. You can then build them
using Visual Studio or msbuild.