Top-level cmake option 'BORNAGAIN_MAN' renamed to 'BORNAGAIN_USERMANUAL',

since 'man' will be needed for the Unix man page. This resolves #974.

CMakeLists.txt

@@ -13,7 +13,7 @@ include(VERSION.cmake)
 option(BORNAGAIN_PYTHON "Build with python support" ON)
 option(BORNAGAIN_APP "Build test application" OFF)
 option(BORNAGAIN_GUI "Build a graphical user interface" OFF)
-option(BORNAGAIN_MAN "Build a user manual" OFF)
+option(BORNAGAIN_USERMANUAL "Build the User Manual" OFF)
 option(BUILD_DEBIAN "Build a debian package" OFF)
 option(BORNAGAIN_APPLE_BUNDLE "Create a Mac OS X bundle" OFF)
 option(ROOT_SUPPORT "Build with dependencies from ROOT" ON)
@@ -21,11 +21,12 @@ option(BORNAGAIN_OPENMPI "Build with OpenMPI support" OFF)
 option(BORNAGAIN_RELEASE "Special option for making release" OFF)
 option(BORNAGAIN_CRASHHADLER "Additional machinery to send crash reports" OFF)
 
+
+
 #--- Including macros ---
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-include(PreventInSourceBuilds)
-
 include(BornAgainMacros)
+#AssureOutOfSourceBuilds()
 include(SearchInstalledSoftware)
 include(CheckCompiler)
 include(BornAgainConfiguration)

Doc/UserManual/Introduction.tex

@@ -50,7 +50,7 @@ This documentation is released under the Creative Commons license CC-BY-SA.
 When \BornAgain\ is used in preparing scientific papers,
 please cite software and manual as follows: 
 \begin{quote}
-C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke (2015),\newline
+C.~Durniak, M.~Ganeva, G.~Pospelov, W.~Van Herck, J.~Wuttke (2015),\newline
 BornAgain --- Software for simulating and fitting
 X-ray and neutron small-angle scattering at grazing incidence,
 version \UserManualVersionNumber,\newline
@@ -64,7 +64,7 @@ to ensure that their data interpretation is physically meaningful.
 If in doubt, please contact us.
 We are grateful for all kind of feedback:
 criticism, praise, bug reports, feature requests or contributed modules.
-If questions go beyond normal software user support,
+If questions go beyond normal user support,
 we will be glad to discuss a scientific collaboration.
 
 This User Manual is complementary to the online documentation