-#
-# Build Steps:
-# - (once) sudo apt install flatpak-builder
-# - (once) sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-# - flatpak-builder --install-deps-from=flathub --force-clean build/flatpak dist/flatpak.yaml
-# - flatpak-builder --user --install --force-clean build/flatpak dist/flatpak.yaml
-# - flatpak run net.longturn.freeciv21
-# - flatpak remove net.longturn.freeciv21
-#
-##########
-
-app-id: net.longturn.freeciv21
-runtime: org.kde.Platform
-
-# FIXME: This flatpak file is currently broken and won't run until 1) the org.kde.Platform package is updated
-# to support cmake v3.21+ or 2) we get Qt 6.4 LTS support working (after KArchive is updated to Qt6)
-
-runtime-version: '5.15'
-sdk: org.kde.Sdk
-
-command: freeciv21-client
-modules:
- - name: freeciv21
- sources:
- # Get Lua 5.3 as a dependency not included in the org.kde.Platform package.
- - type: archive
- url: https://www.lua.org/ftp/lua-5.3.6.tar.gz
- sha256: fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60
- dest: include/lua5.3
-
- # Get Libertinus font because the build system does not have access to internet.
- - type: archive
- url: https://github.com/alerque/libertinus/releases/download/v7.040/Libertinus-7.040.zip
- sha256: 2cce08507441d8ae7b835cfe51fb643ad5d9f6b44db4360c4e244f0e474a72f6
- dest: fonts/Libertinus
-
- - type: git
- branch: master
- url: https://github.com/longturn/freeciv21
-
- buildsystem: simple
- build-commands:
- # Compile Lua
- - cd include/lua5.3 && make linux
- # Configure
- - cmake -S $PWD -B build-flatpak -G Ninja
- -DCMAKE_INSTALL_PREFIX=/app
- -DCMAKE_BUILD_TYPE=Release
- -DLUA_INCLUDE_DIR=include/lua5.3/src
- -DLUA_LIBRARY=include/lua5.3/src/liblua.a
- -DFREECIV_DOWNLOAD_FONTS=OFF
- # CMake build with Install
- - cmake --build build-flatpak --target install
- # Incorporate the Libertinus Font
- - mkdir -p /app/share/freeciv21/fonts/Libertinus
- - cp -R fonts/Libertinus/* /app/share/freeciv21/fonts/Libertinus
-
-finish-args:
- - --socket=wayland
- - --socket=fallback-x11
- - --share=ipc
- - --share=network
- - --socket=pulseaudio
- - --filesystem=home
- - --filesystem=~/.local/share/freeciv21:create
-
-##########
-# END flatpack.yaml
-##########
diff --git a/dist/mp.ico b/dist/mp.ico
deleted file mode 100644
index c97bf19b0c..0000000000
Binary files a/dist/mp.ico and /dev/null differ
diff --git a/dist/net.longturn.freeciv21.client.desktop.in b/dist/net.longturn.freeciv21.client.desktop.in
index 51c294ac50..3cb5fc9b68 100644
--- a/dist/net.longturn.freeciv21.client.desktop.in
+++ b/dist/net.longturn.freeciv21.client.desktop.in
@@ -53,7 +53,7 @@ Comment[pt]=Jogo de estratégia por turnos inspirado na História da civilizaç
Comment[ru]=Пошаговая стратегическая игра, вдохновлённая историей человеческой цивилизации
Comment[sv]=Turordningsbaserat strategispel inspirerat av den mänskliga historien
Exec=@CMAKE_INSTALL_FULL_BINDIR@/freeciv21-client %u
-Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/civicon.png
+Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/freeciv21-client.png
StartupNotify=true
MimeType=x-scheme-handler/fc21;
X-KDE-Protocols=fc21;
diff --git a/dist/net.longturn.freeciv21.client.metainfo.xml b/dist/net.longturn.freeciv21.client.metainfo.xml.in
similarity index 50%
rename from dist/net.longturn.freeciv21.client.metainfo.xml
rename to dist/net.longturn.freeciv21.client.metainfo.xml.in
index 2c6c9943ae..e1144b34b4 100644
--- a/dist/net.longturn.freeciv21.client.metainfo.xml
+++ b/dist/net.longturn.freeciv21.client.metainfo.xml.in
@@ -4,23 +4,21 @@
CC0
GPL-3.0+
Freeciv21 Client
- Client for the Freeciv21 game
+ Freeciv21 Game Client
-
- Freeciv21 is a Free and Open Source empire-building strategy game inspired by the history of human civilization.
- The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age...
-
-
- This client is for connecting to network games, or to launch local single-player games. It is based on the Qt framework.
-
+
+ Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+ Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.
+ The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.
net.longturn.freeciv21.client.desktop
https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-client.png
https://longturn.net/
https://github.com/longturn/freeciv21/issues
+ https://longturn.readthedocs.io/en/latest/index.html
- Freeciv21 Client
+ Freeciv21 Screenshot
https://raw.githubusercontent.com/longturn/freeciv21/master/dist/freeciv21-screenshot-2048x1112.png
@@ -37,4 +35,7 @@
mild
+
+
+
diff --git a/dist/net.longturn.freeciv21.modpack-qt.desktop.in b/dist/net.longturn.freeciv21.modpack.desktop.in
similarity index 90%
rename from dist/net.longturn.freeciv21.modpack-qt.desktop.in
rename to dist/net.longturn.freeciv21.modpack.desktop.in
index 239752752a..f191898d8a 100644
--- a/dist/net.longturn.freeciv21.modpack-qt.desktop.in
+++ b/dist/net.longturn.freeciv21.modpack.desktop.in
@@ -10,7 +10,7 @@ GenericName[ru]=Стратегическая игра
Comment=Download and install add-ons for Freeciv21
Comment[ru]=Скачивайте и устанавливайте дополнения для Freeciv21
Exec=@CMAKE_INSTALL_FULL_BINDIR@/freeciv21-modpack-qt
-Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/mpicon.png
+Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/freeciv21-modpack.png
StartupNotify=true
Terminal=false
Type=Application
diff --git a/dist/net.longturn.freeciv21.modpack.metainfo.xml b/dist/net.longturn.freeciv21.modpack.metainfo.xml.in
similarity index 51%
rename from dist/net.longturn.freeciv21.modpack.metainfo.xml
rename to dist/net.longturn.freeciv21.modpack.metainfo.xml.in
index 4566ba2f73..f60876e3a9 100644
--- a/dist/net.longturn.freeciv21.modpack.metainfo.xml
+++ b/dist/net.longturn.freeciv21.modpack.metainfo.xml.in
@@ -6,14 +6,11 @@
Freeciv21 Modpack Installer
Modpack installer for the Freeciv21 game
-
- Freeciv21 is a Free and Open Source empire-building strategy game inspired by the history of human civilization.
- The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age...
-
-
- Freeciv21 modpack utility can be used to automatically download and install custom rulesets, tilesets,
- soundsets, musicsets, and maps for Freeciv21 to use. It is based on the Qt framework.
-
+
+ Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+ Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.
+ The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.
+ The Freeciv21 modpack utility can be used to automatically download and install custom rulesets, tilesets, soundsets, musicsets, and maps for Freeciv21 to use.
net.longturn.freeciv21.modpack-qt.desktop
https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-modpack.png
@@ -21,7 +18,7 @@
https://github.com/longturn/freeciv21/issues
- Freeciv21 Client
+ Freeciv21 Screenshot
https://raw.githubusercontent.com/longturn/freeciv21/master/dist/freeciv21-screenshot-2048x1112.png
@@ -38,4 +35,7 @@
mild
+
+
+
diff --git a/dist/net.longturn.freeciv21.ruledit.desktop.in b/dist/net.longturn.freeciv21.ruledit.desktop.in
index 558078770a..3466e6fad4 100644
--- a/dist/net.longturn.freeciv21.ruledit.desktop.in
+++ b/dist/net.longturn.freeciv21.ruledit.desktop.in
@@ -10,7 +10,7 @@ GenericName[ru]=Стратегическая игра
Comment=Edit Freeciv21 game rules
Comment[ru]=Меняйте любые правила Freeciv21 и создавайте новые
Exec=@CMAKE_INSTALL_FULL_BINDIR@/freeciv21-ruledit
-Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/civicon.png
+Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/freeciv21-client.png
StartupNotify=true
Terminal=false
Type=Application
diff --git a/dist/net.longturn.freeciv21.ruledit.metainfo.xml b/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in
similarity index 52%
rename from dist/net.longturn.freeciv21.ruledit.metainfo.xml
rename to dist/net.longturn.freeciv21.ruledit.metainfo.xml.in
index 7b796aa2f7..cb7d60d964 100644
--- a/dist/net.longturn.freeciv21.ruledit.metainfo.xml
+++ b/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in
@@ -6,13 +6,11 @@
Freeciv21 Ruleset Editor
Ruleset editor for the Freeciv21 game
-
- Freeciv21 is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your
- mission is to lead your tribe from the Stone Age to the Space Age...
-
-
- Freeciv21 Ruleset Editor can be used to create your own game rules, or the change existing ones. It is based on the Qt framework.
-
+
+ Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+ Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.
+ The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.
+ The Freeciv21 Ruleset Editor can be used to create your own game rules, or the change existing ones.
net.longturn.freeciv21.ruledit.desktop
https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-client.png
@@ -20,7 +18,7 @@
https://github.com/longturn/freeciv21/issues
- Freeciv21 Client
+ Freeciv21 Screenshot
https://raw.githubusercontent.com/longturn/freeciv21/master/dist/freeciv21-screenshot-2048x1112.png
@@ -37,4 +35,7 @@
mild
+
+
+
diff --git a/dist/net.longturn.freeciv21.server.desktop.in b/dist/net.longturn.freeciv21.server.desktop.in
index 5770fd5fb4..16847b0bc5 100644
--- a/dist/net.longturn.freeciv21.server.desktop.in
+++ b/dist/net.longturn.freeciv21.server.desktop.in
@@ -22,7 +22,7 @@ Comment[pt]=Jogo de estratégia por turnos inspirado na História da civilizaç
Comment[ru]=Пошаговая стратегическая игра, вдохновлённая историей человеческой цивилизации
Comment[sv]=Turordningsbaserat strategispel inspirerat av den mänskliga historien
Exec=@CMAKE_INSTALL_FULL_BINDIR@/freeciv21-server
-Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/server.png
+Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/freeciv21-server.png
StartupNotify=true
Terminal=true
Type=Application
diff --git a/dist/net.longturn.freeciv21.server.metainfo.xml b/dist/net.longturn.freeciv21.server.metainfo.xml
deleted file mode 100644
index f585337767..0000000000
--- a/dist/net.longturn.freeciv21.server.metainfo.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- net.longturn.freeciv21.server
- CC0
- GPL-3.0+
- Freeciv21 server
- Server component for the Freeciv21 game
-
-
- Freeciv21 is a Free and Open Source empire-building strategy game inspired by the history of human civilization.
- The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age...
-
-
- The server hosts multiplayer games. For single-player games the client will launch the server for itself
- automatically. The server is a console application.
-
-
- net.longturn.freeciv21.server.desktop
- https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-server.png
- https://longturn.net/
- https://github.com/longturn/freeciv21/issues
-
-
- Freeciv21 Client
- https://raw.githubusercontent.com/longturn/freeciv21/master/dist/freeciv21-screenshot-2048x1112.png
-
-
- longturn.net@gmail.com
- Longturn.net Community
-
- freeciv21-server
-
-
- Game
- Simulation
- StrategyGame
-
-
- mild
-
-
diff --git a/dist/net.longturn.freeciv21.server.metainfo.xml.in b/dist/net.longturn.freeciv21.server.metainfo.xml.in
new file mode 100644
index 0000000000..c3ba812efb
--- /dev/null
+++ b/dist/net.longturn.freeciv21.server.metainfo.xml.in
@@ -0,0 +1,41 @@
+
+
+ net.longturn.freeciv21.server
+ CC0
+ GPL-3.0+
+ Freeciv21 Server
+ Server component for the Freeciv21 game
+
+
+ Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+ Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.
+ The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.
+ The server hosts multiplayer games. For single-player games the client will launch the server for itself automatically. The server is a console application.
+
+ net.longturn.freeciv21.server.desktop
+ https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-server.png
+ https://longturn.net/
+ https://github.com/longturn/freeciv21/issues
+
+
+ Freeciv21 Screenshot
+ https://raw.githubusercontent.com/longturn/freeciv21/master/dist/freeciv21-screenshot-2048x1112.png
+
+
+ longturn.net@gmail.com
+ Longturn.net Community
+
+ freeciv21-server
+
+
+ Game
+ Simulation
+ StrategyGame
+
+
+ mild
+
+
+
+
+
diff --git a/data/screenshot.png b/dist/readme-screenshot.png
similarity index 100%
rename from data/screenshot.png
rename to dist/readme-screenshot.png
diff --git a/dist/server.ico b/dist/server.ico
deleted file mode 100644
index 044f29753c..0000000000
Binary files a/dist/server.ico and /dev/null differ
diff --git a/dist/server.ico.license b/dist/server.ico.license
deleted file mode 100644
index 0785484cb6..0000000000
--- a/dist/server.ico.license
+++ /dev/null
@@ -1 +0,0 @@
-Refer to /data/freeciv21-server.png.license
diff --git a/dist/snapcraft.yaml b/dist/snapcraft.yaml
index 597b2a3c3f..ec6e04b8cd 100644
--- a/dist/snapcraft.yaml
+++ b/dist/snapcraft.yaml
@@ -7,10 +7,10 @@
# Build Steps:
# - (once) sudo snap install snapcraft --classic
# - (once) sudo snap install lxd
-# - mkdir -p /build/snap/local
-# - cp /dist/snapcraft.yaml /build/snap
-# - cp /data/icons/128x128/freeciv21-client.png /build/snap/local
-# - cd /build
+# - mkdir -p build/snap/local
+# - cp dist/snapcraft.yaml build/snap
+# - cp data/icons/128x128/freeciv21-client.png build/snap/local
+# - cd build
# - snapcraft
# - sudo snap install --devmode ./freeciv21_*.snap
#
@@ -19,10 +19,13 @@
name: freeciv21
title: Freeciv21
summary: Freeciv21 - Freeciv for the 21st Century
+# The description is also in README.md, about.rst, freeciv21-server.rst and the 4 metainfo files.
description: |
- Freeciv21 is a free and open source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age.
- This snap package contains everything you need to play local single-player games against the computer as well as connect to online multi-player games against human opponents.
- Freeciv21 is based on the Qt framework and brought to you by the team at Longturn.net.
+ Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+
+ Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.
+
+ The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.
# TODO: At some point, will want to integrate into cmake process and configure_file()
version: '3.1-dev'
@@ -35,7 +38,7 @@ issues: https://github.com/longturn/freeciv21/issues/new/choose
confinement: strict
compression: lzo
-# The base snap is the execution environment and is based on Ubuntu 22.04
+# The base snap is the execution environment and is based on Ubuntu 22.04
# running in an LXD virtual machine
base: core22
diff --git a/docs/Getting/about.rst b/docs/Getting/about.rst
index ecc96661e1..a4293a744c 100644
--- a/docs/Getting/about.rst
+++ b/docs/Getting/about.rst
@@ -24,12 +24,18 @@ About Freeciv21
|
-Freeciv21 is a turn-based strategy game, in which each player becomes the leader of a civilization. You
-compete against several opponents to build cities, use them to support a military and economy, and finally
-to complete an empire that survives all encounters with its neighbors to emerge victorious. Each opponent
-may be either another human or controlled by the computer. All players begin at the dawn of history in 4,000
-BCE with a handful of units. Depending on the ruleset selected this is typically an :unit:`Explorer` and a
-couple of :unit:`Settlers`. The race then begins to expand outward from those humble beginnings.
+.. The top level description is also in README.md, freeciv21-server.rst, the 4 metainfo files, and snapcraft.yaml.
+Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the
+leader of a civilization. You compete against several opponents to build cities and use them to support a
+military and an economy. Players strive to complete an empire that survives all encounters with its neighbors
+to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+
+Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived
+focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against
+the computer or other people in an active online community.
+
+The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports
+both hex and square tiles and is easily modified to create custom rules.
Achieving success requires a balance between economic expansion, military strength, and technological
development. Not only must you develop all three in concert to both expand and successfully defend your
diff --git a/docs/Manuals/Program/freeciv21-client.rst b/docs/Manuals/Program/freeciv21-client.rst
index a497334703..73ba7a04d5 100644
--- a/docs/Manuals/Program/freeciv21-client.rst
+++ b/docs/Manuals/Program/freeciv21-client.rst
@@ -16,7 +16,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
This is the client interface `program` used to connect to a Freeciv21 server. For more information on the
server, refer to freeciv21-server(6). The program can be launched without any command line parameters. A
diff --git a/docs/Manuals/Program/freeciv21-game-manual.rst b/docs/Manuals/Program/freeciv21-game-manual.rst
index b9f4e0f7bb..5a0532b371 100644
--- a/docs/Manuals/Program/freeciv21-game-manual.rst
+++ b/docs/Manuals/Program/freeciv21-game-manual.rst
@@ -15,7 +15,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
The freeciv21-server(6) program has its own command line interface. This page describes all of the server
option directives an administrator can issue to the freeciv21-server. For more information on the server,
diff --git a/docs/Manuals/Program/freeciv21-manual.rst b/docs/Manuals/Program/freeciv21-manual.rst
index 7482bbaf9f..73ac5cd85f 100644
--- a/docs/Manuals/Program/freeciv21-manual.rst
+++ b/docs/Manuals/Program/freeciv21-manual.rst
@@ -15,7 +15,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
This is a program to read a set of `RULESET` files and write a manual to a set of HTML files of the same name.
diff --git a/docs/Manuals/Program/freeciv21-modpack-qt.rst b/docs/Manuals/Program/freeciv21-modpack-qt.rst
index 3854869084..b832a5b142 100644
--- a/docs/Manuals/Program/freeciv21-modpack-qt.rst
+++ b/docs/Manuals/Program/freeciv21-modpack-qt.rst
@@ -14,7 +14,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
This is a program to read and install a modpack URL from the command line. When given no command line
parameters the Qt base GUI will load and allow for modpack installation. For a pure command line modpack
diff --git a/docs/Manuals/Program/freeciv21-modpack.rst b/docs/Manuals/Program/freeciv21-modpack.rst
index 58acda0b22..bcc63e141b 100644
--- a/docs/Manuals/Program/freeciv21-modpack.rst
+++ b/docs/Manuals/Program/freeciv21-modpack.rst
@@ -14,7 +14,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
This is a program to read and install a modpack URL from the command line. If you are looking for a GUI
based modpack installer, refer to freeciv21-modpack-qt(6).
diff --git a/docs/Manuals/Program/freeciv21-ruleup.rst b/docs/Manuals/Program/freeciv21-ruleup.rst
index 44eb49d715..628c390def 100644
--- a/docs/Manuals/Program/freeciv21-ruleup.rst
+++ b/docs/Manuals/Program/freeciv21-ruleup.rst
@@ -14,7 +14,7 @@ DESCRIPTION
.. include:: freeciv21-server.rst
:start-line: 17
- :end-line: 29
+ :end-line: 30
This command line utility allows a user to upgrade a ruleset designed for an older version of Freeciv21 to
work on a newer version. freeciv21-ruleup does not create well-formatted human-readable ruleset files, so some
diff --git a/docs/Manuals/Program/freeciv21-server.rst b/docs/Manuals/Program/freeciv21-server.rst
index b4e3d590e4..1eb25dd548 100644
--- a/docs/Manuals/Program/freeciv21-server.rst
+++ b/docs/Manuals/Program/freeciv21-server.rst
@@ -15,14 +15,18 @@ SYNOPSIS
DESCRIPTION
===========
-Freeciv21 is a free turn-based empire-building strategy game inspired by the history of human civilization.
-The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age.
-
-Players of Civilization II\ |reg| by Microprose\ |reg| should feel at home. Freeciv21 takes its roots in the
-well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive
-**multiplayer environments**.
-
-Freeciv21 is maintained by the team over at Longturn.net.
+.. This description is also in README.md, about.rst, the 4 metainfo files, and snapcraft.yaml
+Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the
+leader of a civilization. You compete against several opponents to build cities and use them to support a
+military and an economy. Players strive to complete an empire that survives all encounters with its neighbors
+to emerge victorious. Play begins at the dawn of history in 4,000 BCE.
+
+Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived
+focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against
+the computer or other people in an active online community.
+
+The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports
+both hex and square tiles and is easily modified to create custom rules.
An HTML version of this manual page along with much more information is available on our documentation
website at https://longturn.readthedocs.io/.
-Freeciv21 is an empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the Stone Age to the Space Age. Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments.
+
+
+Freeciv21 is a free open source turn-based empire-building 4x strategy game, in which each player becomes the leader of a civilization. You compete against several opponents to build cities and use them to support a military and an economy. Players strive to complete an empire that survives all encounters with its neighbors to emerge victorious. Play begins at the dawn of history in 4,000 BCE.