Merge branch 'master' of ssh://charles/tank/andrew/school/notes

diff --git a/spec/calculus.md b/spec/calculus.md
index 167a7e78c2e649b962f41940d9d4494fdd46467a..ddda40575b93fa94dbef141d5b1d2d8fda3a73ab 100644 (file)
--- a/spec/calculus.md
+++ b/spec/calculus.md
@@ -1,3 +1,12 @@
+---
+geometry: margin=2cm
+columns: 2
+graphics: yes
+tables: yes
+author: Andrew Lorimer
+classoption: twocolumn
+---
+
 # Differential calculus
 
 ## Limits
@@ -238,8 +247,10 @@ $\int k f(x) dx = k \int f(x) dx$
 | $f(x)$                          | $\int f(x) \cdot dx$         |
 | ------------------------------- | ---------------------------- |
 | $k$ (constant) | $kx + c$ |
-| $x^n$ | ${1 \over {n+1}}x^{n+1} + c$ |
+| $x^n$ | ${x^{n+1} \over {n+1}} + c$ |
 | $a x^{-n}$ | $a \cdot \log_e x + c$ |
+| ${1 \over {ax+b}}$ | ${1 \over a} \log_e (ax+b) + c$ |
+| $(ax+b)^n$ | ${1 \over {a(n+1)}}(ax+b)^{n-1} + c$ |
 | $e^{kx}$ | ${1 \over k} e^{kx} + c$ |
 | $e^k$ | $e^kx + c$ |
 | $\sin kx$ | $-{1 \over k} \cos (kx) + c$ |
@@ -247,8 +258,6 @@ $\int k f(x) dx = k \int f(x) dx$
 | ${f^\prime (x)} \over {f(x)}$ | $\log_e f(x) + c$ |
 | $g^\prime(x)\cdot f^\prime(g(x)$ | $f(g(x))$ (chain rule)|
 | $f(x) \cdot g(x)$ | $\int [f^\prime(x) \cdot g(x)] dx + \int [g^\prime(x) f(x)] dx$ |
-| ${1 \over {ax+b}}$ | ${1 \over a} \log_e (ax+b) + c$ |
-| $(ax+b)^n$ | ${1 \over {a(n+1)}}(ax+b)^{n-1} + c$ |
 
 ### Definite integrals