diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:46:49 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:46:49 +0200 |
| commit | 2ef58837dcb7b78edc193bc9ef1da316bba86998 (patch) | |
| tree | ea2914b8a8159a98e11095432518c5fa74ea1197 /doc | |
| parent | 86975e584eeabbc4f3111f2d100f05ca00579d31 (diff) | |
| parent | 5516a66d492497ba8776212defb3117ed1dbfbf8 (diff) | |
Merge commit 'origin/master' into dev
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bird.sgml | 3 | ||||
| -rw-r--r-- | doc/prog-head.sgml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/bird.sgml b/doc/bird.sgml index 267c768a..29fcd5a9 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -23,7 +23,8 @@ configuration primitives, <cf> is fragment of configuration within normal text, <author> Ondrej Filip <it/<feela@network.cz>/, Pavel Machek <it/<pavel@ucw.cz>/, -Martin Mares <it/<mj@ucw.cz>/ +Martin Mares <it/<mj@ucw.cz>/, +Ondrej Zajicek <it/<santiago@crfreenet.org>/ </author> <abstract> diff --git a/doc/prog-head.sgml b/doc/prog-head.sgml index 5e527e5f..0eec367e 100644 --- a/doc/prog-head.sgml +++ b/doc/prog-head.sgml @@ -13,7 +13,8 @@ <author> Ondrej Filip <it/<feela@network.cz>/, Pavel Machek <it/<pavel@ucw.cz>/, -Martin Mares <it/<mj@ucw.cz>/ +Martin Mares <it/<mj@ucw.cz>/, +Ondrej Zajicek <it/<santiago@crfreenet.org>/ </author> <abstract> |