From 89c86648307725b0a101b2cfedd800da6675648c Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sun, 12 Jun 2005 22:11:20 +0000 Subject: [PATCH] Change mailing address of FSF, add AUTHORS file. * muse-*.el, muse.texi: Change mailing address of FSF. * muse.texi (Contributors): Fix typo. * AUTHORS: New file containing a list of all of those who have contributed code or documentation to Muse, how many lines were changed, etc. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-51 --- AUTHORS | 41 +++++++++++++++++++++++++++++++++++++++++ ChangeLog | 26 ++++++++++++++++++++++++++ muse-blosxom.el | 4 ++-- muse-convert.el | 4 ++-- muse-docbook.el | 4 ++-- muse-html.el | 4 ++-- muse-http.el | 4 ++-- muse-journal.el | 4 ++-- muse-latex.el | 4 ++-- muse-message.el | 4 ++-- muse-mode.el | 4 ++-- muse-poem.el | 4 ++-- muse-project.el | 4 ++-- muse-publish.el | 7 +++++-- muse-regexps.el | 4 ++-- muse-texinfo.el | 4 ++-- muse.el | 6 ++++-- muse.texi | 10 +++++----- 18 files changed, 107 insertions(+), 35 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..18b6e74 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,41 @@ +Muse +==== + +This is a listing of those who have made contributions of code or +documentation to Muse. + +John Wiegley: Original author + +Michael Olson: Current maintainer + +Sacha Chua: Contributor -- documentation + (assigned past and future changes) + +Brad Collins: Contributor + (assigned past and future changes) + +Li Daobing: Contributor + (assigned past and future changes) + +Yann Hodique: Contributor + (2 lines changed in muse-publish.el) + +Andrea Riciputi: Idea taken from code, but re-implemented + +John Sullivan: Contributor -- documentation (employed by FSF) + +Gary Vaughan: Original author of emacs-wiki-blosxom.el, which was the + basis for muse-blosxom.el + (assigned past and future changes) + +Lan Yufeng: Contributor (1 line changed in muse-colors.el) + + +Contributed software +==================== + +This is a listing of authors of software in the `contrib' directory. + +Nathan Kent Bullock: getstamps.py, hardcodedates.py (no license) + +Eric Marsden: cgi.el (assigned past and future changes to FSF) diff --git a/ChangeLog b/ChangeLog index f2fb09d..4150db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,32 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-06-12 22:11:20 GMT Michael Olson patch-51 + + Summary: + Change mailing address of FSF, add AUTHORS file. + Revision: + muse--main--1.0--patch-51 + + * muse-*.el, muse.texi: Change mailing address of FSF. + + * muse.texi (Contributors): Fix typo. + + * AUTHORS: New file containing a list of all of those who have + contributed code or documentation to Muse, how many lines were changed, + etc. + + new files: + .arch-ids/AUTHORS.id AUTHORS + + modified files: + ChangeLog muse-blosxom.el muse-convert.el muse-docbook.el + muse-html.el muse-http.el muse-journal.el muse-latex.el + muse-message.el muse-mode.el muse-poem.el muse-project.el + muse-publish.el muse-regexps.el muse-texinfo.el muse.el + muse.texi + + 2005-06-12 21:33:24 GMT Michael Olson patch-50 Summary: diff --git a/muse-blosxom.el b/muse-blosxom.el index 6cb6de0..ef6deaa 100644 --- a/muse-blosxom.el +++ b/muse-blosxom.el @@ -20,8 +20,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-convert.el b/muse-convert.el index a8bad0e..48ef12e 100644 --- a/muse-convert.el +++ b/muse-convert.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-docbook.el b/muse-docbook.el index 84b5ba7..3278d4b 100644 --- a/muse-docbook.el +++ b/muse-docbook.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-html.el b/muse-html.el index 4ef482e..c3303f7 100644 --- a/muse-html.el +++ b/muse-html.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-http.el b/muse-http.el index 8d6d5e4..b110308 100644 --- a/muse-http.el +++ b/muse-http.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-journal.el b/muse-journal.el index f3138e4..9b7c4f4 100644 --- a/muse-journal.el +++ b/muse-journal.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-latex.el b/muse-latex.el index 1c4867b..678ee9b 100644 --- a/muse-latex.el +++ b/muse-latex.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-message.el b/muse-message.el index 5e8d947..28c22fe 100644 --- a/muse-message.el +++ b/muse-message.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-mode.el b/muse-mode.el index 87039f5..494db9c 100644 --- a/muse-mode.el +++ b/muse-mode.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-poem.el b/muse-poem.el index f84b20e..6543d14 100644 --- a/muse-poem.el +++ b/muse-poem.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-project.el b/muse-project.el index 81f29ad..711dd28 100644 --- a/muse-project.el +++ b/muse-project.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-publish.el b/muse-publish.el index 31f0935..9facdda 100644 --- a/muse-publish.el +++ b/muse-publish.el @@ -16,13 +16,16 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Contributors: +;; Yann Hodique (yann DOT hodique AT gmail DOT com) fixed an +;; unnecessary URL description transform in `muse-publish-url'. + ;;; Code: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/muse-regexps.el b/muse-regexps.el index c0d5915..e9c4302 100644 --- a/muse-regexps.el +++ b/muse-regexps.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse-texinfo.el b/muse-texinfo.el index f180ab1..5985971 100644 --- a/muse-texinfo.el +++ b/muse-texinfo.el @@ -16,8 +16,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/muse.el b/muse.el index 91a75c3..2a90e31 100644 --- a/muse.el +++ b/muse.el @@ -27,8 +27,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -41,6 +41,8 @@ ;; people familiar with Emacs. See the included README file for more ;; information. +;;; Contributors: + ;;; Code: (defvar muse-version "3.00 ALPHA" diff --git a/muse.texi b/muse.texi index 549df03..5883807 100644 --- a/muse.texi +++ b/muse.texi @@ -388,7 +388,7 @@ The first draft of this document was taken from the emacs-wiki texinfo manual. Michael Olson adapted it for Muse and began the process of adding content to it. -John Sullivan, did a majority of the work on the emacs-wiki texinfo +John Sullivan did a majority of the work on the emacs-wiki texinfo manual. While Sacha Chua maintained emacs-wiki, she worked quite a bit on the @@ -405,7 +405,7 @@ emacs-wiki texinfo manual. @display Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -749,9 +749,9 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +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. @end smallexample Also add information on how to contact you by electronic and paper mail.