diff --git a/doc/authors.txt b/doc/authors.txt index 0241b7fb..bcaa81ae 100644 --- a/doc/authors.txt +++ b/doc/authors.txt @@ -5,7 +5,7 @@ - Nicolas Pomarede : Project admin, improving CPU, video, sound, IKBD and floppy emulation. -- Thomas Huth : Project initiator and +- Thomas Huth : Project initiator and admin, currently more or less in hibernation mode. - Eero Tamminen : Speed improvements & code diff --git a/doc/compatibility.html b/doc/compatibility.html index 42e1a8a7..087ec1fe 100644 --- a/doc/compatibility.html +++ b/doc/compatibility.html @@ -56,8 +56,8 @@ This list has been written by: Thomas Huth, Eero Tammin & Nicolas Pomarede

-Hatari on the WWW: http://hatari.berlios.de/ +Hatari on the WWW: http://hatari.tuxfamily.org/

Index

diff --git a/doc/fr/hatari.1 b/doc/fr/hatari.1 index 27c14a9d..6a02a70a 100644 --- a/doc/fr/hatari.1 +++ b/doc/fr/hatari.1 @@ -252,7 +252,7 @@ l'Atari ST tant que l'emulation du joystick par le clavier est inactive. La documentation originale du programme, habituellement en /usr/share/doc/. .PP -La page d'accueil d'Hatari : http://hatari.berlios.de/ +La page d'accueil d'Hatari : http://hatari.tuxfamily.org/ .SH "FICHIERS" .TP diff --git a/doc/hatari.1 b/doc/hatari.1 index 10f46171..353dea9a 100644 --- a/doc/hatari.1 +++ b/doc/hatari.1 @@ -439,7 +439,7 @@ The main program documentation, usually in /usr/share/doc/. Among other things it contains an extensive usage manual, software compatiblity list and release notes. .PP -The homepage of hatari: http://hatari.berlios.de/ +The homepage of hatari: http://hatari.tuxfamily.org/ .PP Other Hatari programs and utilities: .br diff --git a/doc/manual.html b/doc/manual.html index 11f60834..a0211e5f 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -62,8 +62,8 @@ Manual written by: Thomas Huth, Matthias Arndt & Eero Tamminen

-Hatari on the WWW: http://hatari.berlios.de/ +Hatari on the WWW: http://hatari.tuxfamily.org/

Index

diff --git a/etc/README b/etc/README index a90232a8..99a49202 100644 --- a/etc/README +++ b/etc/README @@ -10,7 +10,7 @@ Just copy suitable config file to the device /etc/ directory as Below are some comments about the configuration files. Some comments about suitable compiler options for these platforms can be found from the Hatari v1.4 default Makefile (which is now replaced with CMake): -http://hg.berlios.de/repos/hatari/file/dabb65b541c9/Makefile-default.cnf +http://hg.tuxfamily.org/mercurialroot/hatari/hatari/file/dabb65b541c9/Makefile-default.cnf Hatari v1.5 gets screen size automatically, so setting that shouldn't anymore be necessary, but shouldn't harm either. diff --git a/hatari.spec b/hatari.spec index 7b5069f8..51312230 100644 --- a/hatari.spec +++ b/hatari.spec @@ -8,7 +8,7 @@ BuildRequires: bash coreutils cpio cpp diffutils file filesystem findutils glibc glibc-devel grep groff gzip libgcc m4 make man mktemp patch readline sed tar unzip util-linux zlib zlib-devel SDL SDL-devel autoconf binutils gcc libtool rpm Name: hatari -URL: http://hatari.berlios.de/ +URL: http://hatari.tuxfamily.org/ License: GPL Group: System/Emulators/Other Autoreqprov: on diff --git a/python-ui/README b/python-ui/README index 00ac3ac5..28029fa0 100644 --- a/python-ui/README +++ b/python-ui/README @@ -26,7 +26,7 @@ My guess at the required versions for the dependencies are: - PyGtk >= 2.12 (on Debian/Ubuntu PyGtk is in python-gtk2 package) Hatari UI is included with the Hatari sources: - http://hg.berlios.de/repos/hatari/file/tip/ + http://hg.tuxfamily.org/mercurialroot/hatari/hatari/file/tip/python-ui Hatari UI has been tested only on Linux (Ubuntu v7.04 and Debian Lenny & Squeeze). I would assume it works also on other unix systems such as diff --git a/python-ui/dialogs.py b/python-ui/dialogs.py index 804c3251..52696334 100644 --- a/python-ui/dialogs.py +++ b/python-ui/dialogs.py @@ -88,7 +88,7 @@ class AboutDialog(HatariUIDialog): dialog.set_transient_for(parent) dialog.set_name(UInfo.name) dialog.set_version(UInfo.version) - dialog.set_website("http://hatari.berlios.de/") + dialog.set_website("http://hatari.tuxfamily.org/") dialog.set_website_label("Hatari emulator www-site") dialog.set_authors(["Eero Tamminen"]) dialog.set_artists(["The logo is from Hatari"]) diff --git a/readme.txt b/readme.txt index 0d84a57f..a73330a2 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Version 1.5 - http://hatari.berlios.de/ + http://hatari.tuxfamily.org/ Contents: @@ -174,7 +174,7 @@ doc/manual.html. Here are just some hints for the impatient people: If you want to contact the authors of Hatari, please have a look at the file doc/authors.txt for the e-mail addresses or use the Hatari mailing list. -Visit the project pages of Hatari on Berlios.de for more details: +Visit the website of Hatari on Tuxfamily.org for more details: - http://developer.berlios.de/projects/hatari/ + http://hatari.tuxfamily.org/contact.html diff --git a/src/gui-osx/SDLMain.m b/src/gui-osx/SDLMain.m index b3aa8caa..4eb6af07 100644 --- a/src/gui-osx/SDLMain.m +++ b/src/gui-osx/SDLMain.m @@ -603,7 +603,7 @@ static void CustomApplicationMain (int argc, char **argv) - (IBAction)help:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://hatari.berlios.de/docs.html"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://hatari.tuxfamily.org/docs.html"]]; } diff --git a/tools/hmsa/hmsa.1 b/tools/hmsa/hmsa.1 index 55ef3931..b35c9d2a 100644 --- a/tools/hmsa/hmsa.1 +++ b/tools/hmsa/hmsa.1 @@ -52,7 +52,7 @@ Convert an MSA format disk image to an ST format one: .IR zip2st (1), .IR atari\-hd\-image (1) .SH "AUTHOR" -Written by Thomas Huth . This manual page +Written by Thomas Huth . This manual page added by Eero Tamminen . .SH "LICENSE" This program is free software; you can redistribute it and/or modify diff --git a/tools/hmsa/readme-hmsa.txt b/tools/hmsa/readme-hmsa.txt index 8f9e2868..be8adb42 100644 --- a/tools/hmsa/readme-hmsa.txt +++ b/tools/hmsa/readme-hmsa.txt @@ -46,7 +46,7 @@ SEE ALSO Hmsa is part of hatari. AUTHOR - Written by Thomas Huth . This manual page and + Written by Thomas Huth . This manual page and empty disk creation was added by Eero Tamminen. LICENSE diff --git a/tools/zip2st.1 b/tools/zip2st.1 index 53870830..de4a070a 100644 --- a/tools/zip2st.1 +++ b/tools/zip2st.1 @@ -26,9 +26,9 @@ The contents of the uncompressed zip file need to be smaller than .IR mtools (1), .IR dd (1). .SH "AUTHOR" -Written by Thomas Huth . +Written by Thomas Huth . .PP -This manual page was written by Teemu Hukkanen +This manual page was written by Teemu Hukkanen for the Debian project and later modified by Eero Tamminen to suit the latest version of Hatari. .SH "LICENSE"