1 files changed, 37 insertions, 54 deletions
diff --git a/doc/man/marco-message.1 b/doc/man/marco-message.1
index 62e7a36f..9e073fa5 100644
--- a/doc/man/marco-message.1
+++ b/doc/man/marco-message.1
@@ -1,60 +1,43 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" -----
-.\" This file was confirmed to be licenced under the GPL
-.\" by its author and copyright holder, Akira TAGOH, on June 1st 2008:
-.\"
-.\" > I'm comfortable with DFSG-free. that sounds great if you think it's
-.\" > useful and worth containing it in upstream.
-.\" ...
-.\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
-.\" > since I have contributed that for Debian. so GPL is no problem for me.
-.\" -----
-.TH MARCO\-MESSAGE 1 "28 August 2002"
+.\" Man page for marco-message.
+.TH MARCO-MESSAGE 1 "8 February 2014" "MATE Desktop Environment"
 .\" Please adjust this date whenever revising the manpage.
 .\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-MARCO\-MESSAGE \- a command to send a message to Marco
-.SH SYNOPSIS
-.B MARCO\-MESSAGE
-[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B marco\-message\fP.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBmarco\-message\fP send a specified message to \fBmarco\fP(1).
-.SH OPTIONS
+.SH "NAME"
+marco\-message \- A command to send messages to Marco.
+.SH "SYNOPSIS"
+.B marco\-message [OPTIONS]
+.SH "DESCRIPTION"
+The \fBmarco\-message\fP command is used to perform some simple window manager tasks while Marco is running.
+
+.SH "OPTIONS"
+.TP
+\fBrestart\fR
+Restart a currently running instance of \fBmarco\fP.
 .TP
-.B restart
-Restart \fBmarco\fP(1) which is running.
+\fBreload\-theme\fR
+Reload the current window border theme specified in the dconf database. (/org/mate/marco/general/theme)
 .TP
-.B reload-theme
-Reload a theme which is specified on mateconf database.
+\fBenable\-keybindings\fR
+Enable all keybindings specified in the dconf database. (/org/mate/marco/)
 .TP
-.B enable-keybindings
-Enable all of keybindings which is specified on mateconf database.
+\fBdisable\-keybindings\fR
+Disable all keybindings specified in the dconf database. (/org/mate/marco/)
 .TP
-.B disable-keybindings
-Disable all of keybindings which is specified on mateconf database.
-.SH SEE ALSO
-.BR marco (1)
-.SH AUTHOR
-This manual page was written by Akira TAGOH <[email protected]>,
-for the Debian GNU/Linux system (but may be used by others).
+\fBtoggle\-verbose\fR
+Enable or Disable debugging messages for \fBmarco\fR.
+
+.SH "BUGS"
+.SS Should you encounter any bugs, they may be reported at: 
+http://github.com/mate-desktop/marco/issues
+.SH "AUTHORS"
+.SS This Man Page has been updated/re-written for the MATE Desktop Environment by:
+Adam Erdman <[email protected]> (2014)
+.SH "HISTORY"
+.SS Portions of this manpage were originally written for the Debian GNU/Linux system by:
+Akira TAGOH <[email protected]> (2002)
+.SH "SEE ALSO"
+.SS Further information may also be available at: http://wiki.mate-desktop.org/docs
+.P
+.BR marco (1),
+.BR marco-theme-viewer (1),
+.BR marco-window-demo (1)