# HG changeset patch
# User Paul Issott <paul@slitaz.org>
# Date 1332636293 0
# Node ID a5164f0bb4613a86371d7578b5185bdc033f9dca
# Parent  46e01beb351a13c37797959774e3018619ba9ab3
Edit pizza

diff -r 46e01beb351a -r a5164f0bb461 README
--- a/README	Sat Mar 24 23:13:48 2012 +0100
+++ b/README	Sun Mar 25 00:44:53 2012 +0000
@@ -2,29 +2,29 @@
 ================================================================================
 
 
-The SliTaz Pizza provide tools and utils to build Live systems online.
+The SliTaz Pizza provides tools and utils to build Live systems online.
 
 
-	* Build ISO flavor online in a simple to use and modern interface
-	* Use stable packages or cooking if next to a stable release
-	* Build queue and one build at time to be less resources intensiv
-	* Can be run localy as a frontend to Tazlito or from the cmdline
+	* Build ISO flavors online in a simple to use and modern interface
+	* Use stable packages or cooking if near to a stable release
+	* Build queue and one build at a time to be less resources intensive
+	* Can be run locally as a frontend to Tazlito or from the cmdline
 	* Produce standard and valid HTML code and wildly themable
 	* Provide a status page to follow build process for each flavor
 	* Create a tarball of the flavor receipt, list and addfiles
 	* Log activities, build process and provide useful statistics
-	* Keep ISO images and files public a while, then archive them
+	* Keep ISO images and files public for a while, then archive them
 	* Uniq ID strings for each flavor and mail notification
-	* RSS feed for all new builded flavors and summary on web interface
+	* RSS feed for all newly built flavors and summary on web interface
 
 
 Build process
 -------------
-First you have to choose the distro name, provide a short description,
-a valid email address so Pizza can notify you when ISO is built or in
+First you have to choose the distro name, provide a short description, and
+a valid email address so Pizza can notify you when ISOs are built or in
 case the build failed. You must also choose a skeleton to base your
 custom distro on. Then add some packages and follow the steps. When
-validate the build, Pizza will create a tarball of your flavors a add
+validating the build, Pizza will create a tarball of your flavors and add
 it to the build queue, so it can take some time before your ISO image
 is generated.
 
@@ -34,24 +34,24 @@
 
 	* Is it long to build ?
     
-	  By default Pizza build a distro each 20 min but skip a run if an
-	  other distro is still building. After it depend on the build queue,
+	  By default Pizza builds a distro every 20 min but skips a run if 
+	  another distro is still building. After it depends on the build queue,
 	  and the size of your custom SliTaz distro.
 
 	* How long do you keep my ISO ?
 	
-	  We can't garanty hosting for long time actually, we will keep your
-	  product as long as wee can. But surely enough time to share it with
+	  We can't guaranty hosting for a long time actually, we will keep your
+	  product as long as we can. But surely enough time to share it with
 	  your friends or family.
 
 
 
 Installation and Administration
 -------------------------------
-Pizza use a chroot to build ISO and a web interface to create the flavor
-file. Pizza can be installed and setup in a few commands. The package provide
-pizza host utility, pizza-bot build bot for chroot and pizza.cgi wich is
-the web interface main script. So let's go throught the installation:
+Pizza uses a chroot to build ISOs and a web interface to create the flavor
+file. Pizza can be installed and setup in a few commands. The package provides
+a pizza host utility, pizza-bot build bot for chroot and pizza.cgi which is
+the web interface main script. So let's go through the installation:
 
 # tazpkg -gi slitaz-pizza
 
@@ -60,27 +60,27 @@
 # hg clone http://hg.slitaz.org/slitaz-pizza
 # cd pizza && make install
 
-You can display a list of command an a short usage with the usage command.
+You can display a list of commands and a short usage with the usage command.
 Create the chroot and build environment. You may want to have a look
-at Pizza configuration file before processing:
+at the Pizza configuration file before processing:
 
 # pizza setup
 
-Now you ready to start the build bot to build queued flavors one by one.
+Now you are ready to start the build bot to build queued flavors one by one.
 You can also chroot in the environment to build manually or test.
 
 # pizza start
 
-In time they may be quiet a lot of ISO and temporary files. To clean up the
+In time there may be quite a lot of ISOs and temporary files. To clean up the
 temporary files and old flavors files:
 
 # pizza purge
 
