[gnuastro-commits] master f6e2c77 1/2: Author names: corrected multiple entries for Carlos

[Mohammad Akhlaghi]

branch: master
commit f6e2c77e61cebee45893d187a76fbe1a73ef5a20
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Author names: corrected multiple entries for Carlos
    
    Carlos Morales-Socorro had made his commits with a slight difference
    between the names: on one, his surname didn't have a '-'. As a result, in
    the list of authors that is printed at the start of the PDF book (and in
    the 'AUTHORS' file, his name was repeated two times.
    
    With this commit, a Git mailmap entry has been added to correct this issue.
    
    Also, I noticed a small typo in the "Why C?" section of the book (an 'of'
    was mistakenly written for an 'or').
---
 .mailmap          | 5 +++--
 doc/gnuastro.texi | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index a012604..a8062a7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
 # Map different emails to people in Git.
 #
-# Copyright (C) 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2015-2021 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -9,6 +9,7 @@
 
 Boud Roukema <boud@cosmo.torun.pl>
 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+Carlos Morales-Socorro <cmorsoc@gmail.com>
 <mohammad@akhlaghi.org> <akhlaghi@gnu.org>
 Lucas MacQuarrie <macquarrielucas@gmail.com>
-<mohammad@akhlaghi.org> <makhlaghi@gmail.com>
\ No newline at end of file
+<mohammad@akhlaghi.org> <makhlaghi@gmail.com>
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index bc72959..9abbdc5 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -30160,7 +30160,7 @@ discontinuities and replacements of a few Java 
components which were first
 declared as becoming @emph{deprecated}, and removed from later versions.
 
 @cindex Reproducibility
-This stems from the core principles of high-level languages like Python of
+This stems from the core principles of high-level languages like Python or
 Java: that they evolve significantly on the scale of roughly 5 to 10
 years. They are therefore useful when you want to solve a short-term
 problem and you are ready to pay the high cost of keeping your software up