summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-17 14:19:20 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-17 14:19:20 -0400
commit60c5bfae244d5bf7da9efa195d487ee4b884fcf1 (patch)
tree325bc1ef6507492180d4064e3dbd8aeebb233c53
parent7c31f3eda8d4a5015ad0203ecbbcb5846ffe7802 (diff)
parent572454f60d125be4741e4d9c3c50d9c48be5fecf (diff)
Merge commit 'jrollins/master'
-rw-r--r--doc/george/changelog5
-rw-r--r--website/index.mdwn2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/george/changelog b/doc/george/changelog
index 0790f65..7f1d5eb 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,11 @@
* changes to this system (first command at top, last at bottom) *
******************************************************************************
+2008-08-16 - jrollins
+ * removed stale branches from jrollins from the master repo
+ * aptitude update && aptitude full-upgrade
+ * restarted services to clear up dependencies on old libraries
+
2008-08-13 - dkg
* aptitude update && aptitude full-upgrade
* restarted services to clear up dependencies on old libraries
diff --git a/website/index.mdwn b/website/index.mdwn
index 8ff984d..495d963 100644
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -9,7 +9,7 @@ yourself and the servers you administer or connect to. OpenPGP keys
are tracked via GnuPG, and managed in the `known_hosts` and
`authorized_keys` files used by OpenSSH for connection authentication.
-[[bugs]] | [[download]] | [[news]] | [[documentation|doc]] | [why should i be interested?](/why)
+[why you should be interested](/why) | [[bugs]] | [[download]] | [[news]] | [[documentation|doc]]
## Conceptual overview ##