-The cron task is run in the chroot and check if any flavor have been submited,
-by default it check all 20 minutes. The bot frenquency can be changed by
+The cron task is run in the chroot and checks if any flavors have been submitted,
+by default it checks every 20 minutes. The bot frequency can be changed by
 editing root crontabs in the build chroot.
 
-To check build queue or chroot manually your can use:
+To check build queue or chroot manually you can use:
 
 # pizza exec pizza-bot
 # pizza chroot
@@ -88,9 +88,9 @@
 
 Developers and translators
 --------------------------
-SHell script as you could expected. Keep speed in mind and security. Always
-think to have a simple option and a advanced option, for example in rootfs
-modification let users add custom wallpaper easely and advanced users can
+SHell script as you would expect. Keep speed in mind and security. Always
+think to have a simple option and an advanced option, for example in rootfs
+modification let users add custom wallpaper easily and advanced users can
 upload a full roootfs.
 
 Pizza has been coded from the beginning with gettext support. Please forget
diff -r 46e01beb351a -r a5164f0bb461 data/README.distro
--- a/data/README.distro	Sat Mar 24 23:13:48 2012 +0100
+++ b/data/README.distro	Sun Mar 25 00:44:53 2012 +0000
@@ -8,9 +8,9 @@
 was created online by the SliTaz Pizza service. SliTaz GNU/Linux is distributed
 in the hope that it will be useful, but with ABSOLUTELY NO WARRANTY.
 
-To boot SliTaz please insert de cdrom into your computer and boot or reboot to
-choose the cdrom as first boot media. SliTaz run entirely in RAM memory and
-dont touch anything on your machine. SliTaz can also be installed on a USB
+To boot SliTaz please insert the cdrom into your computer and boot or reboot to
+choose the cdrom as first boot media. SliTaz runs entirely in RAM memory and
+doesn't touch anything on your machine. SliTaz can also be installed on USB
 media and booted from the web via PXE.
 
 http://pizza.slitaz.me/
diff -r 46e01beb351a -r a5164f0bb461 pizza
--- a/pizza	Sat Mar 24 23:13:48 2012 +0100
+++ b/pizza	Sun Mar 25 00:44:53 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# SliTaz Pizza host cmdline utility - Create environment, chroot, clean
+# SliTaz Pizza host cmdline utility - Create environment, chroot, clean.
 # Backup and purge should be done via cron jobs.
 #
 
@@ -39,7 +39,7 @@
   get-lists    Get latest skel packages list from Hg.
   sync-pkgs    Sync packages from SliTaz mirror.
   purge        Purge Pizza tmp directory.
-  clean        Complet chroot clean-up.
+  clean        Complete chroot clean-up.
 
 EOT
 }
@@ -84,7 +84,7 @@
 		# Setup build host.
 		crontabs="$chroot/var/spool/cron/crontabs"
 		if [ -d "$chroot/proc" ]; then
-			echo "Chroot already exist: $chroot" && exit 0
+			echo "Chroot already exists: $chroot" && exit 0
 		fi
 		echo ""
 		echo "Setting up Pizza environment..."
@@ -105,7 +105,7 @@
 		bot_config
 		# No more needed when slitaz-base-files have rc.functions
 		cp -f /etc/init.d/rc.functions $chroot/etc/init.d
-		echo '# Check pizza queue each 5 min' > $crontabs/root
+		echo '# Check pizza queue every 5 mins' > $crontabs/root
 		echo '*/20  * * * * /usr/bin/pizza-bot' >> $crontabs/root
 		status
 		
@@ -131,7 +131,7 @@
 		echo "To start Pizza Bot: $(basename $0) start"
 		echo "" ;;
 	up-files)
