mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-11 13:24:07 +00:00
make naming of documentation files consistent
This commit is contained in:
4
Vagrantfile
vendored
4
Vagrantfile
vendored
@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
|
|||||||
config.vm.define "ubuntu", primary: true do |sub|
|
config.vm.define "ubuntu", primary: true do |sub|
|
||||||
sub.vm.box = "bento/ubuntu-16.04"
|
sub.vm.box = "bento/ubuntu-16.04"
|
||||||
sub.vm.provision :shell do |s|
|
sub.vm.provision :shell do |s|
|
||||||
s.path = "vagrant/install-on-ubuntu-16.sh"
|
s.path = "vagrant/Install-on-Ubuntu-16.sh"
|
||||||
s.privileged = false
|
s.privileged = false
|
||||||
s.args = [checkout]
|
s.args = [checkout]
|
||||||
end
|
end
|
||||||
@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
|
|||||||
config.vm.define "centos" do |sub|
|
config.vm.define "centos" do |sub|
|
||||||
sub.vm.box = "bento/centos-7.2"
|
sub.vm.box = "bento/centos-7.2"
|
||||||
sub.vm.provision :shell do |s|
|
sub.vm.provision :shell do |s|
|
||||||
s.path = "vagrant/install-on-centos-7.sh"
|
s.path = "vagrant/Install-on-Centos-7.sh"
|
||||||
s.privileged = false
|
s.privileged = false
|
||||||
s.args = [checkout]
|
s.args = [checkout]
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
# Auto-generated vagrant install documentation
|
# Auto-generated vagrant install documentation
|
||||||
|
|
||||||
set (INSTALLDOCFILES
|
set (INSTALLDOCFILES
|
||||||
install-on-centos-7
|
Install-on-Centos-7
|
||||||
install-on-ubuntu-16
|
Install-on-Ubuntu-16
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach (df ${INSTALLDOCFILES})
|
foreach (df ${INSTALLDOCFILES})
|
||||||
@@ -18,9 +18,11 @@ ADD_CUSTOM_TARGET( md_install_${df} ALL
|
|||||||
)
|
)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# Copied static documentation
|
||||||
|
|
||||||
set (GENERALDOCFILES
|
set (GENERALDOCFILES
|
||||||
Installation.md
|
Installation.md
|
||||||
Import_and_update.md
|
Import-and-Update.md
|
||||||
Faq.md
|
Faq.md
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
*Note:* these installation instructions are also available in executable
|
*Note:* these installation instructions are also available in executable
|
||||||
form for use with vagrant under vagrant/install-on-centos-7.sh.
|
form for use with vagrant under `vagrant/Install-on-Centos-7.sh`.
|
||||||
|
|
||||||
Installing the Required Software
|
Installing the Required Software
|
||||||
================================
|
================================
|
||||||
@@ -178,4 +178,4 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
Nominatim is now ready to use. Continue with
|
Nominatim is now ready to use. Continue with
|
||||||
[importing a database from OSM data](Import_and_update.md).
|
[importing a database from OSM data](Import-and-Update.md).
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
|
|
||||||
*Note:* these installation instructions are also available in executable
|
*Note:* these installation instructions are also available in executable
|
||||||
form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
|
form for use with vagrant under vagrant/Install-on-Ubuntu-16.sh.
|
||||||
|
|
||||||
Installing the Required Software
|
Installing the Required Software
|
||||||
================================
|
================================
|
||||||
@@ -164,4 +164,4 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
Nominatim is now ready to use. Continue with
|
Nominatim is now ready to use. Continue with
|
||||||
[importing a database from OSM data](Import_and_update.md).
|
[importing a database from OSM data](Import-and-Update.md).
|
||||||
@@ -5,8 +5,8 @@ This page contains generic installation instructions for Nominatim and its
|
|||||||
prerequisites. There are also step-by-step instructions available for
|
prerequisites. There are also step-by-step instructions available for
|
||||||
the following operating systems:
|
the following operating systems:
|
||||||
|
|
||||||
* [Ubuntu 16.04](install-on-ubuntu-16.md)
|
* [Ubuntu 16.04](Install-on-Ubuntu-16.md)
|
||||||
* [CentOS 7.2](install-on-centos-7.md)
|
* [CentOS 7.2](Install-on-Centos-7.md)
|
||||||
|
|
||||||
These OS-specific instructions can also be found in executable form
|
These OS-specific instructions can also be found in executable form
|
||||||
in the `vagrant/` directory.
|
in the `vagrant/` directory.
|
||||||
@@ -151,4 +151,4 @@ Restart the nginx and php5-fpm services and the website should now be available
|
|||||||
on http://localhost/.
|
on http://localhost/.
|
||||||
|
|
||||||
|
|
||||||
Now continue with [importing the database](Import_and_update.md).
|
Now continue with [importing the database](Import-and-Update.md).
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# *Note:* these installation instructions are also available in executable
|
# *Note:* these installation instructions are also available in executable
|
||||||
# form for use with vagrant under vagrant/install-on-centos-7.sh.
|
# form for use with vagrant under `vagrant/Install-on-Centos-7.sh`.
|
||||||
#
|
#
|
||||||
# Installing the Required Software
|
# Installing the Required Software
|
||||||
# ================================
|
# ================================
|
||||||
@@ -179,4 +179,4 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
# Nominatim is now ready to use. Continue with
|
# Nominatim is now ready to use. Continue with
|
||||||
# [importing a database from OSM data](Import_and_update.md).
|
# [importing a database from OSM data](Import-and-Update.md).
|
||||||
@@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
|
|||||||
|
|
||||||
#
|
#
|
||||||
# *Note:* these installation instructions are also available in executable
|
# *Note:* these installation instructions are also available in executable
|
||||||
# form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
|
# form for use with vagrant under vagrant/Install-on-Ubuntu-16.sh.
|
||||||
#
|
#
|
||||||
# Installing the Required Software
|
# Installing the Required Software
|
||||||
# ================================
|
# ================================
|
||||||
@@ -165,4 +165,4 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
# Nominatim is now ready to use. Continue with
|
# Nominatim is now ready to use. Continue with
|
||||||
# [importing a database from OSM data](Import_and_update.md).
|
# [importing a database from OSM data](Import-and-Update.md).
|
||||||
Reference in New Issue
Block a user