r.horizon manual - fix typo (OSGeo#2794)

INSTALL.md

@@ -39,6 +39,7 @@ The install order matters. GRASS needs at least two libraries
 which have to be installed before installing/compiling GRASS:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this
 directory.
 =======
@@ -49,6 +50,10 @@ directory:
 For links to the software, see ./REQUIREMENTS.html in this
 directory:
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this
+directory.
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 
 Installation order:
 
@@ -101,13 +106,17 @@ The command,
 explains the options used to disable the compilation of non-mandatory
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies.
 =======
 GRASS modules. See REQUIREMENTS.html for details on dependencies.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 GRASS modules. See REQUIREMENTS.html for details on dependencies.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies.
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 Detailed Wiki notes for various operating systems (MS-Windows, GNU/Linux
 distributions, FreeBSD, AIX, etc) are available at:
 <https://grasswiki.osgeo.org/wiki/Compile_and_Install>

Makefile

@@ -63,12 +63,15 @@ DIRS = \
 
 SUBDIRS = $(DIRS)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 FILES = AUTHORS CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv
 =======
 =======
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
 FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv
 =======
@@ -80,7 +83,13 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html cont
 =======
 FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html contributors.csv contributors_extra.csv translators.csv
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+>>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794))
 FILES_DST = $(patsubst %,$(ARCH_DISTDIR)/%,$(FILES))
 
 default:

REQUIREMENTS.md

