website diff en/devel/index.html @ rev 166

en: Edits (aargh)
author Paul Issott <paul@slitaz.org>
date Sat Sep 13 14:13:30 2008 +0000 (2008-09-13)
parents 0b70fb72663e
children 4e5f0cc6dfad
line diff
     1.1 --- a/en/devel/index.html	Wed Sep 10 17:52:18 2008 +0000
     1.2 +++ b/en/devel/index.html	Sat Sep 13 14:13:30 2008 +0000
     1.3 @@ -79,7 +79,7 @@
     1.4  
     1.5  <p>
     1.6  SliTaz is an open source and community driven distribution. Everyone is welcome 
     1.7 -to join and contribute, from  users, to hackers and developers there is always
     1.8 +to join and contribute, from  users, to hackers and developers, there is always
     1.9  something to do, ie. Proofreading or writing documentation, sending bugs or 
    1.10  patches to the Mailing list, gaining access to the wok and pushing some new 
    1.11  packages or simply to help others on the Mailing list or forum. SliTaz has got
    1.12 @@ -98,14 +98,14 @@
    1.13  <p>
    1.14  SliTaz Mercurial or Hg repos can be browsed or cloned by anyone using the URL:
    1.15  <a href="http://hg.slitaz.org/">http://hg.slitaz.org/</a>. People with write
    1.16 -access can directly use <code>repos.slitaz.org</code> which needs authentication.
    1.17 +access can directly use <code>repos.slitaz.org</code> which requires authentication.
    1.18  Mercurial uses Python and is installable with: 
    1.19  <code>tazpkg get-install mercurial</code>
    1.20  </p>
    1.21  <h4>~/.hgrc</h4>
    1.22  <p>
    1.23 -Before you push your first commit onto the server, be sure you have a correct
    1.24 -Hg configuration file with your name and email address and remember to check 
    1.25 +Before you push your first commit onto the server, be sure that you have a correct
    1.26 +Hg configuration file with your name and email address, and remember to check 
    1.27  that you are not root. Personal ~/.hgrc file example:
    1.28  </p>
    1.29  <pre class="script">
    1.30 @@ -137,7 +137,7 @@
    1.31  </pre>
    1.32  <p>
    1.33  Note that you can use the command <code>rollback</code> to roll back to the last 
    1.34 -transaction. Before pushing changes to the server it is safe to pull once:
    1.35 +transaction. Before pushing changes to the server, it is safe to pull once:
    1.36  </p>
    1.37  <pre>
    1.38   $ hg pull
    1.39 @@ -187,8 +187,8 @@
    1.40  </p>
    1.41  <p>
    1.42  You can syncronize the site and books graphically using Grsync or via the 
    1.43 -command line. To download the site for the first time or syncronize the pages 
    1.44 -in the directory <code>/home/hacker/Public/slitaz/website</code>, 
    1.45 +command line. To download the site for the first time or syncronize pages 
    1.46 +in the directory <code>/home/hacker/Public/slitaz/website</code>; 
    1.47  use the module <code>rsync://slitaz.org/website</code>:
    1.48  </p>
    1.49  <pre>
    1.50 @@ -199,7 +199,7 @@
    1.51  <h4>Diff and patch</h4>
    1.52  <p>
    1.53  The utilities <code>diff</code> and <code>patch</code> are command-line tools 
    1.54 -for creating and implementing the differences between two files. This technique
    1.55 +for creating and implementing differences between two files. This technique
    1.56  is often used for collaboration and the changes made to the original file can 
    1.57  be clearly extracted. To create a <code>diff</code> file readable by humans in
    1.58  a simple text editor, you must supply the <code>-u</code> option: