From owner-p4-projects@FreeBSD.ORG  Sat May  3 11:22:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E8171065675; Sat,  3 May 2008 11:22:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4C2D1065673
	for <perforce@freebsd.org>; Sat,  3 May 2008 11:22:41 +0000 (UTC)
	(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E53768FC12
	for <perforce@freebsd.org>; Sat,  3 May 2008 11:22:41 +0000 (UTC)
	(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m43BMf43080115
	for <perforce@freebsd.org>; Sat, 3 May 2008 11:22:41 GMT
	(envelope-from carvay@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m43BMfFK080113
	for perforce@freebsd.org; Sat, 3 May 2008 11:22:41 GMT
	(envelope-from carvay@freebsd.org)
Date: Sat, 3 May 2008 11:22:41 GMT
Message-Id: <200805031122.m43BMfFK080113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	carvay@freebsd.org using -f
From: "J. Vicente Carrasco" <carvay@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141085 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 May 2008 11:22:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=141085

Change 141085 by carvay@carvay_zolocho.tugurbio.org on 2008/05/03 11:22:29

	- Add an example of editing and submitting  a file.

Affected files ...

.. //depot/projects/docproj_es/LEEME#3 edit

Differences ...

==== //depot/projects/docproj_es/LEEME#3 (text+ko) ====

@@ -97,6 +97,34 @@
 
 
 ===============================================================================
+Ejemplo de edición de un fichero
+===============================================================================
+
+1.-  Sincronizamos los contenidos si es que no lo hemos hecho ya o no
+nos conviene para no machacar trabajo ya hecho en otro fichero.
+
+p4 sync 
+
+2.- Con el siguiente comando decimos a perforce que vamos a editar un 
+fichero, lo que significa que lo *bloqueamos* hasta que no acabemos con
+él.  Hay herramientas para resolver conflictos si dos o más personas han
+editado el mismo fichero.
+
+p4 edit el-fichero-que-voy-a-editar.sgml
+
+3.- Editamos el fichero normalmente (si no se ha ejecutado el paso 2.- el
+fichero seguirá siendo de *sólo* *lectura*):
+
+ee el-fichero-que-voy-a-editar.sgml
+
+4.- Subimos al respositorio perforce el fichero con los cambios que hemos
+hecho detallando en el campo correspondiente el qué y el porqué.
+
+p4 submit el-fichero-que-voy-a-editar.sgml
+
+
+
+===============================================================================
 ¿Falta algo?
 ===============================================================================