summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control2
-rw-r--r--debian/copyright2
-rw-r--r--doc/README.mdwn2
-rw-r--r--doc/index.mdwn16
-rw-r--r--doc/install.mdwn4
-rw-r--r--etckeeper.82
6 files changed, 20 insertions, 8 deletions
diff --git a/debian/control b/debian/control
index 252b210..59a4d0c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python, dh-
Maintainer: Debian QA Group <packages@qa.debian.org>
Standards-Version: 3.9.4
XS-Python-Version: all
-Vcs-Git: git://git.kitenet.net/etckeeper
+Vcs-Git: git://git.joeyh.name/etckeeper
Homepage: http://etckeeper.branchable.com/
Package: etckeeper
diff --git a/debian/copyright b/debian/copyright
index cfd479b..78cd5b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: © 2007-2014 Joey Hess <joey@kitenet.net> and contributors
+Copyright: © 2007-2014 Joey Hess <id@joeyh.name> and contributors
License: GPL-2+
The full text of the GPL is distributed as doc/GPL in etckeeper's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
diff --git a/doc/README.mdwn b/doc/README.mdwn
index 33ff4a7..4528eb3 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -284,4 +284,4 @@ etckeeper is licensed under version 2 or greater of the GNU GPL.
## author
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 54ad97e..7f76bb2 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,10 +1,22 @@
+etckeeper is a collection of tools to let `/etc` be stored in a git,
+mercurial, bazaar or darcs repository. This lets you use git to review or
+revert changes that were made to `/etc`. Or even push the repository
+elsewhere for backups or cherry-picking configuration changes.
+
+It hooks into package managers like apt to automatically commit changes
+made to /etc during package upgrades. It tracks file metadata that git does
+not normally support, but that is important for /etc, such as the
+permissions of `/etc/shadow`.
+
+It's quite modular and configurable, while also being simple to use if you
+understand the basics of working with version control.
+
<html>
<video controls width=400 title="introduction to etckeeper by Francois Marier" src="https://downloads.kitenet.net/videos/etckeeper.ogv"></video>
</html>
-[[!inline raw=yes pages="README"]]
-
[[!sidebar content="""
+[[README]]
[[install]]
[[news]]
[[todo]]
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 2997373..346082c 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -1,5 +1,5 @@
-etckeeper is available in git at `git://git.kitenet.net/etckeeper`, or
-[in gitweb](http://git.kitenet.net/?p=etckeeper.git).
+etckeeper is available in git at `git://git.joeyh.name/etckeeper`, or
+[in gitweb](http://git.joeyh.name/?p=etckeeper.git).
It's packaged in Debian, Ubuntu, Fedora, etc.
diff --git a/etckeeper.8 b/etckeeper.8
index 62ae976..6164351 100644
--- a/etckeeper.8
+++ b/etckeeper.8
@@ -69,4 +69,4 @@ ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etcke
.SH SEE ALSO
/usr/share/doc/etckeeper/README.md.gz
.SH AUTHOR
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>