From 72b758962368e396c84a879a4161f5d1dac4936d Mon Sep 17 00:00:00 2001 From: Kevin Lange Date: Sun, 25 Dec 2011 21:45:02 -0600 Subject: [PATCH] [docs] Finally make some minor updates to the manual --- docs/bootloader.tex | 6 ++-- docs/history.tex | 2 ++ docs/intro.tex | 4 +-- docs/license.tex | 72 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/docs/bootloader.tex b/docs/bootloader.tex index ae2755a5..fdbf64ee 100644 --- a/docs/bootloader.tex +++ b/docs/bootloader.tex @@ -3,10 +3,10 @@ \section{Bootloader} -\subsection{Purpose} +\subsection{Overview} -This section describes the x86 real-mode bootloader. +The bootloader is unsupported. Please use a multiboot-compliant bootloader such as GRUB instead. \subsection{Goals} -TODO +None. diff --git a/docs/history.tex b/docs/history.tex index 767b2288..d6f558eb 100644 --- a/docs/history.tex +++ b/docs/history.tex @@ -6,6 +6,7 @@ This is the first edition of the \toarutitle. Writing of this documentation bega \subsubsection{Revision History} \begin{itemize} \item 2011-03-17 \emph{Documentation work begins} + \item 2011-12-25 \emph{Actually bothered to expand the manual} \end{itemize} \subsection{Kernel History} @@ -20,6 +21,7 @@ For a complete history of the ToAruOS Kernel, please reference the git commit lo \item 2011-02-07 \emph{Kernel debug shell} \item 2011-02-10 \emph{Moved to clang for compilation} \item 2011-02-19 \emph{Serial console} + \item 2011-12-25 \emph{VESA support} \end{itemize} \subsection{Userspace History} diff --git a/docs/intro.tex b/docs/intro.tex index 583ab370..5277f004 100644 --- a/docs/intro.tex +++ b/docs/intro.tex @@ -5,8 +5,8 @@ \subsection{The ToAruOS Project} -This project was started in the winter of 2010-2011 with the goal of building, from scratch, a kernel and associated user-space designed with modern concepts and standardized hardware in mind. +This project was started in the winter of 2010-2011 with the goal of building, from scratch, a kernel and associated user-space designed with modern concepts and standardized hardware in mind. Throughout its development, the kernel has been expanded to include graphics support, a full-color ANSI-compatible terminal, VESA mode-switching support, EXT2 filesystem read support (to actual hard disks) and various other improvements. \subsection{Roadmap} -TODO +Please see \texttt{TODO.md} in the source repository. diff --git a/docs/license.tex b/docs/license.tex index d0aeca8b..c41dae32 100644 --- a/docs/license.tex +++ b/docs/license.tex @@ -46,3 +46,75 @@ The とあるOS Kernel and User Space applications are released under the terms FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. \end{verbatim} + +\subsection{Additional Licenses} + +The kernel also includes software from third parties, the licenses for which are provided here: \\ + +\subsubsection{CPU Detection} +\begin{verbatim} +Copyright (c) 2006-2007 - http://brynet.biz.tm - +\end{verbatim} + +\subsubsection{VL Gothic TrueType Font} +\begin{verbatim} +Copyright (c) 1990-2003 Wada Laboratory, the University of Tokyo. +Copyright (c) 2003-2004 Electronic Font Open Laboratory (/efont/). +Copyright (C) 2002-2010 M+ FONTS PROJECT +Copyright (C) 2006-2010 Daisuke SUZUKI . +Copyright (C) 2006-2010 Project Vine . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of the Wada Laboratory, the University of Tokyo nor + the names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY WADA LABORATORY, THE UNIVERSITY OF TOKYO AND +CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LABORATORY OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +\end{verbatim} + +\subsubsection{8086 Real-Mode Emulation} +\begin{verbatim} +Copyright 2010 John Hodge (thePowersGang). All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are +permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those of the +authors and should not be interpreted as representing official policies, either expressed +or implied, of the author. +\end{verbatim}