-		# Update files in chroot when pizza is update on host.
+		# Update files in chroot when pizza is updated on host.
 		echo -n "Updating chroot and virtual host..."
 		cp -a $DATA/web/* $VHOST
 		cp -a $DATA/pizza-bot $chroot/usr/bin 
diff -r 46e01beb351a -r a5164f0bb461 pizza-bot
--- a/pizza-bot	Sat Mar 24 23:13:48 2012 +0100
+++ b/pizza-bot	Sun Mar 25 00:44:53 2012 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # SliTaz Pizza chroot cmdline utility. This tool is designed to be run 
-# by cron and automaticaly build flavors in the queue. We build one ISO
-# at once so we dont use too much resources.
+# by cron and automatically build flavors in the queue. We build one ISO
+# at once so we don't use too many resources.
 #
 # Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2
 # Authors : Christophe Lincoln <pankso@slitaz.org>
@@ -32,7 +32,7 @@
 	exit 0
 }
 
-# Create a XML feed for freshly builded flavor.
+# Create a XML feed for freshly built flavor.
 gen_rss() {
 	pubdate=$(date "+%a, %d %b %Y %X")
 	cat > $feeds/slitaz-$ID.xml << EOT
@@ -60,20 +60,20 @@
 Hi,
 
 Your custom SliTaz GNU/Linux system is ready to download! It will be
-hosted a as long as we can but with absolutely no warranty in time.
+hosted as long as we can but with absolutely no warranty in time.
 
 Get $FLAVOR ISO and files at: ${PIZZA_URL}?id=slitaz-$ID
 
 ISO size: $ISO_SIZE
 MD5 sum: $md5
 
-If you wish a long time service hosting please get in touch via our 
+If you wish a long time hosting service please get in touch via our 
 professional platform at http://slitaz.pro
 
 Visit http://www.slitaz.org for latest news about the project and
 get community support on SliTaz Forum http://forum.slitaz.org
 
-Sended by the SliTaz Pizza Mailer
+Sent by the SliTaz Pizza Mailer
 
 EOT
 }
@@ -112,7 +112,7 @@
 		gen_rss
 		
 		# We want a public packages list md5sum file and move ISO so users
-		# can download it. Keep original pkgs list and build a complet one.
+		# can download it. Keep original pkgs list and build a complete one.
 		cp -f $FLAVOR/packages.list $public/$name
 		cd $pizza/distro
 		pkgsinst="$public/$name/installed.list"
diff -r 46e01beb351a -r a5164f0bb461 web/lib/functions.js
--- a/web/lib/functions.js	Sat Mar 24 23:13:48 2012 +0100
+++ b/web/lib/functions.js	Sun Mar 25 00:44:53 2012 +0000
@@ -11,7 +11,7 @@
     }
     if(document.forms["pizza"]["desc"].value == "")
     {
-        alert("Please fill up the flavor description");
+        alert("Please fill in the flavor description");
         document.forms["pizza"]["desc"].focus();
         return false;
     }
diff -r 46e01beb351a -r a5164f0bb461 web/pizza.cgi
--- a/web/pizza.cgi	Sat Mar 24 23:13:48 2012 +0100
+++ b/web/pizza.cgi	Sun Mar 25 00:44:53 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 
+# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 
 # Please KISS, it is important and keep speed in mind. Thanks, Pankso.
 #
 
@@ -66,9 +66,9 @@
 		cat << EOT
 <h2>$(gettext "First step")</h2>
 <p>
-	$(gettext "Chosse your distribution name and the one you want to use as
-	base. We need our mail to notify you when your SliTaz Flavor is built 
-	and if any things goes wrong.")
+	$(gettext "Choose your distribution name and the one you want to use as
+	base. We need your mail to notify you when your SliTaz Flavor is built 
+	and if anything goes wrong.")
 </p>
 <form method="get" action="pkgs.cgi" name="pizza" onsubmit="return checkForm();">
 <table>
@@ -125,9 +125,9 @@
 <h2>$(gettext "Generate")</h2>
 <p>
 	Last chance to stop process or start over. Next step will pack your
-	flavor and add it to the build queue. Here you can also add note to
+	flavor and add it to the build queue. Here you can also add a note to
 	your receipt flavor, this will be displayed on your flavor ID page
-	and can be used to give more infos to other users and SliTaz developers.
+	and can be used to give more info to other users and SliTaz developers.
 </p>
 <pre>
 Uniq ID    : $id
@@ -208,7 +208,7 @@
 		if [ "$inqueue" == "1" ]; then
 			gettext "Your ISO will be built on next Pizza Bot run"
 		else
-			eval_gettext "Ther is \$inqueue flavors in queue"
+			eval_gettext "There is \$inqueue flavors in queue"
 		fi
 		echo ""
 		echo "New flavor added to queue: <a href='?id=$id'>$id</a>" | log
@@ -237,7 +237,7 @@
 		[ -f "public/slitaz-$id/receipt" ] && . public/slitaz-$id/receipt
 		log="$public/slitaz-$id/distro.log"
 		if [ ! -d "public/slitaz-$id" ]; then
-			echo "Sorry, can't found flavor ID: $id"
+			echo "Sorry, can't find flavor ID: $id"
 			cat lib/footer.html && exit 0
 		fi
 		if [ -f "$public/slitaz-$id/$FLAVOR.iso" ]; then
@@ -326,8 +326,8 @@
 		cat << EOT
 <h2>$(gettext "Welcome")</h2>
 <p>
-	SliTaz Pizza let you create your own SliTaz ISO flavor online. The
-	ISO image can be burnt on a cdrom or installed on an USB media. 
+	SliTaz Pizza lets you create your own SliTaz ISO flavor online. The
+	ISO image can be burnt on a cdrom or installed on USB media. 
 	Please read the SliTaz Pizza 
 	<a href="?help">Help</a> before starting a new flavor.
 </p>
diff -r 46e01beb351a -r a5164f0bb461 web/pkgs.cgi
--- a/web/pkgs.cgi	Sat Mar 24 23:13:48 2012 +0100
+++ b/web/pkgs.cgi	Sun Mar 25 00:44:53 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 
+# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 
 # Packages step
 #
 
@@ -20,7 +20,7 @@
 #
 
 list_pkgs() {
-	# Pizza use local packages synced with mirror each night.
+	# Pizza uses local packages synced with mirror each night.
 	pkgsdesc="$SLITAZ/$SLITAZ_VERSION/packages/packages.desc"
 	[ ! -f "$pkgsdesc" ] && echo "Missing: $pkgsdesc"
 	for pkg in $(cat $list)
diff -r 46e01beb351a -r a5164f0bb461 web/rootfs.cgi
--- a/web/rootfs.cgi	Sat Mar 24 23:13:48 2012 +0100
+++ b/web/rootfs.cgi	Sun Mar 25 00:44:53 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 
+# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 
 # SliTaz rootfs step
 #
 
@@ -24,7 +24,7 @@
 	chmod a+r $upload/$tarball
 	status
 	
-	# Ectract into the tmp upload dir.
+	# Extract into the tmp upload dir.
 	gettext "Extracting archive for sanity checks..."
 	case "$tarball" in
 		*.tar.gz) tar xzf $tarball && status ;;
@@ -58,7 +58,7 @@
 	
 	# So now it time to move the addfile to flavor files.
 	if [ -d "$upload/rootfs" ]; then
-		echo "Additionnal rootfs: accepted" | tee -a $log
+		echo "Additional rootfs: accepted" | tee -a $log
 		mkdir -p $tmpdir/slitaz-$id
 		mv $upload/rootfs $tmpdir/slitaz-$id
 		rm -rf $tmpdir/slitaz-$id/upload-*
@@ -96,7 +96,7 @@
 esac
 
 #
-# Source receipt and display page with additonal rootfs or file upload.
+# Source receipt and display page with additional rootfs or file upload.
 #
 . $tmpdir/slitaz-$id/receipt
 cat << EOT
@@ -105,7 +105,7 @@
 
 <p>
 	SliTaz root filesystem modification can be done via an easy to use form,
-	a single tarball or by uploading file one by one in the wanted directory.
+	a single tarball or by uploading files one by one in the wanted directory.
 </p>
 
 <h3>$(gettext "Easy customization")</h3>
@@ -117,9 +117,9 @@
 <h3>$(gettext "Rootfs tarball")</h3>
 <p>
 	The files in the rootfs archive must have the same directory structure
-	than any standard SliTaz or Linux system. For example if you wish to
+	as any standard SliTaz or Linux system. For example if you wish to
 	have a custom boot configuration file, you will have: rootfs/etc/rcS.conf.
-	Accepted tarball format are: <strong>tar.gz tar.bz2 tar.lzma</strong>
+	Accepted tarball formats are: <strong>tar.gz tar.bz2 tar.lzma</strong>
 	and the archived directory must be named rootfs with a valid file system
 	hierachy such as: /usr/bin /etc /var/www
 </p>