From e4b7815d9f4b394de62760dc48b71bdbf2600b7c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 10 Feb 2021 00:51:38 +0200 Subject: [PATCH 11/11] Replace gtk3-client with gtk3.22-client in examples in documentation See osdn #41534 Signed-off-by: Marko Lindqvist --- doc/FAQ | 16 ++++++++-------- doc/README | 20 ++++++++++---------- doc/README.graphics | 4 ++-- doc/README.sound | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/FAQ b/doc/FAQ index 21f0ae3169..a5b7162c55 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -86,8 +86,8 @@ 1.1 OK, so I installed Freeciv. How do I play? Start the client. Depending on your system, you might choose it from a - menu, double-click on the freeciv-gtk3 executable program, or type - freeciv-gtk3 in a terminal (to start the default "gtk3" client). + menu, double-click on the freeciv-gtk3.22 executable program, or type + freeciv-gtk3.22 in a terminal (to start the default "gtk3.22" client). Once the client starts, to begin a single-player game, select Start new game. Now edit your game settings (the defaults should be fine for a @@ -670,7 +670,7 @@ Starting game. contributed binaries. If you have a working client, and you don't know its version, start it, load a game or scenario, or just start a new game, click on Help for the help menu, and on About Freeciv to see the - version and the client type (GTK2, GTK3, QT, SDL2, …). + version and the client type (GTK2, GTK3.22, QT, SDL2, …). It's possible that not all precompiled binaries and ports have been updated to 2.6.0 yet. If you can contribute, please do! Prepare a @@ -713,7 +713,7 @@ Starting game. If for some reason you can't use the start-screen interface for loading a game, you can load one directly through the client or server command line (see Command-line options). You can start a client such as - freeciv-gtk3, or freeciv-server, with the -f option, for example: + freeciv-gtk3.22, or freeciv-server, with the -f option, for example: freeciv-server -f freeciv-T0175-Y01250-auto.sav.bz2 Or you can use the /load command inside the server before starting the @@ -782,7 +782,7 @@ types, and technologies? The recommended client is the Gtk client. There are a range of different Gtk clients for different versions of the Gtk library—Gtk2/3/etc—but they all support more or less the same feature - set. If in doubt, pick the Gtk3 client. + set. If in doubt, pick the Gtk3.22 client. The Qt client is a newer client using the Qt toolkit. It has a more immersive interface. It supports most features, with the notable @@ -826,7 +826,7 @@ types, and technologies? Further instructions are in ./doc/README.sound in the source tarball. If sound does not work, try: -freeciv-gtk3 -d 3 -P -S stdsounds +freeciv-gtk3.22 -d 3 -P -S stdsounds This will help you get some debug information, which might give a clue why the sound does not work. @@ -1019,9 +1019,9 @@ or add cities to the list for an existing nation? you start it to force use of a specific tileset. This also requires that the tileset has been installed in a correct place. Open a Command Prompt, find the client executable, and start the client with the - --tiles tilesetname option. For example for the gtk3 client, you might + --tiles tilesetname option. For example for the gtk3.22 client, you might start -freeciv-gtk3 --tiles hexemplio +freeciv-gtk3.22 --tiles hexemplio ------- diff --git a/doc/README b/doc/README index a8881464df..9a9e2787ef 100644 --- a/doc/README +++ b/doc/README @@ -101,11 +101,11 @@ Starting a game: NOTE: The following examples assume that Freeciv has been installed on - your system, and that the directory containing the "freeciv-gtk3" + your system, and that the directory containing the "freeciv-gtk3.22" and "freeciv-server" programs is in your PATH. If Freeciv is not installed, then you may want to use the "fcgui" and "fcser" programs, which can be found in the top Freeciv directory. They are used - in exactly the same fashion as "freeciv-gtk3" and "freeciv-server". + in exactly the same fashion as "freeciv-gtk3.22" and "freeciv-server". Running Freeciv involves starting the server, then the client(s) and AI(s), then telling the server to start the game. Here are the @@ -175,7 +175,7 @@ Client: Now all the human players should join, by running the Freeciv client: - | % freeciv-gtk3 + | % freeciv-gtk3.22 This assumes the server is running on the same machine. If not, you can either specify it on the command line with the '--server' option, @@ -184,13 +184,13 @@ Client: For example, suppose the server is running on a different machine called 'neptune'. Then players would join with a command like: - | % freeciv-gtk3 --server neptune + | % freeciv-gtk3.22 --server neptune If you're the only human player, then only one client needs to be started. In standard Unix fashion you can start the client "in the background" by appending an ampersand: - | % freeciv-gtk3 & + | % freeciv-gtk3.22 & Another option for the client you may like to try is the '--tiles' option, which can be used to select different "tilesets" (that is, @@ -214,7 +214,7 @@ Client: To try another one, for instance the trident tileset, start the client with: - | % freeciv-gtk3 --tiles trident + | % freeciv-gtk3.22 --tiles trident Other tilesets are available from http://www.freeciv.org/wiki/Tilesets @@ -292,7 +292,7 @@ Caveats: incompatible with any 2.4.x or earlier versions. 2) If the Metaserver button in the connection dialog doesn't work, - check if your ISP uses a mandatory WWW proxy and make freeciv-gtk3 + check if your ISP uses a mandatory WWW proxy and make freeciv-gtk3.22 use it through the $http_proxy environment variable. For instance, if the proxy is proxy.myisp.com port 8888, set $http_proxy to http://proxy.myisp.com:8888/ before starting the client. @@ -413,7 +413,7 @@ or, if the save-file was created by a server that compressed it: Now the players can rejoin the game: - | % freeciv-gtk3 -n Alexander + | % freeciv-gtk3.22 -n Alexander Notice how the player-name is specified with the -n option. It's vital that the player uses the same name as they had when the game was running, @@ -431,7 +431,7 @@ You may choose which local language to use by specifying a "locale". Each locale has a standard name (e.g., 'de' for German). If you have installed Freeciv, you may choose a locale by setting the environment variable LANG to that locale's standard name before running freeciv-server -and freeciv-gtk3. +and freeciv-gtk3.22. For example, assuming you wish to use the German localization, you would do: @@ -492,7 +492,7 @@ level messages. Example: - | % freeciv-gtk3 --debug fatal + | % freeciv-gtk3.22 --debug fatal This suppresses all non-fatal client log messages. diff --git a/doc/README.graphics b/doc/README.graphics index fa70ffd28d..8370ff23de 100644 --- a/doc/README.graphics +++ b/doc/README.graphics @@ -8,8 +8,8 @@ Using Graphics: To use different graphics with Freeciv, use the '--tiles' argument to the Freeciv client. Eg, to use the 'engels' graphics, start the client as: - - freeciv-gtk3 --tiles engels + + freeciv-gtk3.22 --tiles engels What Freeciv actually does in this case is look for a file called 'engels.tilespec' somewhere in your Freeciv data path. (See the file diff --git a/doc/README.sound b/doc/README.sound index fcf5337f7b..c596224b81 100644 --- a/doc/README.sound +++ b/doc/README.sound @@ -13,7 +13,7 @@ Tags are used to give an easy way to change sounds. A specfile is used to indicate which tags refer to which sound files. A change of spec file, given as an option at startup, will change sounds. For example, - freeciv-gtk3 --Sound mysounds.spec + freeciv-gtk3.22 --Sound mysounds.spec will read sound files from "mysounds.spec". You will need to download or copy or link those sounds into whichever directory is mentioned in this @@ -37,7 +37,7 @@ set of available plugins depend on the libraries found on the host system. You can choose the plugin the client should use via the command line: - freeciv-gtk3 --Plugin sdl + freeciv-gtk3.22 --Plugin sdl You can choose "none" to mute the client. Freeciv currently supports the following plugins: -- 2.30.0