# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1207607474 -7200
# Node ID fc69ec3c3b998e26804ce06fd078afdb002bbce1
# Parent  2ceb4453710d02f4eba1d2dbc9d00de30d09aed9
Devel part and install guide improved by Paul Issot

diff -r 2ceb4453710d -r fc69ec3c3b99 devel/guidelines.html
--- a/devel/guidelines.html	Mon Apr 07 14:10:16 2008 +0200
+++ b/devel/guidelines.html	Tue Apr 08 00:31:14 2008 +0200
@@ -74,7 +74,7 @@
 Rester simple, respecter au mieux les standards, réaliser un travail soigné,
 rédiger de la documentation de haute qualité, fournir un système stable et
 robuste et garder le <em>rootfs</em> du LiveCD standard assé léger pour que
-SliTaz tourne sur des machines ayant au minimum 90 Mb de RAM. Possibilité 
+SliTaz tourne sur des machines ayant au minimum 128 Mb de RAM. Possibilité 
 d'utiliser GTK+2, Dialog, Gtkdialog, des scripts SHell ou encore PHP pour
 coder des outils propre à la distribution. L'idée est aussi de ne pas faire
 de doublons et de penser mini...
diff -r 2ceb4453710d -r fc69ec3c3b99 en/devel/index.html
--- a/en/devel/index.html	Mon Apr 07 14:10:16 2008 +0200
+++ b/en/devel/index.html	Tue Apr 08 00:31:14 2008 +0200
@@ -61,14 +61,26 @@
 <h1><font color="#3e1220">Developement</font></h1>
 <h2><font color="#df8f06">SliTaz Developers corner</font></h2>
 
+<ul>
+	<li><a href="#repos">Mercurial repositories.</a></li>
+	<li><a href="#pkgs">Tazpkg packages.</a></li>
+	<li><a href="#website">Website Management.</a></li>
+</ul>
+
 <p>
 SliTaz is an open source and community driven distribution. Everyone is welcome 
 to join and contribute, from  users, to hackers and developers there is always
 something to do, ie. Proofreading or writing documentation, sending bugs or 
 patches to the Mailing list, gaining access to the wok and pushing some new 
-packages or simply to help others on the Mailing list or forum. SliTaz has got Mercurial
-repositories hosted on a SliTaz system, developers can ask for a new repo if 
-needed and contributors have write access to correct typos, scripts, etc.
+packages or simply to help others on the Mailing list or forum. SliTaz has got
+Mercurial repositories hosted on a SliTaz system, developers can ask for a new
+repo if needed and contributors have write access to correct typos, scripts, etc.
+</p>
+
+<p>
+SliTaz is a tiny community and listens to it's users. There are several 
+developers who are active on the <a href="http://forum.slitaz.org/">forum</a>
+and the <a href="../mailing-list.html">Mailing List</a>.
 </p>
 
 <a name="repos"></a>
@@ -125,6 +137,72 @@
 Done, your changes, code or corrections are now on the server.
 </p>
 
+<a name="pkgs"></a>
+<h3>Tazpkg Packages</h3>
+<p>
+The packages tazpkg in SliTaz are automatically created via Tazwok and a 
+receipt in the wok, the Cookbook describes the 
+<a href="http://www.slitaz.org/doc/cookbook/wok-tools.html">use of tools (fr)</a> 
+and the format <a href="http://www.slitaz.org/doc/cookbook/receipts.html">receipts (fr)</a>,
+These are required reading before we begin.
+</p>
+<p>
+In terms of choice of package, the idea is to offer a package by task or 
+functionality, ie. the lightest application in the field and not duplicated. 
+Note that the current packages are not immutable, if you find an alternative 
+that is lighter, with more features or more <em>sexy</em> for a few extra KB, 
+you can suggest it on the Mailing List. Particular attention is given to 
+packages for the LiveCD; these should be stripped, removing unnecesary 
+dependancies and compiler options. In general candidate packages for the core 
+LiveCD are discussed on the Mailing List.
+</p>
+<p>
+Before you begin to compile and create packages for SliTaz, be sure that the 
+work doesn't already exist in the wok indigest provided by the primary SliTaz
+mirror. Don't forget that the members of the list are there to help you
+and that the documentation of the 
+<a href="http://www.slitaz.org/doc/cookbook/wok-tools.html">wok and tools (fr)</a> 
+exists to help you get started.
+</p>
+
+<a name="site"></a>
+<h3>Website Management and Books</h3>
+<p>
+The management of the website and books (Handbook &amp; Cookbook) is made via 
+a rsync module, Mercurial, diff and patch utilities and the Mailing List. 
+Rsync is a tool for incremental backup; using an ultra-fast algorithm, It can 
+transfer or syncronize data both locally or over the network. The 
+<code>diff</code> utility is used to send the list of files containing only 
+the changes and <code>patch</code> to apply the changes to the original pages.
+</p>
+<p>
+You can syncronize the site and books graphically using Grsync or via the 
+command line. To download the site for the first time or syncronize the pages 
+in the directory <code>/home/hacker/Public/slitaz/website</code>, 
+use the module <code>rsync://slitaz.org/website</code>:
+</p>
+<pre>
+ $ rsync -r -t -p -v \
+       --progress --delete \
+       rsync://slitaz.org/website /home/hacker/Public/slitaz/website
+</pre>
+<h4>Diff and patch</h4>
+<p>
+The utilities <code>diff</code> and <code>patch</code> are command-line tools 
+for creating and implementing the differences between two files. This technique
+is often used for collaboration and the changes made to the original file can 
+be clearly extracted. To create a <code>diff</code> file readable by humans in
+a simple text editor, you must supply the <code>-u</code> option:
+</p>
+<pre>
+ $ diff -u file.orig file.new &gt; file.diff
+</pre>
+<p>
+To apply a patch:
+</p>
+<pre>
+ $ patch file.orig file.diff
+</pre>
 
 <!-- End of content with round corner -->
 </div>
