From 72441220eed0a4f1cc8ca8779c09fc9fa73c76f0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 28 May 2022 18:33:46 +0300 Subject: [PATCH 35/35] Remove trailing spaces from documents See osdn #44698 Signed-off-by: Marko Lindqvist --- INSTALL | 20 +++++++++--------- NEWS | 30 +++++++++++++-------------- README.md | 10 ++++----- data/granularity/README.granularity | 2 +- data/helpdata.txt | 32 ++++++++++++++--------------- dependencies/luasql/README | 4 ++-- dependencies/tolua-5.2/README | 12 +++++------ 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/INSTALL b/INSTALL index 18bf9d6097..2f28cc46c4 100644 --- a/INSTALL +++ b/INSTALL @@ -116,9 +116,9 @@ These forms have different prerequisites, explained separately below. Your system will need to satisfy at least one of these sets of prerequisites. -Note that most Linux systems have separate library packages for "runtime" -library support and for development support (for compiling programs -which use those libraries). To compile Freeciv on such systems you +Note that most Linux systems have separate library packages for "runtime" +library support and for development support (for compiling programs +which use those libraries). To compile Freeciv on such systems you will need to have the appropriate "development" packages installed. Sound support is built in by default if development files for @@ -213,11 +213,11 @@ following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+. https://www.libsdl.org/release/SDL2-2.0.18.tar.gz To compile the client using the "SDL2" library add "--enable-client=sdl2" - to the Freeciv configure script. See the section below for more + to the Freeciv configure script. See the section below for more information about the configure script. - The "SDL2_image" library. - + This library loads the PNG images (with the help of libpng) and converts them to "SDL surfaces" that can be handled by the "SDL" library. You may obtain it at: @@ -309,7 +309,7 @@ script, try the --help option, like this: % ./configure --help -By default the configure script will choose the Gtk+ client if the +By default the configure script will choose the Gtk+ client if the required libraries are found. If you prefer to override this default, you can give configure the "--enable-client=sdl2" option. @@ -358,7 +358,7 @@ If for some reason using "configure" gives you trouble, follow these steps: If all has gone well previous to this point, then compiling Freeciv should be as easy as typing "make" (or preferably, "gmake"). -If you have problems, read the file BUGS, and follow the advice +If you have problems, read the file BUGS, and follow the advice carefully. If the problem is with "gettext", please read the Native Language Support section, below, for possible work-arounds. @@ -391,10 +391,10 @@ Typing "make install" should install everything correctly on your machine. You may like to use the --prefix=DIR configure option (see the Generating the Makefile section) to ensure the files get placed where you want. -When the Freeciv client and Freeciv server are run they both need to +When the Freeciv client and Freeciv server are run they both need to find some files from the "data" directory. By default freeciv looks -in the following directories, in order, for any data files: the current -directory; the "data" subdirectory of the current directory; the +in the following directories, in order, for any data files: the current +directory; the "data" subdirectory of the current directory; the subdirectory ".freeciv" in the user's home directory; and the directory where the files are placed by running "make install". You can override this search patch by setting the FREECIV_DATA_PATH environment variable, to diff --git a/NEWS b/NEWS index db089cdffc..9ca59c4f5f 100644 --- a/NEWS +++ b/NEWS @@ -3248,7 +3248,7 @@ WHAT'S CHANGED SINCE 1.14.2 - New (and incompatible) metaserver. - New ALSA sound plugin. - The s(entry) command no longer doubles as a means to put units on - boats - use the new l(oad) command instead. + boats - use the new l(oad) command instead. - Many more (smaller) changes, and massive changes under the hood. WHAT'S CHANGED SINCE 1.13.0 @@ -3261,22 +3261,22 @@ WHAT'S CHANGED SINCE 1.13.0 - Specialists are taken from content citizens first, instead of from unhappy citizens first. This makes it more difficult to quell unrest using taxmen and scientists. - - You now start with no technologies by default, and angry citizens + - You now start with no technologies by default, and angry citizens are enabled by default, although they will rarely make an apperance. - The algorithm used for calculating the effects of tax settings has - been changed. It is now no longer possible to get 100% effect from + been changed. It is now no longer possible to get 100% effect from 60% choice of tax goal. - A new, historically more correct version of the rulesets included. - - There is an option to require several turns of rapture/celebration + - There is an option to require several turns of rapture/celebration before it takes effect. See "show rapturedelay" in server. - The sequence of some end of turn activities have been regrouped. - - Several AI improvements. It should now build and buy units and + - Several AI improvements. It should now build and buy units and buildings slightly more intelligently. - Many internal code improvements that will lead to more features later. - /fix and /unfix commands to stop modifications after game has started. - - The server commands "rulesout", "log", "freestyle" and "crash" + - The server commands "rulesout", "log", "freestyle" and "crash" have been removed, while "rfcstyle" now toggles between rfcstyle and freestyle. - civ2 ruleset now more accurately reflects civ2 deity level defaults. @@ -3294,7 +3294,7 @@ WHAT'S CHANGED SINCE 1.12.0 - Windows version of the client. It has improved connection dialog and supports loading and saving from the client. - GTK 2.0 version of the client. - - The client will try to suggest names for your cities that + - The client will try to suggest names for your cities that correspond with what they mean. - Improved players dialog shows sortable and colored information, including the players' flags. @@ -3306,14 +3306,14 @@ WHAT'S CHANGED SINCE 1.12.0 - A new flexible timeout set through "timeoutinc" server option. - Leftover research bulbs will carry over to next advance. - Trade routes are more effective. - - Units attacking ships in cities double their firepower, while + - Units attacking ships in cities double their firepower, while defenders get only 1 firepower. - Helicopters defending against air units get 50% penalty, and have their firepower reduced to 1 against fighter units. - You can build city walls even though you have Great Wall wonder. - The Communism government's food cost in default ruleset has been changed to 1, while it has been changed to 2 for the Civ2 - ruleset. + ruleset. - Stealth fighter and bomber now really are stealthy, and are partially invisible just like subs. Also, stealth bombers have increased their attack strength from 14 to 18. @@ -3323,19 +3323,19 @@ WHAT'S CHANGED SINCE 1.12.0 Rulesets can specify starting techs. You can have more than one bonus tech. Split settler abilities. Buildings ruleset syntax has been significantly extended, but effects do not work yet. - - Server option "tinyisles" allow 1x1 size islands and + - Server option "tinyisles" allow 1x1 size islands and "separatepoles" allow continents connected to the poles - - "citymindist" specify minimum distance between cities, while - "notradesize" and "fulltradesize" regulate the trade generated + - "citymindist" specify minimum distance between cities, while + "notradesize" and "fulltradesize" regulate the trade generated by smaller cities. - You can turn on angry citizens with "angrycitizens" option. - Fortresses may give you extended vision. See watchtower options. - - If you lose your palace, you get a new one for free in a + - If you lose your palace, you get a new one for free in a randomly chosen city. This behaviour can be turned off with the server option "savepalace". - Rulesets are now loaded from inside the server through the "rulesetdir" command. - - The limit on the number of nations that can be included with + - The limit on the number of nations that can be included with Freeciv has been removed. - The format of the isometric tileset spec-files has changed. - The map and ai code has been cleaned up significantly. @@ -3554,7 +3554,7 @@ WHAT'S CHANGED SINCE 1.9.0: - Several AI improvements. - New ruleset support for CITIES, most notably cities are now drawn in different sizes and styles. - - Allow specifying unambiguous player name prefix, instead of full + - Allow specifying unambiguous player name prefix, instead of full player name, for server commands taking a player name argument. - Added multi-client configuration support. - Added 'read' and 'write' server commands. diff --git a/README.md b/README.md index a8ae51d6ce..b24fc732c2 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ Freeciv ======= -[![Build Status](https://github.com/freeciv/freeciv/workflows/continuous%20integration/badge.svg)](https://github.com/freeciv/freeciv/actions?query=workflow%3A%22continuous+integration%22) +[![Build Status](https://github.com/freeciv/freeciv/workflows/continuous%20integration/badge.svg)](https://github.com/freeciv/freeciv/actions?query=workflow%3A%22continuous+integration%22) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) -Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. - +Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. + Please see the [doc](doc) directory for a complete list of documentation files. Links ===== -Freeciv website: [Freeciv.org](http://www.freeciv.org/) +Freeciv website: [Freeciv.org](http://www.freeciv.org/) Submit patches: [OSDN](https://osdn.net/projects/freeciv/ticket/) -Community forum: [forum.freeciv.org](http://forum.freeciv.org/) +Community forum: [forum.freeciv.org](http://forum.freeciv.org/) diff --git a/data/granularity/README.granularity b/data/granularity/README.granularity index 4263ea34b8..6940b7ca40 100644 --- a/data/granularity/README.granularity +++ b/data/granularity/README.granularity @@ -1,5 +1,5 @@ - General + General ------- Ruleset with high granularity values. This makes it possible to have diff --git a/data/helpdata.txt b/data/helpdata.txt index 340f7fc084..3a4aaf767e 100644 --- a/data/helpdata.txt +++ b/data/helpdata.txt @@ -2,7 +2,7 @@ ; ; Each [help_*] is a help node. ; -; 'name' = name of node as shown in help browser; the number of leading +; 'name' = name of node as shown in help browser; the number of leading ; spaces in 'name' indicates nesting level for display. ; ; 'text' = the helptext for this node; can be an array of text, which @@ -10,8 +10,8 @@ ; translations on paragraph level.) ; ; 'generate' = means replace this node with generated list of game -; elements; current categories are: -; "Units", "Improvements", "Wonders", "Techs", +; elements; current categories are: +; "Units", "Improvements", "Wonders", "Techs", ; "Terrain", "Extras", "Goods", "Specialists", ; "Governments", "Ruleset", "Tileset", "Nations" ; As for 'name', the number of spaces before the category @@ -19,23 +19,23 @@ ; Some types have additional arguments, for instance ; "categories" for extras. See helpdata.c. ; -; Within the text, the help engine recognizes a few "generated table"s. -; These are generated by the help engine, and inserted at the point of +; Within the text, the help engine recognizes a few "generated table"s. +; These are generated by the help engine, and inserted at the point of ; reference. They are referenced by placing a $ in the first column -; of a separate paragraph, followed immediately with the name of the +; of a separate paragraph, followed immediately with the name of the ; generated table. See the code in helpdata.c for the names of tables ; which can be referenced. ; -; This file no longer has a max line length: strings are wrapped -; internally. However to do non-wrapping formatting, make sure to -; insert hard newlines "\n" such that lines are less than 68 chars +; This file no longer has a max line length: strings are wrapped +; internally. However to do non-wrapping formatting, make sure to +; insert hard newlines "\n" such that lines are less than 68 chars ; long. ; This marks 68 char limit -------------------------------------->| ; -; Notice not all entries are marked for i18n, as some are not +; Notice not all entries are marked for i18n, as some are not ; appropriate to translate. ; -; Comments with c-style comments are just to stop xgettext from +; Comments with c-style comments are just to stop xgettext from ; complaining about stray single-quote characters. [help_overview] @@ -186,7 +186,7 @@ previously.\ If you move all of your citizens into the city and right-click \ on the central tile of the land, the citizens will be \ rearranged to maximize food production.\ -"), +"), ; Above: probably some other AI maximization choice now --dwp _("\ The golden rule of taking care of a city is that there should be \ @@ -1285,7 +1285,7 @@ Each round of combat, a random number between 1 and 282 is \ generated. If the number is greater than 202 (about a 28% chance), \ the defender loses 1 hit point. Otherwise (about a 72% chance), the \ attacker loses 1 point.\ -"), +"), ; /* Double-check my calculations.... Consider 28 rounds of combat. ; The attacker should win about 8 of them, taking 8 HP off the ; defender's 20 HP total. The defender should win the other 20, @@ -1330,7 +1330,7 @@ _("\ Each round, a random number from 1 to 405 is generated. If it is \ greater than 225 (about a 44% chance) the defender loses 1 hit \ point. Otherwise, the attacker loses 1 hit point.\ -"), +"), ; /* Please, someone double-check my probability computations! :-( ; Consider 44 rounds of combat: the Battleship should win 20 of ; them, and the Alpine Troops 24. That's enough to kill the Alpine @@ -2017,12 +2017,12 @@ mailing list:\ freeciv-i18n@freelists.org\ " -[help_copying] +[help_copying] ; Note: GPL text is _deliberately_ not i18n-marked. ; We may want to do something (eg, include FSF-authorised translations ; as well as English where appropriate?) but not simply bundle with -; other translations. Would be nicer to have means to just keep +; other translations. Would be nicer to have means to just keep ; COPYING itself in datadir, and slurp from there into help somehow... name = _("Copying") diff --git a/dependencies/luasql/README b/dependencies/luasql/README index b776f28b63..fb56e99170 100644 --- a/dependencies/luasql/README +++ b/dependencies/luasql/README @@ -3,11 +3,11 @@ http://keplerproject.github.io/luasql LuaSQL is a simple interface from Lua to a DBMS. It enables a Lua program to: - * Connect to ODBC, ADO, Oracle, MySQL, SQLite, Firebird and PostgreSQL databases; + * Connect to ODBC, ADO, Oracle, MySQL, SQLite, Firebird and PostgreSQL databases; * Execute arbitrary SQL statements; * Retrieve results in a row-by-row cursor fashion. -LuaSQL is free software and uses the same license as Lua 5.1. +LuaSQL is free software and uses the same license as Lua 5.1. Source code for LuaSQL can be downloaded from its GitHub repository. diff --git a/dependencies/tolua-5.2/README b/dependencies/tolua-5.2/README index 2dcceecb24..249e194ce4 100644 --- a/dependencies/tolua-5.2/README +++ b/dependencies/tolua-5.2/README @@ -2,17 +2,17 @@ This is tolua-5.2.4 This is tolua-5.1 * What is tolua? - tolua is a tool that greatly simplifies the integration of C/C++ code - with Lua. Based on a "cleaned" header file, tolua automatically generates + tolua is a tool that greatly simplifies the integration of C/C++ code + with Lua. Based on a "cleaned" header file, tolua automatically generates the binding code to access C/C++ features from Lua. Using Lua API and - tag method facilities, the current version automatically maps C/C++ - constants, external variables, functions, namespace, classes, and methods + tag method facilities, the current version automatically maps C/C++ + constants, external variables, functions, namespace, classes, and methods to Lua. It also provides facilities to create Lua modules. * Availability tolua is freely available; you can redistribute it and/or modify it. The software provided hereunder is on an "as is" basis, and - the author has no obligation to provide maintenance, support, + the author has no obligation to provide maintenance, support, updates, enhancements, or modifications. tolua can be downloaded from the sites below: @@ -24,5 +24,5 @@ This is tolua-5.1 * Contacting the author tolua has been designed and implemented by Waldemar Celes. - Send your comments, bug reports and anything else to + Send your comments, bug reports and anything else to celes@tecgraf.puc-rio.br. -- 2.35.1