From 7b80a9bd8e2877c42aa95a9f7d753b9f9a29108a Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 01 9月 2019 18:50:18 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git

---
 README.md |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 88c64b4..e522a78 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Open License Manager
 ![Build Status](https://travis-ci.org/open-license-manager/open-license-manager.png "Build Status")
 
-A lincense manager written in C/C++ for Windows and Linux environments.
+A license manager written in C/C++ for Windows and Linux environments.
 
 It allows to protect the software you develop from unauthorized copies,
 limit the usage in time, to a specific set of machines, or prevent the usage in 
@@ -15,7 +15,7 @@
 these modules are planned....
  * a license [backoffice](../../issues/7) in php (in order to handle multiple licenses).
  * a license debugger to be sent to the final customer when there are licensing problems. 
- * a [log decriptor](../../issues/8) in order to decrypt logs generated by the license system.
+ * a [log descriptor](../../issues/8) in order to decrypt logs generated by the license system.
 
 You can notice 2 more sub-projects:
  * bootstrap: allows to generate private keys and modify the library on the fly after the downloading.
@@ -31,7 +31,7 @@
 
 ## prerequisites
 GCC (Linux), MINGW or MSVC (Windows)
-cmake, boost, openssl (Linux/MINGW)
+cmake, boost, openssl (Linux/MINGW), you can find detailed instruction for each [supported environment](https://github.com/open-license-manager/open-license-manager/wiki/Build-the-library) in the wiki. Below an overview of the basic build procedure:
 
 ```
 git clone https://github.com/open-license-manager/open-license-manager.git
@@ -47,9 +47,9 @@
 make install
 ```
 
-## on Windows (with MSVC 2010)
+## on Windows (with MSVC 2015)
 ```
-cmake .. -G "Visual Studio 10 2010 Win64" -DCMAKE_INSTALL_PREFIX=../install
+cmake .. -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=../install
 cmake --build . --target install --config Release
 ```
 

--
Gitblit v1.9.1