summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2020-07-15 15:54:29 +0000
committerBen Brown <ben.brown@codethink.co.uk>2020-07-15 15:54:29 +0000
commitc93409d4493f1374d626f21f9f68def3a88f09a6 (patch)
tree53539574fd9dc2b64a9c124467dd57dc02e75637
parentf4be06b2fe0655f64e7eb7d2b235f18d35c35696 (diff)
parentc3046f636f79bbbad06ce4e304c52f3020f059e3 (diff)
downloadlorry-controller-c93409d4493f1374d626f21f9f68def3a88f09a6.tar.gz
Merge branch 'bwh/doc-names' into 'master'
Use document names expected by GitLab See merge request CodethinkLabs/lorry/lorry-controller!16
-rw-r--r--ARCH.md (renamed from ARCH)2
-rw-r--r--INSTALL.md (renamed from INSTALL)2
-rw-r--r--LICENSE14
-rw-r--r--README.md (renamed from README)4
4 files changed, 18 insertions, 4 deletions
diff --git a/ARCH b/ARCH.md
index 5f7ce7b..77218f1 100644
--- a/ARCH
+++ b/ARCH.md
@@ -6,7 +6,7 @@ Introduction
This is an architecture document for Lorry Controller. It is aimed at
those who develop the software, or develop against its HTTP API. See
-the file `README` for general information about Lorry Controller.
+the file `README.md` for general information about Lorry Controller.
Requirements
diff --git a/INSTALL b/INSTALL.md
index 5344093..d7ad241 100644
--- a/INSTALL
+++ b/INSTALL.md
@@ -233,7 +233,7 @@ the Downstream Host must be given permission to read, but not write,
to it. Only administrators of Lorry Controller should be permitted
to push to it.
-The configuration files stored in CONFGIT are documented in README.
+The configuration files stored in CONFGIT are documented in `README.md`.
## Installing Lorry and Lorry Controller
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e8d788e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,14 @@
+Copyright (C) 2012-2020 Codethink Limited
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/README b/README.md
index f2afb80..32c804d 100644
--- a/README
+++ b/README.md
@@ -20,12 +20,12 @@ recovering from any problems. LC has a web based administration
interface, and an HTTP API for reporting and controlling its state.
This README file documents the LC configuration file and general use.
-For the architecture of LC and the HTTP API, see the `ARCH` file.
+For the architecture of LC and the HTTP API, see the `ARCH.md` file.
Installation
------------
-See the INSTALL file.
+See the `INSTALL.md` file.
Lorry Controller configuration: overview
------------------------------