Author: upayavira
Date: Wed Dec 15 13:36:18 2004
New Revision: 112023

URL: http://svn.apache.org/viewcvs?view=rev&rev=112023
Log:
About properties
Modified:
   cocoon/site/src/documentation/content/xdocs/community/committer.xml

Modified: cocoon/site/src/documentation/content/xdocs/community/committer.xml
Url: 
http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/community/committer.xml?view=diff&rev=112023&p1=cocoon/site/src/documentation/content/xdocs/community/committer.xml&r1=112022&p2=cocoon/site/src/documentation/content/xdocs/community/committer.xml&r2=112023
==============================================================================
--- cocoon/site/src/documentation/content/xdocs/community/committer.xml 
(original)
+++ cocoon/site/src/documentation/content/xdocs/community/committer.xml Wed Dec 
15 13:36:18 2004
@@ -38,9 +38,20 @@
         that if SVN files are inconsistent, some of those editors just
         make it worse.
       </p>
-
       <p>
-        The solution is that some committers who have a proper editor
+        The solution comes in two parts:
+      </p>
+      <p>
+        When a committer adds a new file, they need to ensure that the file 
+        has the correct line endings for their own operating system, and that
+        either their SVN client automatically sets the EOL settings for the 
+        file based upon the file extension, or they must do:
+      </p>
+<source><![CDATA[svn add myfile.txt
+svn propset svn:eol-style native myfile.txt
+]]>
+</source>
+      <p>is that some committers who have a proper editor
         should occasionally correct the whitespace across all SVN files,
         applying the following rules.
       </p>
@@ -50,7 +61,7 @@
       <ul>
         <li>Replace all tabs with spaces.</li>
         <li>No trailing whitespace.</li>
-        <li>No M$-DOS line endings.</li>
+        <li>No MS-DOS line endings.</li>
         <li>Newline at end-of-file.</li>
         <li>Single whitespace between words.</li>
       </ul>
@@ -90,7 +101,7 @@
 find . -type f | xargs grep -l '^M' | xargs file | \
 grep -i -w text | cut -f1 -d:
 
-To add the ^M use "   Ctrl-v Ctrl-m" at the command-line.
+To add the ^M use "Ctrl-v Ctrl-m" at the command-line.
 Note that copy-and-paste will not work.
 The -w can be omitted, but might then match some extra filenames.
 ]]></source>

Reply via email to