hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #660 from mtmail/new-github-URL

Browse Source 
github.com/twain47 => github.com/openstreetmap
This commit is contained in:
Sarah Hoffmann
2017-03-12 13:59:11 +01:00
committed by GitHub
parent 9358243b66 a52455f160
commit a793f698f3
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -56,4 +56,4 @@ For questions you can join the geocoding mailinglist, see
http://lists.openstreetmap.org/listinfo/geocoding http://lists.openstreetmap.org/listinfo/geocoding
Bugs may be reported on the github project site: Bugs may be reported on the github project site:
https://github.com/twain47/Nominatim https://github.com/openstreetmap/Nominatim

2
VAGRANT.md
View File

@@ -17,7 +17,7 @@ is.
3. Nominatim 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 If you haven't used `--recursive`, then you can load the submodules using

2
docs/Import_and_update.md
View File

@@ -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 If you have imported multiple country extracts and want to keep them
up-to-date, have a look at the script in 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).

2
docs/install-on-centos-7.md
View File

@@ -141,7 +141,7 @@ Get the source code from Github and change into the source directory
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/twain47/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
cd Nominatim cd Nominatim

2
docs/install-on-ubuntu-16.md
View File

@@ -127,7 +127,7 @@ Get the source code from Github and change into the source directory
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/twain47/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
cd Nominatim cd Nominatim

6
lib/init-website.php
View File

@@ -27,7 +27,7 @@ function chksql($oSql, $sMsg = "Database request failed")
<p>Nominatim has encountered an internal error while accessing the database. <p>Nominatim has encountered an internal error while accessing the database.
This may happen because the database is broken or because of a bug in 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 the software. If you think it is a bug, feel free to report
it over on <a href="https://github.com/twain47/Nominatim/issues"> it over on <a href="https://github.com/openstreetmap/Nominatim/issues">
Github</a>. Please include the URL that caused the problem and the Github</a>. Please include the URL that caused the problem and the
complete error details below.</p> complete error details below.</p>
<p><b>Message:</b> $sMsg</p> <p><b>Message:</b> $sMsg</p>
@@ -52,7 +52,7 @@ function failInternalError($sError, $sSQL = false, $vDumpVar = false)
echo "<html><body><h1>Internal Server Error</h1>"; echo "<html><body><h1>Internal Server Error</h1>";
echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>'; echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
echo "<p><b>Details:</b> ".$sError,"</p>"; echo "<p><b>Details:</b> ".$sError,"</p>";
echo '<p>Feel free to file an issue on <a href="https://github.com/twain47/Nominatim/issues">Github</a>. '; echo '<p>Feel free to file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
echo 'Please include the error message above and the URL you used.</p>'; echo 'Please include the error message above and the URL you used.</p>';
if (CONST_Debug) { if (CONST_Debug) {
echo "<hr><h2>Debugging Information</h2><br>"; echo "<hr><h2>Debugging Information</h2><br>";
@@ -77,7 +77,7 @@ function userError($sError)
echo "<html><body><h1>Bad Request</h1>"; echo "<html><body><h1>Bad Request</h1>";
echo '<p>Nominatim has encountered an error with your request.</p>'; echo '<p>Nominatim has encountered an error with your request.</p>';
echo "<p><b>Details:</b> ".$sError."</p>"; echo "<p><b>Details:</b> ".$sError."</p>";
echo '<p>If you feel this error is incorrect feel file an issue on <a href="https://github.com/twain47/Nominatim/issues">Github</a>. '; echo '<p>If you feel this error is incorrect feel file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
echo 'Please include the error message above and the URL you used.</p>'; echo 'Please include the error message above and the URL you used.</p>';
echo "\n</body></html>\n"; echo "\n</body></html>\n";
exit; exit;

2
lib/template/includes/report-errors.php
View File

@@ -7,7 +7,7 @@
to check how the address was generated before reporting a problem. to check how the address was generated before reporting a problem.
</p> </p>
<p> <p>
Use <a target="_blank" href="https://github.com/twain47/nominatim/issues">Nominatim issues on github</a> Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
to report problems. to report problems.
<!-- You can search for existing bug reports <!-- You can search for existing bug reports
<a href="http://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p> <a href="http://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>

2
vagrant/install-on-centos-7.sh
View File

@@ -144,7 +144,7 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
if [ "x$1" == "xyes" ]; then #DOCS: if [ "x$1" == "xyes" ]; then #DOCS:
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/twain47/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
#DOCS: cd Nominatim #DOCS: cd Nominatim
else #DOCS: else #DOCS:

2
vagrant/install-on-travis-ci.sh
View File

@@ -4,7 +4,7 @@
# https://docs.travis-ci.com/user/trusty-ci-environment/ # https://docs.travis-ci.com/user/trusty-ci-environment/
# Ubuntu 14 (trusty) # Ubuntu 14 (trusty)
# user 'travis' # user 'travis'
# $TRAVIS_BUILD_DIR is /home/travis/build/twain47/Nominatim/, for others see # $TRAVIS_BUILD_DIR is /home/travis/build/openstreetmap/Nominatim/, for others see
# https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables # https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
# Postgres 9.6 installed and started. role 'travis' already superuser # Postgres 9.6 installed and started. role 'travis' already superuser
# Python 3.6 # Python 3.6

2
vagrant/install-on-ubuntu-16.sh
View File

@@ -131,7 +131,7 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
if [ "x$1" == "xyes" ]; then #DOCS: if [ "x$1" == "xyes" ]; then #DOCS:
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/twain47/Nominatim.git git clone --recursive git://github.com/openstreetmap/Nominatim.git
#DOCS: cd Nominatim #DOCS: cd Nominatim
else #DOCS: else #DOCS: