Merge branch 'debian/sid' into debian/experimental

[apt.git] / doc / style.txt

diff --git a/doc/style.txt b/doc/style.txt
index 8d0778b4a4e14cc63c2dd21d941b6a2fca2a4c8a..2072251d033822cd76c7ba407cc2166e6922636a 100644 (file)
--- a/doc/style.txt
+++ b/doc/style.txt
@@ -17,8 +17,8 @@ this style are:
 Each file gets a block at the top that should describe what the file does,
 basically a summary of purpose along with any special notes and 
 attributions. The }}} and {{{ are folding marks if you have a folding
 Each file gets a block at the top that should describe what the file does,
 basically a summary of purpose along with any special notes and 
 attributions. The }}} and {{{ are folding marks if you have a folding

-editor such as jed, the function seperators are intended to give
-a visual seperate between functions for easier browsing of the larger files,
+editor such as jed, the function separators are intended to give
+a visual separate between functions for easier browsing of the larger files,

 or indexed folding if you have such an editor.
 
 Each file should have 1 or 0 primary include files, that include
 or indexed folding if you have such an editor.
 
 Each file should have 1 or 0 primary include files, that include


@@ -71,5 +71,5 @@ almost always designates a change in ownership rules).
     pointer is an 'input' parameter (designated generally by an =0, 
     indicating a default of 'none')
      
     pointer is an 'input' parameter (designated generally by an =0, 
     indicating a default of 'none')
      

-Non-ownership transfering arrays/lists should probably return an iterator 
+Non-ownership transferring arrays/lists should probably return an iterator 

 typedef or references..
 typedef or references..