summaryrefslogtreecommitdiff
path: root/doc/style.txt
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-02 17:24:56 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-02 17:24:56 +0100
commitf3ceaca7a648f7d93fa88106910151e69f498801 (patch)
treeb2bf899c035363fbc0b561f1006a787cb06527f0 /doc/style.txt
parent5085e660679cdbb51783702898c42000d5db4fba (diff)
parent16d7341fce96b089aa2a1c241acd0a72209bcd7f (diff)
merge from the debian-sid 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..