[svnbook commit] r2726 - trunk/src/en/book

[cmpilato]

Author: cmpilato
Date: Wed Feb 28 08:45:33 2007
New Revision: 2726

Modified:
   trunk/src/en/book/ch00-preface.xml
   trunk/src/en/book/ch03-advanced-topics.xml

Log:
* src/en/book/ch00-preface.xml
* src/en/book/ch03-advanced-topics.xml
  Remove <foreignphrase> tags for foreign words or phrases found in
  Webster's, per O'Reilly guidelines.


Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml	(original)
+++ trunk/src/en/book/ch00-preface.xml	Wed Feb 28 08:45:33 2007
@@ -18,12 +18,12 @@
     In the world of open-source software, the Concurrent Versions
     System (CVS) was the tool of choice for version control for many
     years.  And rightly so.  CVS was open-source software itself, and
-    its non-restrictive <foreignphrase>modus operandi</foreignphrase>
-    and support for networked operation allowed dozens of
-    geographically dispersed programmers to share their work.  It fit
-    the collaborative nature of the open-source world very well.  CVS
-    and its semi-chaotic development model have since become
-    cornerstones of open-source culture.</para>
+    its non-restrictive modus operandi and support for networked
+    operation allowed dozens of geographically dispersed programmers
+    to share their work.  It fit the collaborative nature of the
+    open-source world very well.  CVS and its semi-chaotic development
+    model have since become cornerstones of open-source
+    culture.</para>
 
   <para>But CVS was not without its flaws, and simply fixing those
     flaws promised to be an enormous effort.  Enter Subversion.
@@ -629,16 +629,16 @@
           <para>There's also a CollabNet Team Edition (CTE)
             offering aimed at smaller groups.</para>
         </footnote>
-        of which one component is version control.  Although
-        CEE used CVS as its initial version control system, CVS's
-        limitations were obvious from the beginning, and CollabNet knew
-        it would eventually have to find something better.
-        Unfortunately, CVS had become the <foreignphrase>de
-        facto</foreignphrase> standard in the open source world largely
-        because there <emphasis>wasn't</emphasis> anything better, at
-        least not under a free license.  So CollabNet determined to
-        write a new version control system from scratch, retaining the
-        basic ideas of CVS, but without the bugs and misfeatures.</para>
+        of which one component is version control.  Although CEE used
+        CVS as its initial version control system, CVS's limitations
+        were obvious from the beginning, and CollabNet knew it would
+        eventually have to find something better.  Unfortunately, CVS
+        had become the de facto standard in the open source world
+        largely because there <emphasis>wasn't</emphasis> anything
+        better, at least not under a free license.  So CollabNet
+        determined to write a new version control system from scratch,
+        retaining the basic ideas of CVS, but without the bugs and
+        misfeatures.</para>
   
       <para>In February 2000, they contacted Karl Fogel, the author of
         <citetitle>Open Source Development with CVS</citetitle>

Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml	(original)
+++ trunk/src/en/book/ch03-advanced-topics.xml	Wed Feb 28 08:45:33 2007
@@ -912,14 +912,13 @@
           doubt on the mapping between a file's name and its content.
           With information being served across networks and generated
           dynamically by server-side scripts, there was often no real
-          file <foreignphrase>per se</foreignphrase> to speak of, and
-          therefore no file name.  Web servers, for example, needed
-          some other way to tell browsers what they were downloading
-          so the browser could do something intelligent with that
-          information, whether that was to display the data using a
-          program registered to handle that data type, or to prompt
-          the user for where on the client machine to store the
-          downloaded data.</para>
+          file per se to speak of, and therefore no file name.  Web
+          servers, for example, needed some other way to tell browsers
+          what they were downloading so the browser could do something
+          intelligent with that information, whether that was to
+          display the data using a program registered to handle that
+          data type, or to prompt the user for where on the client
+          machine to store the downloaded data.</para>
 
         <para>Eventually, a standard emerged for, among other things,
           describing the contents of a data stream.  In 1996, RFC2045
@@ -928,9 +927,9 @@
           subtypes, and recommends a syntax for the representation of
           those types.  Today, MIME media types—or, MIME
           types— are used almost universally across e-mail
-          applications, Web servers, and other software as the
-          <foreignphrase>de facto</foreignphrase> mechanism for
-          clearing up the file content confusion.</para>
+          applications, Web servers, and other software as the de
+          facto mechanism for clearing up the file content
+          confusion.</para>
 
       </sidebar>