aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2022-06-24 12:12:13 -0300
committerHisham Muhammad <hisham@gobolinux.org>2022-06-24 12:27:22 -0300
commit9cbe5cba9047b449308e1365690b0a5acfdef181 (patch)
treea0d41adda3403b587fd195ffe1187016c7b41629
parent772fe81c6723c96be0c784c2ad6220ef5018a84a (diff)
downloadluafilesystem-9cbe5cba9047b449308e1365690b0a5acfdef181.tar.gz
luafilesystem-9cbe5cba9047b449308e1365690b0a5acfdef181.tar.bz2
luafilesystem-9cbe5cba9047b449308e1365690b0a5acfdef181.zip
Move doc/us/ to docs/, replacing the gh-pages branch.
-rw-r--r--LICENSE1
-rw-r--r--README.md4
-rw-r--r--docs/doc.css (renamed from doc/us/doc.css)0
-rw-r--r--docs/examples.html (renamed from doc/us/examples.html)0
-rw-r--r--docs/index.html (renamed from doc/us/index.html)11
-rw-r--r--docs/license.html (renamed from doc/us/license.html)26
-rw-r--r--docs/luafilesystem.png (renamed from doc/us/luafilesystem.png)bin8535 -> 8535 bytes
-rw-r--r--docs/manual.html (renamed from doc/us/manual.html)0
-rw-r--r--luafilesystem-scm-1.rockspec2
9 files changed, 16 insertions, 28 deletions
diff --git a/LICENSE b/LICENSE
index 8475345..7fdfbf1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
1Copyright © 2003-2014 Kepler Project. 1Copyright © 2003-2014 Kepler Project.
2Copyright © 2014-2022 The LuaFileSystem authors.
2 3
3Permission is hereby granted, free of charge, to any person 4Permission is hereby granted, free of charge, to any person
4obtaining a copy of this software and associated documentation 5obtaining 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 @@
5 5
6# LuaFileSystem - File System Library for Lua 6# LuaFileSystem - File System Library for Lua
7 7
8Copyright 2003-2020 Kepler Project
9
10https://keplerproject.github.io/luafilesystem 8https://keplerproject.github.io/luafilesystem
11 9
12# Description 10# Description
@@ -25,4 +23,4 @@ luarocks install luafilesystem
25 23
26# Documentation 24# Documentation
27 25
28Please check the documentation at doc/us/ for more information. 26Please 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
index f233ce4..f233ce4 100644
--- a/doc/us/doc.css
+++ b/docs/doc.css
diff --git a/doc/us/examples.html b/docs/examples.html
index 68756c8..68756c8 100644
--- a/doc/us/examples.html
+++ b/docs/examples.html
diff --git a/doc/us/index.html b/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.</p>
81$ luarocks install luafilesystem 81$ luarocks install luafilesystem
82</pre> 82</pre>
83 83
84<p>Its source can be found at its <a href="http://github.com/keplerproject/luafilesystem">Github</a> page.</p> 84<p>Its source can be found at its <a href="http://github.com/keplerproject/luafilesystem">GitHub</a> page.</p>
85 85
86<h2><a name="history"></a>History</h2> 86<h2><a name="history"></a>History</h2>
87 87
@@ -210,10 +210,11 @@ $ luarocks install luafilesystem
210 210
211<h2><a name="credits"></a>Credits</h2> 211<h2><a name="credits"></a>Credits</h2>
212 212
213<p>LuaFileSystem was designed by Roberto Ierusalimschy, 213<p>The LuaFileSystem library was originally designed and
214Andr&eacute; Carregal and Tom&aacute;s Guisasola as part of the 214implemented by Roberto Ierusalimschy, Andr&eacute; Carregal and
215<a href="https://github.com/keplerproject">Kepler Project</a>, 215Tom&aacute;s Guisasola. It was then maintained by F&aacute;bio
216which holds its copyright. LuaFileSystem is currently maintained by F&aacute;bio Mascarenhas.</p> 216Mascarenhas for several years and has since been maintained
217by many contributors -- see the Git history for detailed credits.</p>
217 218
218</div> <!-- id="content" --> 219</div> <!-- id="content" -->
219 220
diff --git a/doc/us/license.html b/docs/license.html
index f77eba0..bb66e48 100644
--- a/doc/us/license.html
+++ b/docs/license.html
@@ -58,33 +58,21 @@
58 58
59<h1>License</h1> 59<h1>License</h1>
60 60
61<p>
62LuaFileSystem is free software: it can be used for both academic
63and commercial purposes at absolutely no cost. There are no
64royalties or GNU-like "copyleft" restrictions. LuaFileSystem
65qualifies as
66<a href="http://www.opensource.org/docs/definition.html">Open Source</a>
67software.
68Its licenses are compatible with
69<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>.
70LuaFileSystem is not in the public domain and the
71<a href="https://github.com/keplerproject">Kepler Project</a>
72keep its copyright.
73The legal details are below.
74</p>
75
76<p>The spirit of the license is that you are free to use 61<p>The spirit of the license is that you are free to use
77LuaFileSystem for any purpose at no cost without having to ask us. 62LuaFileSystem for any purpose at no cost without having to ask us.
78The only requirement is that if you do use LuaFileSystem, then you 63The only requirement is that if you do use LuaFileSystem, then you
79should give us credit by including the appropriate copyright notice 64should give us credit by including the appropriate copyright notice
80somewhere in your product or its documentation.</p> 65somewhere in your product or its documentation.</p>
81 66
82<p>The LuaFileSystem library is designed and implemented by Roberto 67<p>The LuaFileSystem library was originally designed and
83Ierusalimschy, Andr&eacute; Carregal and Tom&aacute;s Guisasola. 68implemented by Roberto Ierusalimschy, Andr&eacute; Carregal and
84The implementation is not derived from licensed software.</p> 69Tom&aacute;s Guisasola, and has since been maintained over the years
70by many people -- see the Git history for detailed credits.
71The implementation is not derived from any other licensed software.</p>
85 72
86<hr/> 73<hr/>
87<p>Copyright &copy; 2003 - 2020 Kepler Project.</p> 74<p>Copyright &copy; 2003 - 2014 Kepler Project.</p>
75<p>Copyright &copy; 2014 - 2022 The LuaFileSystem authors.</p>
88 76
89<p>Permission is hereby granted, free of charge, to any person 77<p>Permission is hereby granted, free of charge, to any person
90obtaining a copy of this software and associated documentation 78obtaining a copy of this software and associated documentation
diff --git a/doc/us/luafilesystem.png b/docs/luafilesystem.png
index e1dd8c6..e1dd8c6 100644
--- a/doc/us/luafilesystem.png
+++ b/docs/luafilesystem.png
Binary files differ
diff --git a/doc/us/manual.html b/docs/manual.html
index 1feb86a..1feb86a 100644
--- a/doc/us/manual.html
+++ b/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 = {
22 lfs = "src/lfs.c" 22 lfs = "src/lfs.c"
23 }, 23 },
24 copy_directories = { 24 copy_directories = {
25 "doc", 25 "docs",
26 "tests" 26 "tests"
27 } 27 }
28} 28}