[PATCH] ciabot: fix post-update hook description

[PATCH] ciabot: fix post-update hook description

[Jonas Fonseca]

Also, improve on a few lost sentences

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---

b2d8b2c5258b6585102c94f37c63dc2360092d87
 contrib/ciabot.pl |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

b2d8b2c5258b6585102c94f37c63dc2360092d87
diff --git a/contrib/ciabot.pl b/contrib/ciabot.pl
index 83a0d80..e23f5f1 100755
--- a/contrib/ciabot.pl
+++ b/contrib/ciabot.pl
@@ -14,15 +14,15 @@ #
 # The master location of this file is in the Cogito repository
 # (see http://www.kernel.org/git/).
 #
-# This program is designed to run as the .git/commit-post-hook script. It takes
-# the commit information, massaging it and mailing it to the address given below.
+# This program is designed to run as the .git/hooks/post-commit hook. It takes
+# the commit information, massages it and mails it to the address given below.
 #
-# The calling convention of the commit-post-hook script is:
+# The calling convention of the post-commit hook is:
 #
-#	commit-post-hook $commit_sha1 $branch_name
+#	.git/hooks/post-commit $commit_sha1 $branch_name
 #
 # If it does not work, try to disable $xml_rpc in the configuration section
-# below.
+# below. Also, remember to make the hook file executable.
 #
 #
 # Note that you can (and it might be actually more desirable) also use this
@@ -36,9 +36,9 @@ #	for merged in $(git-rev-list $newhead 
 #		/path/to/ciabot.pl $merged $refname
 #	done
 #
