From d148d68a4f56fe324b483df82d562dd3517744dc Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 20 Aug 2012 14:52:57 +0200
Subject: [PATCH] Fix Issue 2366 "THANKS needs updating or deleting"
---
Documentation/GNUmakefile | 2 +-
Documentation/hu/web/basic-authors.itexi | 10 ++++++----
Documentation/included/authors.itexi | 8 +++++---
Documentation/misc/GNUmakefile | 6 +++++-
Documentation/web/community.itexi | 8 ++++++++
GNUmakefile.in | 2 +-
python/auxiliar/postprocess_html.py | 1 -
7 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index fff37aa6ad..95b2dfdeab 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -25,7 +25,7 @@ $(outdir)/snippets/index.html: TEXI2HTML_FLAGS += -D short_toc
### Extra source files
-README_TOP_FILES= DEDICATION THANKS
+README_TOP_FILES= DEDICATION
IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
diff --git a/Documentation/hu/web/basic-authors.itexi b/Documentation/hu/web/basic-authors.itexi
index 99ba226104..6a298a7750 100644
--- a/Documentation/hu/web/basic-authors.itexi
+++ b/Documentation/hu/web/basic-authors.itexi
@@ -1,5 +1,5 @@
@c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of community.itexi and ../topdocs/AUTHORS.itexi
+@c This file is part of community.itexi
@ignore
@@ -7,9 +7,11 @@
list is sorted alphabetically by surname. This file lists people
that have contributed more than a few hours of work.
- Developers are people who are (or have been) listed under the
- "Development Team" in the THANKS, and can choose their own
- titles. Contributors are everybody else, and simply list their
+ Developers are people who have been listed under the "Development
+ Team" in Documentation/misc/THANKS*, or who are added when they
+ reach a significant amount of contributions with respect to the
+ existing Developers list, and can choose their own titles.
+ Contributors are everybody else, and simply list their
contributions. All lists are sorted alphabetically.
Anybody who has finished doing a "main devel team" task should
diff --git a/Documentation/included/authors.itexi b/Documentation/included/authors.itexi
index 9af9e2649d..1fb65a5f76 100644
--- a/Documentation/included/authors.itexi
+++ b/Documentation/included/authors.itexi
@@ -7,9 +7,11 @@
list is sorted alphabetically by surname. This file lists people
that have contributed more than a few hours of work.
- Developers are people who are (or have been) listed under the
- "Development Team" in the THANKS, and can choose their own
- titles. Contributors are everybody else, and simply list their
+ Developers are people who have been listed under the "Development
+ Team" in Documentation/misc/THANKS*, or who are added when they
+ reach a significant amount of contributions with respect to the
+ existing Developers list, and can choose their own titles.
+ Contributors are everybody else, and simply list their
contributions. All lists are sorted alphabetically.
Anybody who has finished doing a "main devel team" task should
diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index efc4dd9e69..c39d801193 100644
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -4,7 +4,11 @@ NAME = documentation
STEPMAKE_TEMPLATES = documentation texinfo
-TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9])
+TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) \
+ $(call src-wildcard,CHANGES-*[0-9]) \
+ $(call src-wildcard,ChangeLog*[0-9]) \
+ $(call src-wildcard,NEWS-*[0-9]) \
+ $(call src-wildcard,THANKS-*[0-9])
include $(depth)/make/stepmake.make
diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index d06932a3ff..7a5c746f10 100644
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -1188,6 +1188,14 @@ Descriptive list of changes by version:
@divEnd
+@divClass{column-center-bottom}
+@subheading Thanks
+
+Thanks to developers, contributors, bug hunters and suggestions for
+@miscLink{THANKS-2.14,releases up to 2.14}.
+
+@divEnd
+
@divClass{column-center-bottom}
@subheading Changelogs
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9347dcb9a8..312eed4e5c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +17,7 @@ SUBDIRS = python scripts \
documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
LICENSE LICENSE.DOCUMENTATION
TOPDOC_FILES = AUTHORS INSTALL README NEWS
TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index 70afde80dc..fd254b5a08 100644
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -26,7 +26,6 @@ non_copied_pages = ['Documentation/out-www/notation-big-page',
'out-www/examples',
'Documentation/topdocs',
'Documentation/bibliography',
- 'Documentation/out-www/THANKS',
'Documentation/out-www/DEDICATION',
'input/']
--
2.39.5