Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/jollyroger/buildbot
Browse files Browse the repository at this point in the history
* 'master' of git://github.com/jollyroger/buildbot:
  Fix copyrigt notice and license header for manpages.
  • Loading branch information
djmitche committed Mar 19, 2011
2 parents 1564d80 + 16cbb0f commit f6b6ad2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
17 changes: 15 additions & 2 deletions master/docs/buildbot.1
@@ -1,3 +1,18 @@
.\" This file is part of Buildbot. Buildbot is free software: you can
.\" redistribute it and/or modify it under the terms of the GNU General Public
.\" License as published by the Free Software Foundation, version 2.
.\"
.\" This program is distributed in the hope that it will be useful, but WITHOUT
.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
.\" FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
.\" details.
.\"
.\" You should have received a copy of the GNU General Public License along with
.\" this program; if not, write to the Free Software Foundation, Inc., 51
.\" Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.\"
.\" Copyright Buildbot Team Members

.TH BUILDBOT "1" "August 2010" "Buildbot" "User Commands"
.SH NAME
buildbot \- a tool for managing buildbot master instances
Expand Down Expand Up @@ -582,8 +597,6 @@ The jobdir (maildir) for submitting jobs
.TP
master.cfg
Buildbot master configuration file
.SH AUTHOR
\fBAndriy Senkovych\fR <\&andriysenkovych@gmail.com\&>
.SH "SEE ALSO"
.BR buildslave (1),
.BR patch (1)
Expand Down
19 changes: 15 additions & 4 deletions slave/docs/buildslave.1
@@ -1,5 +1,18 @@
.\" Based on template /usr/share/man-db/examples/manpage.example provided by
.\" Tom Christiansen <tchrist@jhereg.perl.com>.
.\" This file is part of Buildbot. Buildbot is free software: you can
.\" redistribute it and/or modify it under the terms of the GNU General Public
.\" License as published by the Free Software Foundation, version 2.
.\"
.\" This program is distributed in the hope that it will be useful, but WITHOUT
.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
.\" FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
.\" details.
.\"
.\" You should have received a copy of the GNU General Public License along with
.\" this program; if not, write to the Free Software Foundation, Inc., 51
.\" Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.\"
.\" Copyright Buildbot Team Members

.TH BUILDSLAVE "1" "August 2010" "Buildbot" "User Commands"
.SH NAME
buildslave \- a tool for managing buildbot slave instances
Expand Down Expand Up @@ -170,8 +183,6 @@ This should be provided by buildmaster administrator.
.I PASSWORD
Buildslave password to connect with.
This should be provided by buildmaster administrator.
.SH AUTHOR
\fBAndriy Senkovych\fR <\&andriysenkovych@gmail.com\&>
.SH "SEE ALSO"
.BR buildbot (1),
.BR umask (2),
Expand Down

0 comments on commit f6b6ad2

Please sign in to comment.