summaryrefslogtreecommitdiff
path: root/doc/style.txt
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:51:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:51:45 +0100
commit51f9f4d78deabf54dbbb6881139d2b1a319ffbfc (patch)
tree60a2bcd8911acd5c4ab8b4558bfd30344b673ff5 /doc/style.txt
parent76fe5db7153957f8fda437e3bd614312b076f19e (diff)
parentc1f168f54be5b4babeb9b91cd7145441ea2489ad (diff)
merge from the mvo branch
Diffstat (limited to 'doc/style.txt')
-rw-r--r--doc/style.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/style.txt b/doc/style.txt
index 8d0778b4a..2072251d0 100644
--- 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
-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
@@ -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')
-Non-ownership transfering arrays/lists should probably return an iterator
+Non-ownership transferring arrays/lists should probably return an iterator
typedef or references..