Merge remote-tracking branch 'upstream/master'

README.md

@@ -6,7 +6,7 @@ Brief History
 Originally, SOCI was developed by [Maciej Sobczak](http://www.msobczak.com/)
 at [CERN](http://www.cern.ch/) as abstraction layer for Oracle,
 a **Simple Oracle Call Interface**.
-Later, serveral database backends have been developed for SOCI,
+Later, several database backends have been developed for SOCI,
 thus the long name has lost its practicality.
 Currently, if you like, SOCI may stand for **Simple Open (Database) Call Interface**
 or something similar.

www/index.html

@@ -94,8 +94,10 @@
  target="_blank" href="http://www.boost.org/LICENSE_1_0.txt">Boost
 Software License</a>.</p>
 
-<p>All SOCI downloads are hosted on SourceForge.net servers. The current 
-stable release (3.1.0) can be downloaded <a href="https://sourceforge.net/p/soci/" target="_blank">here</a>, and all previous releases are available <a href="http://sourceforge.net/project/showfiles.php?group_id=121480" target="_blank">here</a>.</p>
+<p>All SOCI downloads are hosted on SourceForge.net servers. The current
+stable release (3.1.0) can be downloaded <a href="https://sourceforge.net/p/soci/" target="_blank">here</a>,
+and all previous releases are available 
+<a href="http://sourceforge.net/project/showfiles.php?group_id=121480" target="_blank">here</a>.</p>
 
 <p>The development of SOCI happens on GitHub. All repositories live 
 under the <a target="_blank" href="http://github.com/SOCI">SOCI</a>
@@ -104,11 +106,21 @@
 $ git clone git://github.com/SOCI/soci.git
 </pre>
 
-<p>The <a href="https://github.com/SOCI/soci/issues">Issues</a> tracker is open for bug reports and patches submission.</p>
+<p>The <a href="https://github.com/SOCI/soci/issues">Issues</a> tracker is open 
+for bug reports and patches submission.</p>
 
-<p>The best way to contribute to SOCI is to follow the typical GitHub workflow: fork SOCI, apply your edits and submit <a href="https://github.com/SOCI/soci/pulls">Pull Request</a>.<br /> Feel free to join SOCI development!</p>
+<p>The best way to contribute to SOCI is to follow the typical GitHub workflow: 
+fork SOCI, apply your edits and submit <a href="https://github.com/SOCI/soci/pulls">Pull Request</a>.
+<br /> Feel free to join SOCI development!</p>
 
-<p>To meet other users, please consider subscribing to the <a target="_blank" href="https://lists.sourceforge.net/lists/listinfo/soci-users">SOCI-users mailing list</a>. There is also <a target="_blank" href="https://lists.sourceforge.net/lists/listinfo/soci-devel">SOCI-devel mailing list</a> available dedicated to development discussions only.</p>
+<p>To meet other users, please consider subscribing to the 
+<a target="_blank" href="https://lists.sourceforge.net/lists/listinfo/soci-users">SOCI-users mailing list</a>. 
+There is also <a target="_blank" href="https://lists.sourceforge.net/lists/listinfo/soci-devel">SOCI-devel mailing list</a> 
+available dedicated to development discussions only.</p>
+
+<p>There is also community-driven <a target="_blank" href="https://github.com/SOCI/soci/wiki/">Wiki</a> 
+and <a target="_blank" href="https://github.com/SOCI/soci/wiki/FAQ">FAQ</a> hosted at GitHub, where everybody 
+is welcome to contribute.</p>
       </td>
     </tr>
 </table>