From a4d261d8a2868d0853e1bb78d46737c11e9ab141 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 19 Feb 2023 18:22:30 +0200
Subject: [PATCH 7/7] Replace references of master branch with main
See osdn #47313
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
data/themes/gui-sdl2/human/theme.themespec | 4 ++--
server/report.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/themes/gui-sdl2/human/theme.themespec b/data/themes/gui-sdl2/human/theme.themespec
index 5465d24038..43475945cd 100644
--- a/data/themes/gui-sdl2/human/theme.themespec
+++ b/data/themes/gui-sdl2/human/theme.themespec
@@ -10,8 +10,8 @@ priority = 20
; The font to be used:
font_file = "themes/gui-sdl2/human/DejaVuSans.ttf"
; To use CJK fonts, provide the path to the font below.
-; Fonts recommended for Freeciv can be fetched from git master, e.g.:
-; https://raw.githubusercontent.com/freeciv/freeciv/master/data/themes/gui-sdl2/human/fireflysung.ttf
+; Fonts recommended for Freeciv can be fetched from git main branch, e.g.:
+; https://raw.githubusercontent.com/freeciv/freeciv/main/data/themes/gui-sdl2/human/fireflysung.ttf
font_file_zh_CN = "themes/gui-sdl2/human/fireflysung.ttf"
font_file_ja = "themes/gui-sdl2/human/sazanami-gothic.ttf"
font_file_ko = "themes/gui-sdl2/human/UnDotum.ttf"
diff --git a/server/report.c b/server/report.c
index 44f5bf6ea1..17837df049 100644
--- a/server/report.c
+++ b/server/report.c
@@ -1550,7 +1550,7 @@ void log_civ_score_now(void)
fprintf(score_log->fp,
"\n"
"# For a specification of the format of this see doc/README.scorelog or \n"
- "# <https://raw.githubusercontent.com/freeciv/freeciv/master/doc/README.scorelog>.\n"
+ "# <https://raw.githubusercontent.com/freeciv/freeciv/main/doc/README.scorelog>.\n"
"\n");
fprintf(score_log->fp, "id %s\n", server.game_identifier);
--
2.39.1