Index: t2-handbook/src/en/book/appa.xml =================================================================== --- t2-handbook/src/en/book/appa.xml (revision 377) +++ t2-handbook/src/en/book/appa.xml (working copy) @@ -2,14 +2,14 @@ Partitioning Examples -Since there are many partition-table layouts in the wild, the +Since there are many partition-table layouts in the world, the partitioning tools are architecture dependent. DOS Type Partition Table A DOS type partition table can describe an unlimited number of -partitions. In sector 0 there is room for the description of 4 +partitions. In sector 0 there is a room for the description of 4 partitions (called 'primary'). One of these may be an extended partition; this is a box holding logical partitions, with descriptors found in a linked list of sectors, each preceding the corresponding @@ -29,7 +29,7 @@ There are several *fdisk programs around that can be used to access and modify the DOS type partition table. Each has its problems and strengths. You should choose them in the order parted, cfdisk, -disk and sfdisk. +disk and sfdisk (fdisk?). Indeed, cfdisk is a beautiful program that has strict requirements on the partition tables it accepts, and produces high @@ -60,8 +60,8 @@ Apple partition map. For Linux installation on PowerPC you need an additional special -bootstrap partition where the boot-loader will resist (the -Macintosh Open-Firmware only boots from HFS partitions). The +bootstrap partition where the boot-loader will reside +(the Macintosh Open-Firmware boots from HFS partitions only). The partitions can be really tiny, 800kB is the minimal size of an Macintosh partition. @@ -73,8 +73,8 @@ Example Session With mac-fdisk When you install T2 Linux for the first time, you first need to delete -the empty partition created MacOS X with 'd number'. Usually this is -the last partitions before some possibly present free-space. +the empty partition created by MacOS X with 'd number'. Usually this is +the last partition before some possibly present free-space. First you should use 'p' (print) to get a list of the currently available partitions: @@ -123,7 +123,7 @@ -Now you can create the other 'normal' partitions for the swap-space, +Now you can create other 'normal' partitions for the swap-space, the '/' (root) file-system and optionally '/home', '/usr', ... partitions. You need the command 'c' (create) for this which asks for the start and length as well as a name. A possible scenario creating Index: t2-handbook/src/en/book/ch01.xml =================================================================== --- t2-handbook/src/en/book/ch01.xml (revision 377) +++ t2-handbook/src/en/book/ch01.xml (working copy) @@ -337,7 +337,9 @@ installable, live, and firmware ROM images firmware ROM images - rebuild on each system, LiveCD creation as add-on scripts (Catalyst) + rebuild on each system, LiveCD creation as add-on scripts (Catalyst). + binary packages creation for later installition on another system + is also supported multiple alternative C libraries @@ -358,7 +360,7 @@ cluster build, distcc, icecream, ... ??? - - + distcc separated target config and custom file overlay @@ -369,8 +371,8 @@ thousands of packages mostly embedded package subset, not all desktop and server packages - more and more packages get removed (into external - overlays, such as E17 et al.) + more and more packages get moved into external + overlays, such as E17 et al. to keep portage tree of reasonable size Index: t2-handbook/src/en/book/ch02.xml =================================================================== --- t2-handbook/src/en/book/ch02.xml (revision 377) +++ t2-handbook/src/en/book/ch02.xml (working copy) @@ -100,7 +100,7 @@ With T2 2.0 "targets" where introduced as a smarter way of dealing with specialization: A target limits its package selection and thus download as well as build to what is really - required. Furthermore it and can modify any aspect of a package + required. Furthermore it can modify any aspect of a package build, apply custom feature or branding patches and even replace the logic to build a package or final image creation process completely. @@ -118,9 +118,9 @@ T2 is under continuous development, with the development work beeing done in the version control system - currently Subversion. With a version as target milestone, for example 7.0, - 8.0, ... When most development goals are archived, this trunk is + 8.0, ... When most development goals are achieved, this trunk is branched and this version prepared for the release. In parallel - development continuous in the trunk with the next milestone + development continues in the trunk with the next milestone version, 8.0 in this case. So each version milestone has a release series in the end of the development cycle. Though the development version from the trunk usually work well enough to download and Index: t2-handbook/src/en/book/ch04.xml =================================================================== --- t2-handbook/src/en/book/ch04.xml (revision 377) +++ t2-handbook/src/en/book/ch04.xml (working copy) @@ -22,7 +22,7 @@ Untar the file and it unpacks documentation, build scripts and the directories with package definitions. - The size of T2 Linux is so small because it is only contains + The size of T2 Linux is so small because it only contains the build scripts and meta information for downloading the kernel and packages from the Internet. The rest of the distribution gets downloaded in the next phase. @@ -69,7 +69,7 @@ In former (CVS) times the T2 source tree was kept in sync using rsync. However nowadays, with powerful version control - systems being invented in the meantime, T2 the sources should be + systems being invented in the meantime, the T2 sources should be accessed using them. The drawback is that you can not get updates with an extracted tar-ball as base - you need to checkout the sources via the version control system. Currently all source trees @@ -251,7 +251,7 @@ If you want to alter the package selection (performed by - the target) this is finally possibly at this stage, under the + the target) this is finally possible at this stage, under the expert menu. The deselected packages are also not downloaded from the Internet. @@ -287,7 +287,7 @@ Print Build-Output to terminal when building: Select - for exiting output. + for printing output. Make rebuild stage (stage 9): Select only if you @@ -306,7 +306,7 @@ Now the auto-build-system has a config to use and can so determine which packages are requested to be downloaded and - build. The ./scripts/Download contains the functionality to + built. The ./scripts/Download contains the functionality to perform the downloads - and when started with the -required option it only fetches the sources needed by the given config. @@ -478,7 +478,7 @@ Download Tips - Before starting a new download it is an idea to create the + Before starting a new download it is a good idea to create the 'download' directory and mount it from elsewhere (a symbolic link will not work with the build phase later, though in this stage it will do) this way you can use the same repository when @@ -623,7 +623,7 @@ then you have the Installer also. Since many different targets exist, those targets should share a common installer application. A typical installer needs - different things like a embedded C library, many small size + different things like an embedded C library, many small size binaries and the installer binaries and scripts. @@ -741,8 +741,8 @@ so called shared files. Emerging a whole repository, the option controlling what to - do with yet uninstalled, missing packages come handy, if you - for - example - have already specifically installed some some packages + do with uninstalled yet, missing packages comes handy, if you - for + example - have already specifically installed some packages out of a big repository and just want to update them: ./scripts/Emerge-Pkg -missing=no -repository e17 @@ -907,7 +907,7 @@ To get a build system up to date for downloading and building T2 it is sometimes necessary to update utilities like - bash or the \package{coreutils} package on your build + bash or the coreutils package on your build system. If T2 is already installed and all tools are up-to-date @@ -962,7 +962,7 @@ T2 provides some useful tools to help you fix broken - builds. When a package fails to build you'll see the a package + builds. When a package fails to build you'll see the package build directory src.packagename.uniqu-id remaining in your T2 tree. This contains the full build tree for a package until the point the compile stopped. In this tree you'll find a file named @@ -1004,7 +1004,7 @@ fixfile Makefile fixfilediff - The newly created patch can then placed in the package + The newly created patch can then be placed in the package directory with the .patch extension in order to apply it automatically: @@ -1064,11 +1064,13 @@ Cluster Build - the Build Speedup Recent versions of T2 support some form of a distributed - build in a cluster using distcc and icecream. + build in a cluster using distcc and icecream. + (TBD: how to turn distcc on) For less esoteric setups simply using RAID 0 (striping mode) using two IDE drives over two IDE channels speeds a build up significantly. This is because building packages is IO - intensive. + intensive. gcc option -pipe and using tmpfs can also decrease + IO. Index: t2-handbook/src/en/book/ch05.xml =================================================================== --- t2-handbook/src/en/book/ch05.xml (revision 377) +++ t2-handbook/src/en/book/ch05.xml (working copy) @@ -14,7 +14,7 @@ set (see ). There will come a day when you want to contribute a package to - the T2 tree - because you find you are builting that package from + the T2 tree - because you find you are building that package from source every time you do a clean install. Mastering the package system is a good idea if you deploy @@ -745,7 +745,7 @@ Package Creation in Practice - After all the possible details of packages in mind its now + After all the possible details of packages in mind it is now time to actually create a new package: To get a grip on how the Build scripts work the best thing @@ -758,7 +758,7 @@ By studying existing config files you'll find there are a number of interesting features. - Many standard configure type build + Many standard configure type builds doesn't even need scripting. T2 does that all for you. When packages need special configuration parameters or @@ -920,7 +920,7 @@ CFLAGS - Wile the very historic versions of T2, before about the + For the very historic versions of T2, before about the year 2000, the user could set CFLAGS (and others) in his shell before starting the build, and this resulted in unexpected behavior since it influenced with the optimizations chosen in @@ -985,7 +985,7 @@ Stage 2-4: After the cross stage the system changes - via chroot - - into the fresh stage 1 environment and bootstrap (re-compiles) + into the fresh stage 1 environment and bootstraps (re-compiles) the native tools, to make sure they have not build invariance and work reliable. This is often also referred to as self-hosting: being able to rebuild itself. @@ -1157,7 +1157,7 @@ var_remove name delimiter content If the 'content' is present in the variable referred to - with 'name' is removed including the associated 'delimiter' - if + with 'name', it is removed including the associated 'delimiter' - if present. var_remove CC_WRAPPER_INSERT ' ' -O2 @@ -1189,7 +1189,7 @@ - var_insert_before_regex name delimiter regex + var_insert_before_regex name delimiter content regex If the regular expression 'regex' matches a part of the variable referred to with 'name' the 'content' including its @@ -1207,7 +1207,7 @@ Build System Hooks The automated build of a package, as implemented in the T2 SDE, - can be separated in several phases which have a associated hook + can be separated in several phases which have an associated hook where package configuration or targets can hook custom modifications in. @@ -1388,7 +1388,7 @@ hook_eval - In the rare case where you package a unusual and complex + In the rare case where you package an unusual and complex package which completely disables the whole automatic build system you might get into a situation where you want to evaluate the content of a hook to let targets apply custom modifications Index: t2-handbook/src/en/book/ch06.xml =================================================================== --- t2-handbook/src/en/book/ch06.xml (revision 377) +++ t2-handbook/src/en/book/ch06.xml (working copy) @@ -156,7 +156,7 @@ overlay .desc. The .conf is completely inherited by default - from the main-tree package/ until another or empty one is create + from the main-tree package/ until another or empty one is created it in this overlay package. To inherit parts the original one can manually be sourced (source or . operator): Index: t2-handbook/src/en/book/ch07.xml =================================================================== --- t2-handbook/src/en/book/ch07.xml (revision 377) +++ t2-handbook/src/en/book/ch07.xml (working copy) @@ -112,7 +112,7 @@ system. For example: -cat /dev/disks/diskX/part1 > /mnt/net/diskX_part1.img.gz +cat /dev/disks/diskX/part1 > /mnt/net/diskX_part1.img cat /dev/disks/diskX/part1 | gzip --fast > /mnt/net/diskX_part1.img.gz cat /dev/disks/diskX/part1 | gzip > /mnt/net/diskX_part1.img.gz cat /dev/disks/diskX/part1 | gzip --best > /mnt/net/diskX_part1.img.gz @@ -249,7 +249,7 @@ #... (The Linux Boot-disk HOWTO might include more detailed - information. \cite{BootHowto}). + information). @@ -305,7 +305,7 @@ Extracting second stage filesystem ... - Since the second stage is loaded into the systems memory, + Since the second stage is loaded into the system memory, the small and feature-reduced '2nd_stage_small' is needed for old system with less system memory. @@ -334,7 +334,7 @@ Now you already have a fully functional Linux system to your - fingertips, running from the systems RAM. It can be used for + fingertips, running from the system RAM. It can be used for rescue maintenance tasks and to install T2 now: stone @@ -384,7 +384,7 @@ available as RAM inside the system. Size: For normal systems this is recommended and should be of the size: 2 x RAM - but does not need to - exceed 256 MB. Since hard-disk are faster in the outer + exceed 2 GB. Since hard-disk are faster in the outer regions which is usually mapped to the beginning, the 'swap-space' should be in the beginning of the disk for performance reasons. @@ -460,7 +460,7 @@ - Selecting 'install' will extract all the package selected + Selecting 'install' will extract all the packages selected and ask for the disk if a CD installation is performed. Make sure you have your preferred tea, coffee of book handy. @@ -520,7 +520,7 @@ If the boot procedure, from CDROM or floppy, stops along the way you may have to rebuild the Linux kernel for your hardware - (see \cite{KernelHowto}). + (see Kernel-Howto). An immediate halt after 'loading Linux kernel' usually indicates your kernel has been built for the wrong CPU. @@ -536,7 +536,7 @@ valid root path (of the /dev/ide or /dev/scsi type) and edit the fstab file once booted. - A 'can not find root' kernel panic may imply are using a + A 'can not find root' kernel panic may imply you are using a SCSI adaptor for your HDD which has not been compiled into the kernel or found in the init ramdisk. @@ -597,7 +597,7 @@ When the first application started in a X session, that lookups installed fonts and metrics via font-config, takes a long time to start, this is usually caused by an outdated - cache. Run /etc/cron.d/80-xfree86 as root to regenerate to + cache. Run /etc/cron.d/80-xfree86 as root to regenerate and refresh the cache. @@ -673,7 +673,7 @@ Right after the build or on a binary CD/DVD distribution you basically have all the built binary packages packed in tar or GEM files. To install T2 Linux there is no real need to use - the install program! It is quite easily just to create a target + the install program! It is quite easy just to create a target root directory (with or without NFS) and untar the packages you really need. Just as fast and often just as handy: @@ -762,7 +762,7 @@ The safest, easierst and often fastest method, if - available, to transfer a whole system is the rsync + available, is to transfer a whole system is the rsync program. Rsync i a remote synchronisation application designed to transfer as few difference data as possible, and running it is as simple as: @@ -807,7 +807,7 @@ difference between a binary package and one built from source. The meta-data state stored in /var/adm is exactly the same and the installation methods can - of course - be intermixed as needed. - Information are stored in ordinary, per package text files and + Information is stored in ordinary, per package text files and grouped into sub-directories as following: @@ -830,7 +830,7 @@ flists: the files installed by the packages - md5sums: the new-style package's files md4 checksum + md5sums: the new-style package's files md5 checksum packages: a human readable pretty print of the package @@ -839,11 +839,11 @@ parse-config: shell scripts included during the build allowing installed packages to influence and configure the - build of packagesy + build of packages - For the packages built from source there are additional + For the packages built from source there is additional informations available: @@ -852,8 +852,8 @@ be modified - dep-debug: a list of utilized files and the associated - dependency + dep-debug: a list of used files and the associated + dependencies logs: the full build output created during the @@ -881,7 +881,7 @@ Installing or updating a single package can be done using - the regular automated build system using Build-Pkg or + the regular automated build system, using Build-Pkg or Emerge-Pkg, for example: ./scripts/Emerge-Pkg package @@ -920,7 +920,7 @@ cd mine-ver make USE_GAS=0 - Just running mine prints the usual usage information. + Just running mine prints usage information. To install a gem package, specify the argument '-i' to install the specified package. If you want to overwrite modified Index: t2-handbook/src/en/book/ch08.xml =================================================================== --- t2-handbook/src/en/book/ch08.xml (revision 377) +++ t2-handbook/src/en/book/ch08.xml (working copy) @@ -5,8 +5,8 @@ Boot Loader - The boot-loader is responsible to load the operating system - kernel into the system memory, either from a hard-disk, via + The boot-loader is responsible for loading the operating system + kernel into the system memory, from a hard-disk, via network or other media. After a successful load it passes the control of execution to the kernel - which in turn initializes the hardware and starts up system services including a possible user @@ -17,8 +17,8 @@ into T2 Linux after the installation. However there might be some platform where STONE is not yet - able to configure the boot-loader or circumstances where custom - adaptations is needed, for example when other operating systems + able to configure the boot-loader or circumstances where + customization is needed, for example when other operating systems should optionally be booted. @@ -38,12 +38,11 @@ stores a static block list where to load the kernel images. So everytime you change the config or the kernel images you have to re-run the lilo program. Modern boot-loaders like GRUB - might be a better choice. They can ready the filesystem natively and + might be a better choice. They can prepare the filesystem natively and often include a shell-like interface to manipluate the whole configuration on-the-fly. - For a better understanding of LILO please the LDP LILO Howto - \cite{LILOHowto}. + For a better understanding of LILO please the LDP LILO Howto. @@ -57,9 +56,9 @@ Configuration Example for Manual Installation The layout of configuration file /etc/lilo.conf is quite - simple. The file might contain multiple image section specifying - the kernel image to load, with optional arguments - thereafter. With 'root=' the system's root device needs to be + simple. The file might contain multiple image sections specifying + the kernel image to load, with optional arguments appended. + With 'root=' the system's root device needs to be specified, 'label=' specifies the name used by lilo to refer to this configuration and 'read-only' specifies that the root device should be mounted read only by default. So a basic @@ -137,7 +136,7 @@ not be guessed - or when floppy support is enabled in the BIOS but no floppy drive is present). In such a case or for maintenance you might want to install grub from a floppy - disk. First you need to create a grub floppy via: + disk. First you need to create a grub floppy via command: cat /boot/grub/stage1 /boot/grub/stage2 > /dev/floppy/0 @@ -195,8 +194,8 @@ volume. On IBM machines (like the RS6000/B50) the OpenFirmware just - load any data from the partition of type '41 PPC PReP Boot'. Since - there is not a file-system structure on it yaboot can not store + loads any data from the partition of type '41 PPC PReP Boot'. Since + there is no file-system structure on it yaboot can not store information on it. This is way it just scans all file-system for a /etc/yaboot.conf files and utilizes the first match ... @@ -217,7 +216,7 @@ PowerPC hardware. So a basic configuration looks mostly like the one for - lilo expect some global option needed to setup yaboot on Apple + lilo with some global option needed to setup yaboot on Apple NewWorld hardware: @@ -277,9 +276,9 @@ Configuration Example for Manual Installation The layout of configuration file /etc/silo.conf is quite - simple. The file might contain multiple image section specifying - the kernel image to load, with optional arguments - thereafter. With 'root=' the system's root device needs to be + simple. The file might contain multiple image sections specifying + the kernel image to load, with optional arguments appended. + With 'root=' the system's root device needs to be specified, 'label=' specifies the name used by silo to refer to this configuration and 'read-only' specifies that the root device should be mounted read only by default. So a basic @@ -342,7 +341,7 @@ It just contains a list of images to load starting with a unique number for later reference, for example at the SRM prompt - separated by a colon the partition containing the kernel image - must be specified follow by the kernel filename and optional + must be specified followed by the kernel filename and optional arguments. So a basic configuration looks like: @@ -410,7 +409,7 @@ kernel configuration including modules' is the default. For further information on how to compile the Linux kernel - see \cite{KernelHowto}. + see Kernel-Howto. @@ -483,7 +482,7 @@ The layout of /etc/fstab is very simple. It lists the device name - the source, followed by where in the file hierarchy it gets - mounted - the mount-point, as well as the filesystem type alogn + mounted - the mount-point, as well as the filesystem type along with some more options: @@ -499,17 +498,17 @@ The process (/proc) and device (/dev) filesystem (see - \cite{devfs}) do not have a source specified since they are + devfs) do not have a source specified since they are virtually created inside the kernel. The swap partition does not have a mount-point since it is - not part of the filesystem - used exclusively used by the kernel + not part of the filesystem - used exclusively by the kernel as temporary storage for virtual memory. The FStype tells the system how the partition is - formatted. Usual filesystems used as system root include: exT2, + formatted. Usual filesystems used as system root include: ext2, ext3, reiserfs or xfs. But normally the type can be automatically - detected and thus auto can specified. + detected and thus auto can be specified. The options 'default' specifies that the partition should be mounted using system defaults: that is read/write-able. The 'ro' @@ -536,7 +535,7 @@ owner - Unix system are based on a very strong security model, the + Unix systems are based on a very strong security model, the user must have the correct permission for any kind of operation. Each file has three permission sets. One for the owner, one for the group and one for everyone else. One set of @@ -544,7 +543,7 @@ file. Often one set is displayed as a row of letter in the form 'rwx': where 'r' stands for read access, 'w' for write access and 'x' for the possiblity to execute the file or enter the - directory. A missing access right is replace by a -. Another form + directory. A missing access right is replaced by a -. Another form of notation is a octal number you get by 'r-bit*4 + w-bit*2 + x-bit'. like "6" for 'rw-'. To form the three sets they are also put into a row like: "660" meaning the same as 'rw-rw----'. @@ -558,10 +557,10 @@ The persmissions are manipulated with the following tools: chmod(8), chown(8), chgrp(8). - Where chown can also modify the group in one set. They are - specified spererated by a colon (for historic reasons a dot '.' is - also possible, but it should be avoided and of course does not - work with owner names containing a '.'): + Where chown can also modify the owner and group in one set. + They are specified spererated by a colon (for historic reasons + a dot '.' is also possible, but it should be avoided and of course + does not work with owner names containing a '.'): chown rene:users t2-article.pdf @@ -620,14 +619,14 @@ U/dev is a user-space implementation to manage the special device-nodes in the /dev directory on your root filesystem. Kernel - device drivers register kobjects, while the informations are + device drivers register kobjects, while the information is exported via a virtual filesystem to /sys a u/dev daemon receivs event notifications (via a netlink socket) and creates the device-nodes accordingly. What is special? - With u/dev you will only see the device-node that are + With u/dev you will only see the device-nodes that are present on your system (as it also was the case with DevFS formerly used by T2) and you can configure persistent and human-readable names like /dev/ide/host0/../disc in contrast to @@ -666,7 +665,7 @@ system recognizes devices in the same way whether they where present during system boot-up or added to a running system. This is a major improvement over other systems where this two use-cases - have a different code path and thus leading to + have a different code path and thus lead to inconsistencies. The functionality of hotplug++ is quite trivial: When a new @@ -674,7 +673,7 @@ the available kernel modules. If a kernel module is found user configurations are checked and the resulting actions are executed. At system startup those hotplug events are synthesized - for the hardware already present and thus resulting in exactly the + for the hardware already present and thus result in exactly the same configuration and behavior whenever the device is added or present in the system. @@ -683,7 +682,7 @@ unwanted or known to malfunction. For some subsystems, for example USB or ieee1394 (also known - as Firewire or iLink) the action might include to set the + as Firewire or iLink) the action might include setting the permission of device files for access by user-space application such as SANE and GPhoto. @@ -731,10 +730,10 @@ real hardware detection utilizing our hotplug++ program. All in all this setup does not only allow a T2 installation to boot without an initrd regeneration or when the underlying system - hardware is exchanged (such as on system defect). It also offers a + hardware is changed (such as on system defect). It also offers a sensible fallback for the user in form of a normal shell - for example when the root filesystem can not be found for whatever - reason (competting implementations usually just let the kernel + reason (competing implementations usually just let the kernel panic in this situation). @@ -893,7 +892,7 @@ The DNS module provides a facility to re-create the - /etc/resolv.conf in a interface and profile depended + /etc/resolv.conf in an interface and profile depended way. @@ -1247,7 +1246,7 @@ changes or apply it only when the card is brought up via ifconfig). This command (when available) forces the card to apply all pending changes. However, normally this is - normally not needed. + not needed. @@ -1466,11 +1465,11 @@ statement can be followed by a comma-separated list of profile names in parentheses. - In case rocknet is executed with the 'auto' keyword as + In case rocknet (what is rocknet?) is executed with the 'auto' keyword as interface, only those interfaces are used which do have the current profile specified or no profile at all. - In case rocknet is executed with a real interface + In case rocknet (what is rocknet?) is executed with a real interface specified, an interface section is used if it has no profile specified or the current profile is given in the profile list. @@ -1577,7 +1576,7 @@ interface ppp0 ppp eth1 - pppoe options + #pppoe options #what options? ppp-defaults ppp-option user "ISP-username" ppp-option password "ISP-password" @@ -1626,8 +1625,8 @@ automatically written into this file. Per default the programs will only activate interfaces - that are not already marked active any only deactivate - interafesc that are marked active. If you need to overwrite this + that are not already marked active and deactivate + interafaces that are marked active. If you need to overwrite this behaviour use '-force'. @@ -1766,7 +1765,7 @@ - How to Burn a Waw ISO 9660 Image? + How to Burn a Raw ISO 9660 Image? cdrecord @@ -1816,7 +1815,7 @@ That is especially interesting when you have to administer several machines. - This following subsection just give a quick overview. For + The following subsection just gives a quick overview. For more information read the extensive information that comes with the package (directory /opt/cfengine/share/cfengine/).