diff -r 2ceb4453710d -r fc69ec3c3b99 en/doc/handbook/install.html
--- a/en/doc/handbook/install.html	Mon Apr 07 14:10:16 2008 +0200
+++ b/en/doc/handbook/install.html	Tue Apr 08 00:31:14 2008 +0200
@@ -40,34 +40,34 @@
 <a name="intro"></a>
 <h3>Introduction</h3>
 <p>
-This document give some informations and necessary instructions on how to 
-install SliTaz on a hard disk. You will need about 10 minutes, SliTaz core
-LiveCD expand to 80 Mb so we suggest a minimum of 120 Mb of free space like
-this you will be able to install a few more packages. If you can
+This document gives information and necessary instructions on how to 
+install SliTaz on a hard disk. This should take about 10 minutes, SliTaz core
+LiveCD expands to 80 Mb, so we suggest a minimum of 120 Mb of free space. 
+That way you will be able to install a few more packages. If you can
 <a href="livecd.html">use the LiveCD</a>, you should be able to install SliTaz.
 </p>
 
 <a name="installer"></a>
 <h3>SliTaz Installer</h3>
 <p>
-SliTaz provide a simple to use Installer who can be launch from the 
-"System Tools" menu. SliTaz 1.0 Installer messages are only in French and can
-be considered as an errata, but English speakers should manage to use it with
-this complemantary documentation.
+SliTaz provides a simple to use Installer which can be launched from the 
+"System Tools" menu. SliTaz 1.0 Installer messages are only available in French
+and can be considered as an errata, but English speakers should be able to 
+manage to use it with these complimentary instructions.
 </p>
 <h4>Install type</h4>
 <p>
-The first step let you choose the type of installation: new install or system 
-upgrade. In most case you will want a new and clean installation. When accepted
+The first step lets you choose the type of installation: new install or system 
+upgrade. In most cases you will want a new and clean installation. Once accepted
 the installer will mount the master cdrom device and search for the compressed
-filesystem (<code>rootfs.gz</code>). If any filesystem was found installation
+filesystem (<code>rootfs.gz</code>). If any filesystem was found, then installation
 will abort.
 </p>
 <p>
 If you get into trouble because the compressed filesystem is not found, please
-check that SliTaz is in the master CD/DVD device, if the problem persist you
+check that SliTaz is in the master CD/DVD device. If the problem persists you
 can use a downloaded ISO image and mount it on <code>/media/cdrom</code> where
-the HD Installer wanted to find it: 
+the HD Installer expects to find it: 
 </p>
 <pre>
  # mount -o loop slitaz-1.0.iso /media/cdrom
@@ -75,43 +75,42 @@
 <h4>Target partition</h4>
 <p>
 Second step is the partition configuration. If you have already a free partition
-you can directly use it, if not you will have to creat one graphicaly with 
+you can directly use it, if not you will have to create one graphically with 
 Gparted or from the command line with fdisk. For example if you want to install
 SliTaz on the first partition of the first disk recognized as <code>hda</code>: 
 </p>
-<pre class="script">
-/dev/hda1
+<pre class="script">/dev/hda1
 </pre>
 <h4>Formating</h4>
 <p>
-The next step let you format the target partition into <code>ext3</code>. Ext3
+The next step lets you format the target partition into <code>ext3</code>. Ext3
 is a robust, stable and journalised filesystem. If the partition is already 
-formated you dont need to reformat if not just accept. Warning formating a
+formated you dont need to reformat, if not just accept. <em>Warning</em> formating a
 partition will destroy all current data.
 </p>
 <h4>Hostname</h4>
 <p>
-Hostname configuration let you set the machine name. The hostname is used 
-internaly and to indentify the host on the network. This value can also be
+Hostname configuration lets you set the machine name. The hostname is used 
+internally to indentify the host on the network. This value can be
 changed when the system is installed.
 </p>
 <h4>Bootloader - GRUB</h4>
 <p>