@@ -65,15 +65,21 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://mesa3d.org/](https://mesa3d.org/)
 - **libpng** (for `r.out.png` and the PNG driver), usually already installed.
   [http://www.libpng.org/pub/png/libpng.html](http://www.libpng.org/pub/png/libpng.html)
+<<<<<<< HEAD
 - **LIBSVM** (for SVM classification modules `i.svm.train` and `i.svm.predict`)
   [https://www.csie.ntu.edu.tw/~cjlin/libsvm/](https://www.csie.ntu.edu.tw/~cjlin/libsvm/)
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 - **libtiff** (for `r.out.tiff`), usually already installed.
   [https://gitlab.com/libtiff/libtiff](https://gitlab.com/libtiff/libtiff)
 - **readline** for extra command prompt functionality
   [https://tiswww.case.edu/~chet/readline/rltop.html](https://tiswww.case.edu/~chet/readline/rltop.html)
   [ftp://ftp.gnu.org/gnu/readline](ftp://ftp.gnu.org/gnu/readline)
+<<<<<<< HEAD
 - **PDAL** ( for LAS import modules `r.in.pdal` and `v.in.pdal`)
   [https://pdal.io](https://pdal.io)
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 - **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support)
   [https://www.postgresql.org](https://www.postgresql.org)
 - **MariaDB/MySQL libraries** (for the MySQL database interface)
@@ -86,6 +92,13 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://cran.r-project.org](https://cran.r-project.org)
 - **FreeType2** (for TrueType font support and `d.text.freetype`)
   [https://freetype.org/](https://freetype.org/)
+<<<<<<< HEAD
+=======
+- **Ctypes** (for ctypes interface)
+  Ctypes can be added as a third-party module in Python 2.3 and
+  2.4 - [https://pypi.org/project/ctypes/1.0.2/](https://pypi.org/project/ctypes/1.0.2/)
+  [https://docs.python.org/library/ctypes.html](https://docs.python.org/library/ctypes.html)
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 - **wxPython >= 2.8.10.1** (for wxGUI)
   [https://www.wxpython.org](https://www.wxpython.org)
 - **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS)
@@ -107,6 +120,13 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://matplotlib.org/](https://matplotlib.org/)
 - **python-termcolor** (recommended for `g.search.modules`)
   [https://pypi.org/project/termcolor/](https://pypi.org/project/termcolor/)
+<<<<<<< HEAD
+=======
+- **six** (`python-six`, needed for Python API and for cross-version Python
+  compatibility)
+  [https://pypi.python.org/pypi/six](https://pypi.python.org/pypi/six)
+  [https://github.com/benjaminp/six](https://github.com/benjaminp/six)
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 - **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`),
   specifically ffmpeg tool
   [https://ffmpeg.org](https://ffmpeg.org)
@@ -135,7 +155,11 @@ MacOSX users may go here to download precompiled libraries etc.:
 
 ---
 
+<<<<<<< HEAD
 © _GRASS Development Team 1997-2024_
+=======
+© _GRASS Development Team 1997-2023_
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 
 Please report bugs here:
 [https://grass.osgeo.org/contribute/](https://grass.osgeo.org/contribute/)

aclocal.m4

@@ -217,12 +217,16 @@ CPPFLAGS="$5 $CPPFLAGS"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #include <stdio.h>
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 #include <stdio.h> 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+#include <stdio.h>
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 #include <$1>
 int main(void) {
  FILE *fp = fopen("conftestdata","w");
@@ -607,6 +611,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 	    LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib'
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	    # TODO: add optional pthread support with any combination of:
 	    # CFLAGS="$CFLAGS -pthread"
@@ -617,6 +622,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 	    # TODO: add optional pthread support with any combination of: 
+=======
+	    # TODO: add optional pthread support with any combination of:
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 	    # CFLAGS="$CFLAGS -pthread"
 	    # LDFLAGS="$LDFLAGS -lpthread"
 	    # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)])
@@ -801,6 +809,7 @@ AC_DEFUN([LOC_OPENMP],
 dnl -------------------- / OpenMP ---------------------------------------------
 
 
+<<<<<<< HEAD
 dnl -------------------- OpenMP -----------------------------------------------
 dnl OpenMP code borrowed and modified from Autoconf 2.71 (AC_OPENMP)
 dnl to enable Clang detection
@@ -939,6 +948,8 @@ fi])
 dnl -------------------- / OpenMP ---------------------------------------------
 
 
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 dnl XXXX Begin Stolen from cdrtools-2.01
 dnl XXXX by Joerg Schilling <schilling fokus fraunhofer de> et al. XXXXXXXXX
 

db/drivers/dbf/table.c

@@ -59,6 +59,7 @@ int add_table(char *table, char *name)
     res = snprintf(db.tables[db.ntables].file, buf_s, "%s/%s", db.name, name);
 #endif
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     if (res < 0 || (size_t)res >= buf_s) {
 =======
@@ -67,6 +68,9 @@ int add_table(char *table, char *name)
 =======
     if (res >= buf_s) {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+    if (res < 0 || (size_t)res >= buf_s) {
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
         db_d_append_error(_("Unable to add table %s to %s. "
                             "The file path is too long."),
                           name, db.name);

db/drivers/mysql/grass-mysql.html

@@ -71,6 +71,7 @@ <h2>Indexes</h2>
 
 <h2>Privileges</h2>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Because MySQL does not support groups of users and because
@@ -79,6 +80,9 @@ <h2>Privileges</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 Because MySQL does not support groups of users and because 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+Because MySQL does not support groups of users and because
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 only MySQL 'root' can grant privileges to other users
 GRASS cannot automatically grant select privileges on created
 tables to group of users.
@@ -95,6 +99,7 @@ <h2>Privileges</h2>
 
 <h2>Schemas</h2>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Because MySQL does not support database schemas the parameter
@@ -103,13 +108,17 @@ <h2>Schemas</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 Because MySQL does not support database schemas the parameter 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+Because MySQL does not support database schemas the parameter
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 'schema' of module db.connect should never be set to any
 value. If you set that parameter for MySQL driver GRASS will
 try to write tables to the specified schema which will result
 in errors.
 
 <h2>Groups</h2>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 MySQL does not support user groups. Any settings specified
@@ -118,6 +127,9 @@ <h2>Groups</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 MySQL does not support user groups. Any settings specified 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+MySQL does not support user groups. Any settings specified
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 by 'group' parameter of module db.connect are ignored by
 GRASS for MySQL driver.
 
@@ -136,6 +148,7 @@ <h2>SEE ALSO</h2>
 
 <h2>Credits</h2>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Development of the driver was sponsored by
@@ -144,6 +157,9 @@ <h2>Credits</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 Development of the driver was sponsored by 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+Development of the driver was sponsored by
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 <a href="http://www.faunalia.it">Faunalia</a> (Italy)
 as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
 

display/d.geodesic/d.geodesic.html

@@ -39,7 +39,11 @@ <h2>EXAMPLE</h2>
 
 <h2>NOTES</h2>
 
+<<<<<<< HEAD
 This program works only with longitude/latitude
+=======
+This program works only in GRASS locations with longitude/latitude
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 coordinate system.
 
 <h2>SEE ALSO</h2>

display/d.grid/d.grid.html

@@ -83,10 +83,14 @@ <h2>AUTHORS</h2>
 Border support: Markus Neteler<br>
 Text and RGB support: Hamish Bowman<br>
 <<<<<<< HEAD
+<<<<<<< HEAD
 Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague
 =======
 Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))

display/d.labels/d.labels.html

@@ -6,7 +6,11 @@ <h2>DESCRIPTION</h2>
 size, and the background for the text. This file can be generated with
 the <em><a href="v.label.html">v.label</a></em> program or simply created
 by the user as an ASCII file (using a text editor) and placed in the
+<<<<<<< HEAD
 appropriate directory under the user's current mapset and project
+=======
+appropriate directory under the user's current mapset and location
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 (i.e. <tt>$MAPSET/paint/labels/</tt>).
 
 <h2>NOTES</h2>

display/d.legend/draw.c

@@ -292,6 +292,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines,
                 size_t b_s = sizeof(DispFormat);
                 int log_maxCat = (int)(log10(fabs(maxCat))) + 1;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s)
 =======
@@ -300,6 +301,9 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines,
 =======
                 if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= b_s)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+                if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s)
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
                     G_fatal_error(
                         _("Failed to create format string with maxCat=%f."),
                         maxCat);