make naming of documentation files consistent

diff --git a/Vagrantfile b/Vagrantfile
index b9d618e20f8434c07a9c1acb51a683128cf843fc..d369fcd6605118b5afd9ec92003d65e31af8f217 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
   config.vm.define "ubuntu", primary: true do |sub|
       sub.vm.box = "bento/ubuntu-16.04"
       sub.vm.provision :shell do |s|
   config.vm.define "ubuntu", primary: true do |sub|
       sub.vm.box = "bento/ubuntu-16.04"
       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.args = [checkout]
       end
         s.privileged = false
         s.args = [checkout]
       end


@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
    config.vm.define "centos" do |sub|
       sub.vm.box = "bento/centos-7.2"
       sub.vm.provision :shell do |s|
    config.vm.define "centos" do |sub|
       sub.vm.box = "bento/centos-7.2"
       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.args = [checkout]
       end
         s.privileged = false
         s.args = [checkout]
       end

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 7da84491ac637986d61a73e13b74f40fd1b8b2ea..1a7dbd1c64d99f846accac108727979d5e9e12c5 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Auto-generated vagrant install documentation
 
 set (INSTALLDOCFILES
 # Auto-generated vagrant install documentation
 
 set (INSTALLDOCFILES

-     install-on-centos-7
-     install-on-ubuntu-16
+     Install-on-Centos-7
+     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
      Installation.md
 set (GENERALDOCFILES
      Installation.md

-     Import_and_update.md
+     Import-and-Update.md

      Faq.md
     )
 
      Faq.md
     )
 

diff --git a/docs/Import_and_update.md b/docs/Import-and-Update.md
similarity index 100%
rename from docs/Import_and_update.md
rename to docs/Import-and-Update.md

diff --git a/docs/install-on-centos-7.md b/docs/Install-on-Centos-7.md
similarity index 97%
rename from docs/install-on-centos-7.md
rename to docs/Install-on-Centos-7.md
index 481bd2d0d7d74c8a9fc7194ba86fa05583e5b66e..35200d6ff739d5e1fa55e3f792145fabab45994f 100644 (file)
--- a/docs/install-on-centos-7.md
+++ b/docs/Install-on-Centos-7.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).

diff --git a/docs/install-on-ubuntu-16.md b/docs/Install-on-Ubuntu-16.md
similarity index 97%
rename from docs/install-on-ubuntu-16.md
rename to docs/Install-on-Ubuntu-16.md
index de8468d42a232acadc063ea0efb83bd163e7a40a..322a476acbd2b823445570f42213b3a9515028d1 100644 (file)
--- a/docs/install-on-ubuntu-16.md
+++ b/docs/Install-on-Ubuntu-16.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).

diff --git a/docs/Installation.md b/docs/Installation.md
index 88f32ada55ea2e9b77051b9d4fff34ee37c7e410..1cdd9d109014b039cbaaf40965ecec74620fb12e 100644 (file)
--- a/docs/Installation.md
+++ b/docs/Installation.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
 the following operating systems:
 
 prerequisites. There are also step-by-step instructions available for
 the following operating systems:
 

-  * [Ubuntu 16.04](install-on-ubuntu-16.md)
-  * [CentOS 7.2](install-on-centos-7.md)
+  * [Ubuntu 16.04](Install-on-Ubuntu-16.md)
+  * [CentOS 7.2](Install-on-Centos-7.md)

 
 These OS-specific instructions can also be found in executable form
 in the `vagrant/` directory.
 
 These OS-specific instructions can also be found in executable form
 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).

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/Install-on-Centos-7.sh
similarity index 97%
rename from vagrant/install-on-centos-7.sh
rename to vagrant/Install-on-Centos-7.sh
index 8b283ef63f1b7af7b953f54a91828f6459bb5ea5..04b2f0413a07d788bf688c4120b35def37336d85 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # *Note:* these installation instructions are also available in executable
 #!/bin/bash
 #
 # *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).

diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
similarity index 97%
rename from vagrant/install-on-ubuntu-16.sh
rename to vagrant/Install-on-Ubuntu-16.sh
index 11f80a3e4b4ec8949f25ee0586499cc7e0fd6a1b..14ee16825bf67cb6bc961364188e46e94ac4aef5 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -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).