-# This is useful when you use a remote repository without working copy, where
-# you only push to - the update hook will be trigerred each time you push into
-# that repository, and the pushed commits will be reported through CIA.
+# This is useful when you use a remote repository that you only push to. The
+# update hook will be triggered each time you push into that repository, and
+# the pushed commits will be reported through CIA.
 
 use strict;
 use vars qw ($project $from_email $dest_email $noisy $rpc_uri $sendmail
@@ -78,19 +78,19 @@ # not deliver the event at all if CIA se
 # unfortunately not an uncommon condition.
 $xml_rpc = 0;
 
-# You can make this bot to totally ignore events concerning the objects
-# specified below. Each object is composed of <path>/<filename>,
+# This variable should contain a regexp, against which each file will be
+# checked, and if the regexp is matched, the file is ignored. This can be
+# useful if you do not want auto-updated files, such as e.g. ChangeLog, to
+# appear via CIA.
 #
-# This variable should contain regexp, against which will each object be
-# checked, and if the regexp is matched, the file is ignored. Therefore ie.  to
-# ignore all changes in the two files above and everything concerning module
-# 'admin', use:
+# The following example will make the script ignore all changes in two specific
+# files in two different modules, and everything concerning module 'admin':
 #
 # $ignore_regexp = "^(gentoo/Manifest|elinks/src/bfu/inphist.c|admin/)";
 $ignore_regexp = "";
 
 # It can be useful to also grab the generated XML message by some other
-# programs and ie. autogenerate some content based on it. Here you can specify
+# programs and e.g. autogenerate some content based on it. Here you can specify
 # a file to which it will be appended.
 $alt_local_message_target = "";
 
-- 
1.3.3.gd882-dirty

-- 
Jonas Fonseca

[PATCH] Portfile: bring it up to date; use description from cogito.spec.in

[Jonas Fonseca]

---

9460c53c76fc00e3b7c45e58813cefde78cb99f5
 Portfile.in |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

9460c53c76fc00e3b7c45e58813cefde78cb99f5
diff --git a/Portfile.in b/Portfile.in
index 9e380ad..297fd8a 100644
--- a/Portfile.in
+++ b/Portfile.in
@@ -4,13 +4,13 @@ name              cogito
 version           @@VERSION@@
 categories        devel
 maintainers       bryan.larsen@gmail.com
-description       Git core + cogito tools to provide a full distributed SCM.
-long_description  The git core, developed by Linus Torvalds provides \
-		  an extremely fast and flexible filesystem-based \
-		  database designed to store directory trees with \
-		  regard to their history.  The cogito tools, \
-		  developed by Petr Baudis, provide full distributed \
-		  SCM (software change management) functionality.
+description       The Cogito Version Control System
+long_description  Cogito is a version control system layered on top \
+		  of the git tree history storage system. It aims at \
+		  seamless user interface and ease of use, providing \
+		  generally smoother user experience than the "raw" \
+		  Core GIT itself and indeed many other version \
+		  control systems.
 homepage          http://kernel.org/pub/software/scm/cogito/
 master_sites      http://kernel.org/pub/software/scm/cogito/
 configure	  {}
-- 
1.3.3.gd882-dirty

-- 
Jonas Fonseca

[PATCH] Minor doc fixes

[Jonas Fonseca]

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---

1e376c11029a33deb811b77565fb558b6c192766
 README         |    2 +-
 README.osx     |    7 ++++---
 cogito.spec.in |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

1e376c11029a33deb811b77565fb558b6c192766
diff --git a/README b/README
index a53b466..e6e1119 100644
--- a/README
+++ b/README
@@ -60,7 +60,7 @@ The following tools are optional but rec
 Tool				Description
 -------------------------------------------------------------------------------
 rsync				For fetching files with the rsync backend.
-gnu coreutils			The gnu versions of stat, date and cp \
+GNU coreutils			The GNU versions of stat, date and cp \
 				are preferred over the BSD variants.
 asciidoc (>= 7.0), xmlto	For building documentation.
 -------------------------------------------------------------------------------
diff --git a/README.osx b/README.osx
index d8df872..912d9fe 100644
--- a/README.osx
+++ b/README.osx
@@ -2,8 +2,9 @@ This version of Cogito should work on OS
 
 To install on OS X:
 
-1) Install darwinports (http://darwinports.opendarwin.org/) 2) type
-"make Portfile" 3) type "sudo port install"
+ 1. Install darwinports (http://darwinports.opendarwin.org/)
+ 2. type "make Portfile"
+ 3. type "sudo port install"
 
 You may have to deal with md5 mismatches.  Either adjust the md5sum in
 your new Portfile or place the new tarball in
@@ -11,7 +12,7 @@ your new Portfile or place the new tarba
 
 Recommendations:
 
-The gnu versions of "stat" and "date" are preferred over their BSD
+The GNU versions of "stat" and "date" are preferred over their BSD
 variants.
 
 "patch", "diff", "merge", "curl" and "rsync" are required.  OS X.4
diff --git a/cogito.spec.in b/cogito.spec.in
index 5509d77..70274c1 100644
--- a/cogito.spec.in
+++ b/cogito.spec.in
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update summary and description
 - Make architecture-independent
 
-* Wed Jul 6 2005 Chris Wright <chris@osdl.org> 0.12-1
+* Wed Jul 6 2005 Chris Wright <chrisw@osdl.org> 0.12-1
 - update spec file
 
 * Thu Jun 9 2005 Chris Wright <chrisw@osdl.org> 0.11.3-1
-- 
1.3.3.gd882-dirty

-- 
Jonas Fonseca

[PATCH] Fix section slicing so help options are not misplaced in cg-commit(1)

[Jonas Fonseca]

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---

95724a5a97ca466e6eaccc7f46833a015dde2f24
 Documentation/make-cg-asciidoc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

95724a5a97ca466e6eaccc7f46833a015dde2f24
diff --git a/Documentation/make-cg-asciidoc b/Documentation/make-cg-asciidoc
index 45fc981..3873618 100755
--- a/Documentation/make-cg-asciidoc
+++ b/Documentation/make-cg-asciidoc
@@ -48,7 +48,7 @@ DESCRIPTION=
 OPTIONS=
 MISC=
 
-section=$(echo "$BODY" | sed -n '1,/^[-~][-~]*[-~]$/p')
+section=$(echo "$BODY" | sed -n '1,/^[-][-]*[-]$/p')
 section_lines=$(echo "$section" | wc -l)
 lines=$(echo "$BODY" | wc -l)
 
-- 
1.3.3.gd882-dirty

-- 
Jonas Fonseca

Re: [PATCH] ciabot: fix post-update hook description

[Petr Baudis]

Thanks, all four patches applied. :)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.