diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-02 16:39:47 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-02 16:39:47 -0700 |
| commit | 7dab6df00804017844dab244f11e72cc73199fd8 (patch) | |
| tree | f5727d34d35179012b00cb8156a171191f737173 /debian | |
| parent | aefec8e2f77cf0bba2ea971607c1882925a197e2 (diff) | |
| parent | 4dfcb19ae2fed99d83e3e96a1a0aeafb7d06da61 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/monkeysphere.docs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 92c56ea..efb4a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ monkeysphere (0.12-1) UNRELEASED; urgency=low + [ Jameson Graef Rollins ] * Improved output handling. New LOG_LEVEL variable. + + [ Daniel Kahn Gillmor ] * debian/control: switched Homepage: and Vcs-Git: to canonicalized upstream hostnames. + * updated documentation for new release. -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 18:54:29 -0400 diff --git a/debian/monkeysphere.docs b/debian/monkeysphere.docs index 595e6c8..b677881 100644 --- a/debian/monkeysphere.docs +++ b/debian/monkeysphere.docs @@ -1,3 +1,3 @@ -doc/README -doc/README.admin +website/getting-started-user.mdwn +website/getting-started-admin.mdwn doc/MonkeySpec |