# HG changeset patch
# User Igor TAmara <igor@tamarapatino.org>
# Date 1225133188 18000
# Node ID bdaa98efa2f1db1d88e9a1895a9c4081ee3aa19b
# Parent  84944c0ecde6ceca3d4fe9bed567ef12ff9df4a7# Parent  b73654de597eedd9b6bd5d8dfedfe1ead3a9f878
Merged changes from jerojasro concerning tour-basic

diff -r 84944c0ecde6 -r bdaa98efa2f1 es/Leame.1st
--- a/es/Leame.1st	Mon Oct 27 13:44:21 2008 -0500
+++ b/es/Leame.1st	Mon Oct 27 13:46:28 2008 -0500
@@ -98,7 +98,7 @@
 || branch.tex      || Igor Támara   ||    100%    || 16/10/2008 ||  19/10/2008 ||
 || preface.tex     || Javier Rojas  ||    100%    || 18/10/2008 ||  19/10/2008 ||
 || daily.tex       || Igor Támara   ||    100%    || 19/10/2008 ||  26/10/2008 ||
-|| tour-basic.tex  || Javier Rojas  ||    80%     || 19/10/2008 ||             ||
+|| tour-basic.tex  || Javier Rojas  ||    87%     || 19/10/2008 ||             ||
 || undo.tex        || Igor Támara   ||    7%      || 26/10/2008 ||             ||
 
 == Archivos en proceso de revisión ==
diff -r 84944c0ecde6 -r bdaa98efa2f1 es/tour-basic.tex
--- a/es/tour-basic.tex	Mon Oct 27 13:44:21 2008 -0500
+++ b/es/tour-basic.tex	Mon Oct 27 13:46:28 2008 -0500
@@ -564,34 +564,37 @@
 only in our \dirname{my-hello} repository.  Let's look at a few ways
 that we can propagate this change into other repositories.
 
-\subsection{Pulling changes from another repository}
+\subsection{Jalar cambios desde otro repositorio}
 \label{sec:tour:pull}
 
-To get started, let's clone our original \dirname{hello} repository,
-which does not contain the change we just committed.  We'll call our
-temporary repository \dirname{hello-pull}.
+Para empezar, clonemos nuestro repositorio \dirname{hello} original,
+el cual no contiene el cambio que acabamos de consignar. Llamaremos a
+este repositorio temporal \dirname{hello-pull}.
 \interaction{tour.clone-pull}
 
-We'll use the \hgcmd{pull} command to bring changes from
-\dirname{my-hello} into \dirname{hello-pull}.  However, blindly
-pulling unknown changes into a repository is a somewhat scary
-prospect.  Mercurial provides the \hgcmd{incoming} command to tell us
-what changes the \hgcmd{pull} command \emph{would} pull into the
-repository, without actually pulling the changes in.
+Usaremos el comando \hgcmd{pull} para traer los cambios de
+\dirname{my-hello} y ponerlos en \dirname{hello-pull}.  Sin embargo,
+traer cambios desconocidos y aplicarlos en un repositorio es una
+perspectiva que asusta al menos un poco.  Mercurial cuenta con el
+comando \hgcmd{incoming}\ndt{Entrante, o entrantes.} para decirnos qué
+cambios \emph{jalaría} el comando \hgcmd{pull} al repositorio, sin
+jalarlos.
 \interaction{tour.incoming}
-(Of course, someone could cause more changesets to appear in the
-repository that we ran \hgcmd{incoming} in, before we get a chance to
-\hgcmd{pull} the changes, so that we could end up pulling changes that we
-didn't expect.)
+(Por supuesto, alguien podría enviar más conjuntos de cambios al
+repositorio en el tiempo que pasa entre la ejecución de
+\hgcmd{incoming} y la ejecución de \hgcmd{pull} para jalar los
+cambios, así que es posible que terminemos jalando cambios que no
+esperábamos.)
 
-Bringing changes into a repository is a simple matter of running the
-\hgcmd{pull} command, and telling it which repository to pull from.
+Traer cambios al repositorio simplemente es cuestión de ejecutar el
+comando \hgcmd{pull}, indicándole de qué repositorio debe jalarlos.
 \interaction{tour.pull}
-As you can see from the before-and-after output of \hgcmd{tip}, we
-have successfully pulled changes into our repository.  There remains
-one step before we can see these changes in the working directory.
+Como puede verse por las salidas antes-y-después de \hgcmd{tip}, hemos
+jalado exitosamente los cambios en nuestro repositorio. Aún falta un
+paso para que podamos ver estos cambios en nuestro directorio de
+trabajo.
 
-\subsection{Updating the working directory}
+\subsection{Actualizar el directorio de trabajo}
 
 We have so far glossed over the relationship between a repository and
 its working directory.  The \hgcmd{pull} command that we ran in