Merge topic 'doc-typo-fixes'
7c5e412
Documentation: Fix a few typos (#11883)
This commit is contained in:
commit
bb745612bc
|
@ -60,7 +60,7 @@
|
||||||
# CPACK_DEBIAN_PACKAGE_DEBUG
|
# CPACK_DEBIAN_PACKAGE_DEBUG
|
||||||
# Mandatory : NO
|
# Mandatory : NO
|
||||||
# Default : -
|
# Default : -
|
||||||
# May be set when invoking cpack in order to trace debug informations
|
# May be set when invoking cpack in order to trace debug information
|
||||||
# during CPackDeb run.
|
# during CPackDeb run.
|
||||||
# CPACK_DEBIAN_PACKAGE_PREDEPENDS
|
# CPACK_DEBIAN_PACKAGE_PREDEPENDS
|
||||||
# Mandatory : NO
|
# Mandatory : NO
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
# Find the PostgreSQL installation.
|
# - Find the PostgreSQL installation.
|
||||||
#
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Usage:
|
# Usage:
|
||||||
# In your CMakeLists.txt file do something like this:
|
# In your CMakeLists.txt file do something like this:
|
||||||
# ...
|
# ...
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# # Note that for MinGW users the order of libs is important!
|
# # Note that for MinGW users the order of libs is important!
|
||||||
# FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
|
# FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
|
||||||
# INCLUDE(${wxWidgets_USE_FILE})
|
# INCLUDE(${wxWidgets_USE_FILE})
|
||||||
# # and for each of your dependant executable/library targets:
|
# # and for each of your dependent executable/library targets:
|
||||||
# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
|
# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
|
||||||
#
|
#
|
||||||
# DEPRECATED
|
# DEPRECATED
|
||||||
|
|
|
@ -453,7 +453,7 @@ cmPolicies::cmPolicies()
|
||||||
"Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
|
"Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
|
||||||
"located in the CMake module directory) calls include() or "
|
"located in the CMake module directory) calls include() or "
|
||||||
"find_package(), the files located in the the CMake module directory are "
|
"find_package(), the files located in the the CMake module directory are "
|
||||||
"prefered over the files in CMAKE_MODULE_PATH. "
|
"preferred over the files in CMAKE_MODULE_PATH. "
|
||||||
"This makes sure that the modules belonging to "
|
"This makes sure that the modules belonging to "
|
||||||
"CMake always get those files included which they expect, and against "
|
"CMake always get those files included which they expect, and against "
|
||||||
"which they were developed and tested. "
|
"which they were developed and tested. "
|
||||||
|
|
|
@ -326,7 +326,7 @@ public:
|
||||||
*/
|
*/
|
||||||
bool FindSourceFiles();
|
bool FindSourceFiles();
|
||||||
|
|
||||||
///! Return the prefered linker language for this target
|
///! Return the preferred linker language for this target
|
||||||
const char* GetLinkerLanguage(const char* config = 0);
|
const char* GetLinkerLanguage(const char* config = 0);
|
||||||
|
|
||||||
///! Return the rule variable used to create this type of target,
|
///! Return the rule variable used to create this type of target,
|
||||||
|
|
|
@ -708,7 +708,7 @@ void curl_easy_reset(CURL *curl)
|
||||||
data->set.ssl.verifypeer = TRUE;
|
data->set.ssl.verifypeer = TRUE;
|
||||||
data->set.ssl.verifyhost = 2;
|
data->set.ssl.verifyhost = 2;
|
||||||
#ifdef CURL_CA_BUNDLE
|
#ifdef CURL_CA_BUNDLE
|
||||||
/* This is our prefered CA cert bundle since install time */
|
/* This is our preferred CA cert bundle since install time */
|
||||||
data->set.ssl.CAfile = (char *)CURL_CA_BUNDLE;
|
data->set.ssl.CAfile = (char *)CURL_CA_BUNDLE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ typedef unsigned char bool;
|
||||||
#define SIZEOF_CURL_OFF_T 4
|
#define SIZEOF_CURL_OFF_T 4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* We set up our internal prefered (CURL_)FORMAT_OFF_T here */
|
/* We set up our internal preferred (CURL_)FORMAT_OFF_T here */
|
||||||
#if SIZEOF_CURL_OFF_T > 4
|
#if SIZEOF_CURL_OFF_T > 4
|
||||||
#define FORMAT_OFF_T "lld"
|
#define FORMAT_OFF_T "lld"
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue