From: Sarah Hoffmann Date: Sun, 12 Mar 2017 12:59:11 +0000 (+0100) Subject: Merge pull request #660 from mtmail/new-github-URL X-Git-Tag: v3.0.0~57 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a793f698f3162866d73e64af1a757fc0348660be?hp=9358243b665ed4046f927919772bb9713d27bdbd Merge pull request #660 from mtmail/new-github-URL github.com/twain47 => github.com/openstreetmap --- diff --git a/README.md b/README.md index 73c62a20..70ef5793 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,4 @@ For questions you can join the geocoding mailinglist, see http://lists.openstreetmap.org/listinfo/geocoding Bugs may be reported on the github project site: -https://github.com/twain47/Nominatim +https://github.com/openstreetmap/Nominatim diff --git a/VAGRANT.md b/VAGRANT.md index 6a680b53..56a63432 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -17,7 +17,7 @@ is. 3. Nominatim - git clone --recursive https://github.com/twain47/Nominatim.git + git clone --recursive https://github.com/openstreetmap/Nominatim.git If you haven't used `--recursive`, then you can load the submodules using diff --git a/docs/Import_and_update.md b/docs/Import_and_update.md index d4d89592..cd9ff697 100644 --- a/docs/Import_and_update.md +++ b/docs/Import_and_update.md @@ -178,5 +178,5 @@ The following command will keep your database constantly up to date: If you have imported multiple country extracts and want to keep them up-to-date, have a look at the script in -[issue #60](https://github.com/twain47/Nominatim/issues/60). +[issue #60](https://github.com/openstreetmap/Nominatim/issues/60). diff --git a/docs/install-on-centos-7.md b/docs/install-on-centos-7.md index 3a563541..037f41be 100644 --- a/docs/install-on-centos-7.md +++ b/docs/install-on-centos-7.md @@ -141,7 +141,7 @@ Get the source code from Github and change into the source directory cd $USERHOME - git clone --recursive git://github.com/twain47/Nominatim.git + git clone --recursive git://github.com/openstreetmap/Nominatim.git cd Nominatim diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md index 8ddad65e..b03685cf 100644 --- a/docs/install-on-ubuntu-16.md +++ b/docs/install-on-ubuntu-16.md @@ -127,7 +127,7 @@ Get the source code from Github and change into the source directory cd $USERHOME - git clone --recursive git://github.com/twain47/Nominatim.git + git clone --recursive git://github.com/openstreetmap/Nominatim.git cd Nominatim diff --git a/lib/init-website.php b/lib/init-website.php index 967c6cce..7d5cef1a 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -27,7 +27,7 @@ function chksql($oSql, $sMsg = "Database request failed")

Nominatim has encountered an internal error while accessing the database. This may happen because the database is broken or because of a bug in the software. If you think it is a bug, feel free to report - it over on + it over on Github. Please include the URL that caused the problem and the complete error details below.

Message: $sMsg

@@ -52,7 +52,7 @@ function failInternalError($sError, $sSQL = false, $vDumpVar = false) echo "

Internal Server Error

"; echo '

Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.

'; echo "

Details: ".$sError,"

"; - echo '

Feel free to file an issue on Github. '; + echo '

Feel free to file an issue on Github. '; echo 'Please include the error message above and the URL you used.

'; if (CONST_Debug) { echo "

Debugging Information


"; @@ -77,7 +77,7 @@ function userError($sError) echo "

Bad Request

"; echo '

Nominatim has encountered an error with your request.

'; echo "

Details: ".$sError."

"; - echo '

If you feel this error is incorrect feel file an issue on Github. '; + echo '

If you feel this error is incorrect feel file an issue on Github. '; echo 'Please include the error message above and the URL you used.

'; echo "\n\n"; exit; diff --git a/lib/template/includes/report-errors.php b/lib/template/includes/report-errors.php index a6a9be62..5d0ac904 100644 --- a/lib/template/includes/report-errors.php +++ b/lib/template/includes/report-errors.php @@ -7,7 +7,7 @@ to check how the address was generated before reporting a problem.

- Use Nominatim issues on github + Use Nominatim issues on github to report problems.