From 9cbe5cba9047b449308e1365690b0a5acfdef181 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 24 Jun 2022 12:12:13 -0300 Subject: [PATCH] Move doc/us/ to docs/, replacing the gh-pages branch. --- LICENSE | 1 + README.md | 4 +--- {doc/us => docs}/doc.css | 0 {doc/us => docs}/examples.html | 0 {doc/us => docs}/index.html | 11 ++++++----- {doc/us => docs}/license.html | 26 +++++++------------------- {doc/us => docs}/luafilesystem.png | Bin {doc/us => docs}/manual.html | 0 luafilesystem-scm-1.rockspec | 2 +- 9 files changed, 16 insertions(+), 28 deletions(-) rename {doc/us => docs}/doc.css (100%) rename {doc/us => docs}/examples.html (100%) rename {doc/us => docs}/index.html (95%) rename {doc/us => docs}/license.html (81%) rename {doc/us => docs}/luafilesystem.png (100%) rename {doc/us => docs}/manual.html (100%) diff --git a/LICENSE b/LICENSE index 8475345..7fdfbf1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright © 2003-2014 Kepler Project. +Copyright © 2014-2022 The LuaFileSystem authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/README.md b/README.md index 07b7438..c791909 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ # LuaFileSystem - File System Library for Lua -Copyright 2003-2020 Kepler Project - https://keplerproject.github.io/luafilesystem # Description @@ -25,4 +23,4 @@ luarocks install luafilesystem # Documentation -Please check the documentation at doc/us/ for more information. +Please check the at `docs/` for more information, also available at the [project website](https://keplerproject.github.io/luafilesystem). diff --git a/doc/us/doc.css b/docs/doc.css similarity index 100% rename from doc/us/doc.css rename to docs/doc.css diff --git a/doc/us/examples.html b/docs/examples.html similarity index 100% rename from doc/us/examples.html rename to docs/examples.html diff --git a/doc/us/index.html b/docs/index.html similarity index 95% rename from doc/us/index.html rename to docs/index.html index 5a2afc0..b4f056e 100644 --- a/doc/us/index.html +++ b/docs/index.html @@ -81,7 +81,7 @@ flavors of Unix (including Linux, BSDs, macOS) and Windows.

$ luarocks install luafilesystem -

Its source can be found at its Github page.

+

Its source can be found at its GitHub page.

History

@@ -210,10 +210,11 @@ $ luarocks install luafilesystem

Credits

-

LuaFileSystem was designed by Roberto Ierusalimschy, -André Carregal and Tomás Guisasola as part of the -Kepler Project, -which holds its copyright. LuaFileSystem is currently maintained by Fábio Mascarenhas.

+

The LuaFileSystem library was originally designed and +implemented by Roberto Ierusalimschy, André Carregal and +Tomás Guisasola. It was then maintained by Fábio +Mascarenhas for several years and has since been maintained +by many contributors -- see the Git history for detailed credits.

diff --git a/doc/us/license.html b/docs/license.html similarity index 81% rename from doc/us/license.html rename to docs/license.html index f77eba0..bb66e48 100644 --- a/doc/us/license.html +++ b/docs/license.html @@ -58,33 +58,21 @@

License

-

-LuaFileSystem is free software: it can be used for both academic -and commercial purposes at absolutely no cost. There are no -royalties or GNU-like "copyleft" restrictions. LuaFileSystem -qualifies as -Open Source -software. -Its licenses are compatible with -GPL. -LuaFileSystem is not in the public domain and the -Kepler Project -keep its copyright. -The legal details are below. -

-

The spirit of the license is that you are free to use LuaFileSystem for any purpose at no cost without having to ask us. The only requirement is that if you do use LuaFileSystem, then you should give us credit by including the appropriate copyright notice somewhere in your product or its documentation.

-

The LuaFileSystem library is designed and implemented by Roberto -Ierusalimschy, André Carregal and Tomás Guisasola. -The implementation is not derived from licensed software.

+

The LuaFileSystem library was originally designed and +implemented by Roberto Ierusalimschy, André Carregal and +Tomás Guisasola, and has since been maintained over the years +by many people -- see the Git history for detailed credits. +The implementation is not derived from any other licensed software.

-

Copyright © 2003 - 2020 Kepler Project.

+

Copyright © 2003 - 2014 Kepler Project.

+

Copyright © 2014 - 2022 The LuaFileSystem authors.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/doc/us/luafilesystem.png b/docs/luafilesystem.png similarity index 100% rename from doc/us/luafilesystem.png rename to docs/luafilesystem.png diff --git a/doc/us/manual.html b/docs/manual.html similarity index 100% rename from doc/us/manual.html rename to docs/manual.html diff --git a/luafilesystem-scm-1.rockspec b/luafilesystem-scm-1.rockspec index c948965..8a78605 100644 --- a/luafilesystem-scm-1.rockspec +++ b/luafilesystem-scm-1.rockspec @@ -22,7 +22,7 @@ build = { lfs = "src/lfs.c" }, copy_directories = { - "doc", + "docs", "tests" } }