From 7ef0239f1962ce7cc0f637c94185fa9f14e383f9 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 25 Jun 2017 17:18:21 +0200 Subject: [PATCH] make naming of documentation files consistent --- Vagrantfile | 4 ++-- docs/CMakeLists.txt | 8 +++++--- docs/{Import_and_update.md => Import-and-Update.md} | 0 docs/{install-on-centos-7.md => Install-on-Centos-7.md} | 4 ++-- docs/{install-on-ubuntu-16.md => Install-on-Ubuntu-16.md} | 4 ++-- docs/Installation.md | 6 +++--- .../{install-on-centos-7.sh => Install-on-Centos-7.sh} | 4 ++-- .../{install-on-ubuntu-16.sh => Install-on-Ubuntu-16.sh} | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) rename docs/{Import_and_update.md => Import-and-Update.md} (100%) rename docs/{install-on-centos-7.md => Install-on-Centos-7.md} (97%) rename docs/{install-on-ubuntu-16.md => Install-on-Ubuntu-16.md} (97%) rename vagrant/{install-on-centos-7.sh => Install-on-Centos-7.sh} (97%) rename vagrant/{install-on-ubuntu-16.sh => Install-on-Ubuntu-16.sh} (97%) diff --git a/Vagrantfile b/Vagrantfile index b9d618e2..d369fcd6 100644 --- 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| - s.path = "vagrant/install-on-ubuntu-16.sh" + s.path = "vagrant/Install-on-Ubuntu-16.sh" 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| - s.path = "vagrant/install-on-centos-7.sh" + s.path = "vagrant/Install-on-Centos-7.sh" s.privileged = false s.args = [checkout] end diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 7da84491..1a7dbd1c 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,8 +1,8 @@ # 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}) @@ -18,9 +18,11 @@ ADD_CUSTOM_TARGET( md_install_${df} ALL ) endforeach() +# Copied static documentation + set (GENERALDOCFILES Installation.md - Import_and_update.md + Import-and-Update.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 481bd2d0..35200d6f 100644 --- 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 - 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 ================================ @@ -178,4 +178,4 @@ EOF 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 de8468d4..322a476a 100644 --- 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 - 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 ================================ @@ -164,4 +164,4 @@ EOF 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 88f32ada..1cdd9d10 100644 --- 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: - * [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. @@ -151,4 +151,4 @@ Restart the nginx and php5-fpm services and the website should now be available 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 8b283ef6..04b2f041 100755 --- 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 -# 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 # ================================ @@ -179,4 +179,4 @@ EOF # 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 11f80a3e..14ee1682 100755 --- 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 -# 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 # ================================ @@ -165,4 +165,4 @@ EOF # 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). -- 2.39.5