[svnbook] r5599 committed - branches/1.8/fr/book

[chris-nanteuil at users.sourceforge.net]

Revision: 5599
          http://sourceforge.net/p/svnbook/source/5599
Author:   chris-nanteuil
Date:     2018-01-21 11:31:23 +0000 (Sun, 21 Jan 2018)
Log Message:
-----------
[fr] Following English version.

Modified Paths:
--------------
    branches/1.8/fr/book/ch02-basic-usage.xml

Property Changed:
----------------
    branches/1.8/fr/book/
    branches/1.8/fr/book/ch02-basic-usage.xml

Index: branches/1.8/fr/book
===================================================================
--- branches/1.8/fr/book	2018-01-21 02:42:43 UTC (rev 5598)
+++ branches/1.8/fr/book	2018-01-21 11:31:23 UTC (rev 5599)

Property changes on: branches/1.8/fr/book
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en/book:5065-5586
\ No newline at end of property
+/trunk/en/book:5065-5598
\ No newline at end of property
Modified: branches/1.8/fr/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/fr/book/ch02-basic-usage.xml	2018-01-21 02:42:43 UTC (rev 5598)
+++ branches/1.8/fr/book/ch02-basic-usage.xml	2018-01-21 11:31:23 UTC (rev 5599)
@@ -3298,8 +3298,8 @@
 <!--
         <para>Beginning with Subversion 1.8, an internal file merge
           tool allows you to postpone conflict resolution for certain
-          conflicts, but resolve other confilcts.  Therefore, you can
-          postpone conflict resolution area-by-area, not just on
+          conflicts, but resolve other conflicts.  Therefore, you can
+          postpone conflict resolution area-by-area, not just on a
           file-to-file basis.</para>
 -->
         <para>À partir de Subversion 1.8, un outil interne de fusion
@@ -3545,7 +3545,7 @@
           the <option>- -accept</option> option, which allows you
           specify your desired approach for resolving the conflict.
           Prior to Subversion 1.8, the <command>svn resolve</command>
-          <emphasis>required</emphasis> the use of this option.
+          command <emphasis>required</emphasis> the use of this option.
           Subversion now allows you to run the <command>svn
           resolve</command> command without that option.  When you do
           so, Subversion cranks up its interactive conflict resolution
@@ -4177,7 +4177,7 @@
 <!--
       <para>At this point, you need to run <userinput>svn
         update</userinput>, deal with any merges or conflicts that
-        result, and attempt your commit again.</para>
+        result, and then attempt your commit again.</para>
 -->
       <para>À ce moment là, vous devez lancer <userinput>svn
         update</userinput>, traiter les fusions ou conflits qui


Property changes on: branches/1.8/fr/book/ch02-basic-usage.xml
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /branches/1.5/fr/book/ch02-basic-usage.xml:3977-5076
-/trunk/en/book/ch02-basic-usage.xml:5065-5586
+/trunk/en/book/ch02-basic-usage.xml:5065-5598
 /trunk/src/fr/book/ch02-basic-usage.xml:3306-3976
\ No newline at end of property