-When the installation process is finish you have the option to install the GRUB
-bootloader who is capable of booting almost all kind of operating system. If
+When the installation process is finished you have the option to install the GRUB
+bootloader which is capable of booting almost any kind of operating system. If
 you want to use an existing GRUB installation, skip this step and add the
 correct lines to your GRUB configuration file (<code>menu.lst</code>). Note 
-that SliTaz Installer created a configuration file on the target who can be
-used as example (/mnt/target/boot/grub/menu.lst).
+that the SliTaz Installer creates a configuration file on the target which can be
+used as an example (/mnt/target/boot/grub/menu.lst).
 </p>
 <h4>End of installation</h4>
 <p>
-When the Installer did all his job you have the option to exit or directly 
-reboot on your new SliTaz GNU/Linux operating system. First boot is like the
-LiveCD, you will be prompt for locale, keyboard, sound card and screen 
-selection, future reboot will not prompt you anymore for configuration but
-all the values can be changed manually or with the project tools such as
-<code>tazlocale</code> or <code>tazx</code>.
+When the Installer has finally done it's job you have the option to exit or
+directly reboot your new SliTaz GNU/Linux operating system. First boot is like
+the LiveCD, you will be prompted for locale, keyboard, sound card and screen 
+selection. Future reboots will not prompt you anymore for configuration details,
+but all the values can be changed either manually or with the project tools 
+such as <code>tazlocale</code> or <code>tazx</code>.
 </p>
 
 <a name="byhand"></a>
@@ -119,7 +118,7 @@
 <p>
 SliTaz can also be installed by hand from the command line. To install SliTaz
 by hand you can use a cdrom or an ISO image. The given commands can be
-copy/past from Firefox to Xterm.
+copied/pasted from Firefox to Xterm.
 </p>
 <p>
 The first thing you have to do is prepare a target partition and mount it. 
@@ -137,15 +136,15 @@
  # mount /dev/cdrom /media/cdrom
 </pre>
 <p>
-Or an ISO image
+Or an ISO image:
 </p>
 <pre>
  # mount -o loop slitaz-1.0.iso /media/cdrom
 </pre>
 <h4>Install and extract</h4>
 <p>
-The goal now is to copy neede files from the media into the target partition
-and then extract the compressed filesystem (<code>rootfs.gz</code>). Creat a
+The goal now is to copy needed files from the media into the target partition
+and then extract the compressed filesystem (<code>rootfs.gz</code>). Create a
 boot directory and install the Linux Kernel:
 </p>
 <pre>
@@ -160,7 +159,7 @@
 </pre>
 <p>
 Now the necessary files are present so you can change directory (<code>cd</code>)
-to the target and uncompress the the filesystem with <code>lzma</code> and
+to the target and uncompress the filesystem with <code>lzma</code> and
 <code>cpio</code>:
 </p>
 <pre>
@@ -169,7 +168,7 @@
  # rm rootfs.gz init
 </pre>
 <p>
-That's all, SliTaz is installed. Before rebooting on you new SliTaz GNU/Linux
+That's all, SliTaz is installed. Before rebooting on your new SliTaz GNU/Linux
 installation please check that you have a bootloader (GRUB or Lilo) and add 
 the necessary lines to boot SliTaz.
 </p>
@@ -177,20 +176,20 @@
 <a name="grub"></a>
 <h3>GRUB bootloader</h3>
 <p>
-GRUB is an universal bootloader capable of booting almost all operating such
-as Linux, BSD or Windows. GRUB use single configuration file named 
-<code>menu.lst</code>, if you used <a href="#installer">SliTaz Installer</a>
-and installed GRUB you dont need to install manually GRUB, just reboot.
+GRUB is an universal bootloader capable of booting almost any operating system
+such as Linux, BSD or Windows. GRUB uses a single configuration file named 
+<code>menu.lst</code>, if you used the <a href="#installer">SliTaz Installer</a>
+and installed GRUB you dont need to manually install GRUB, just reboot.
 </p>
 <p>
-Installation of GRUB onto the mbr, using root directory /mnt/target (the taget
-mounted partition) and the disk named <code>hda</code>:
+Installation of GRUB onto the mbr, using root directory <code>/mnt/target</code>
+(the target mounted partition) and the disk named <code>hda</code>:
 </p>
 <pre>
  # grub-install --root-directory=/mnt/target /dev/hda
 </pre>
 <p>
-You can now creat GRUB configuration file and add the lines who will boot
+You can now create a GRUB configuration file and add the lines which will boot
 SliTaz. Menu.lst can be edited with your favorite text editor such as Nano or
 Leafpad:
 </p>
@@ -199,11 +198,9 @@
 </pre>
 <h4>/boot/grub/menu.lst - Example</h4>
 <pre class="script">
-
 title  SliTaz GNU/Linux 1.0 (Kernel 2.6.24.2-slitaz)
        root(hd0,0)
        kernel /boot/vmlinuz-2.6.24.2-slitaz root=/dev/hda1 vga=normal
-
 </pre>
 <p>
 Verify again that everything is in place before rebooting: