From 984b8bf04797579b894e8a8175ee66ae597ddf14 Mon Sep 17 00:00:00 2001
From: Rahul Chandra <57876649+xXTeraXx@users.noreply.github.com>
Date: Fri, 24 May 2024 01:45:23 -0400
Subject: [PATCH] Improvements and Adherence to *LFS standards (#2)
* Make several fixes regarding typos and licensing (see below)
Since GLFS contains a significant amount of code from BLFS, for legal
reasons the BLFS MIT license must be in the repo. Instead of relicensing
which is a grey area, this commit sublicenses GLFS, as a downstream of
BLFS which it is. Along with this the changelog was added back as this is
a core part of *LFS maintainers
* Add changelog to welcome.xml
* Add a symlink and fix some typos
---
appendices/mit-glfs.xml | 45 +++++++++++++++++++++++++
appendices/mit-lic.xml | 2 +-
changelog.xml | 1 +
index.xml | 1 +
introduction/welcome/changelog.xml | 53 ++++++++++++++++++++++++++++++
introduction/welcome/welcome.xml | 1 +
multilib/whatisml.xml | 8 ++---
wine/wine/wine.xml | 2 +-
8 files changed, 107 insertions(+), 6 deletions(-)
create mode 100644 appendices/mit-glfs.xml
create mode 120000 changelog.xml
create mode 100644 introduction/welcome/changelog.xml
diff --git a/appendices/mit-glfs.xml b/appendices/mit-glfs.xml
new file mode 100644
index 0000000000..39a026bd3c
--- /dev/null
+++ b/appendices/mit-glfs.xml
@@ -0,0 +1,45 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+
+ $Date$
+
+
+ The MIT License
+
+
+ Copyright © ©rightdate; ©holder;
+
+
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+
+
diff --git a/appendices/mit-lic.xml b/appendices/mit-lic.xml
index dc9b73290c..0d9ee00dd5 100644
--- a/appendices/mit-lic.xml
+++ b/appendices/mit-lic.xml
@@ -15,7 +15,7 @@
The MIT License
- Copyright © ©rightdate; ©holder;
+ Copyright © ©rightdate; BLFS Development Team;
diff --git a/changelog.xml b/changelog.xml
new file mode 120000
index 0000000000..8d4afe4e55
--- /dev/null
+++ b/changelog.xml
@@ -0,0 +1 @@
+introduction/welcome/changelog.xml
\ No newline at end of file
diff --git a/index.xml b/index.xml
index a032ef7112..a869fe2ae6 100644
--- a/index.xml
+++ b/index.xml
@@ -23,6 +23,7 @@ $Date$
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
new file mode 100644
index 0000000000..7bb12dc2d4
--- /dev/null
+++ b/introduction/welcome/changelog.xml
@@ -0,0 +1,53 @@
+
+
+
+
+ %general-entities;
+]>
+
+
+
+
+
+
+
+ Change Log
+
+
+
+ Current release: &version; – &releasedate;
+
+
+ Changelog Entries:
+
+
+
+
+ May 23rd, 2024
+
+
+ [tester] - Create Changelog.
+
+
+
+
+
+
+
diff --git a/introduction/welcome/welcome.xml b/introduction/welcome/welcome.xml
index 298bd31a20..c0e3812eab 100644
--- a/introduction/welcome/welcome.xml
+++ b/introduction/welcome/welcome.xml
@@ -31,6 +31,7 @@
+
diff --git a/multilib/whatisml.xml b/multilib/whatisml.xml
index d7fcd957c8..47f02b5ae6 100644
--- a/multilib/whatisml.xml
+++ b/multilib/whatisml.xml
@@ -36,10 +36,10 @@
- It is worth nothing that when covering multilib, we mean
- emulation of 32-bit software on a 64-bit CPU and this
- is the case for most users nowadays, but the future is heading
- towards ARM64 slowly. We will not be covering ARM at this time.
+ It is worth noting that when the term multilib is used throughout
+ this book, it is referring to running i686 instructions on an x86_64
+ host. This does not cover running other 32 bit architectures on their
+ 64 bit extensions, like armhf on arm64.
diff --git a/wine/wine/wine.xml b/wine/wine/wine.xml
index f543bf29c1..54d19840c4 100644
--- a/wine/wine/wine.xml
+++ b/wine/wine/wine.xml
@@ -27,7 +27,7 @@
Introduction to Wine
- Wine Is Not Emulation.
+ Wine Is Not an Emulator.
&lfs121_checked;