[Guile-commits] 28/33: Merge from stable-2.2

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit aad64cf3813ac96a67a7e50fb6aa81fcb6a86f8a
Merge: 478d394 f4f9d17
Author: Andy Wingo <address@hidden>
Date:   Fri Aug 2 15:29:33 2019 +0200

    Merge from stable-2.2

 doc/ref/posix.texi            | 24 ------------------------
 doc/ref/web.texi              |  6 +++---
 libguile/socket.h             |  4 +---
 module/system/repl/server.scm |  6 ++++--
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --cc libguile/socket.h
index e2d24b2,53db2c0..6a7818a
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@@ -1,24 -1,25 +1,24 @@@
  #ifndef SCM_SOCKET_H
  #define SCM_SOCKET_H
  
- /* Copyright 1995-1997,2000-2001,2004-2006,2008,2014,2018
 -/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008, 2014, 2019 
Free Software Foundation, Inc.
 - *
 - * This library is free software; you can redistribute it and/or
 - * modify it under the terms of the GNU Lesser General Public License
 - * as published by the Free Software Foundation; either version 3 of
 - * the License, or (at your option) any later version.
 - *
 - * This library 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
 - * Lesser General Public License for more details.
 - *
 - * You should have received a copy of the GNU Lesser General Public
 - * License along with this library; if not, write to the Free Software
 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 - * 02110-1301 USA
 - */
++/* Copyright 1995-1997,2000-2001,2004-2006,2008,2014,2018-2019
 +     Free Software Foundation, Inc.
 +
 +   This file is part of Guile.
 +
 +   Guile is free software: you can redistribute it and/or modify it
 +   under the terms of the GNU Lesser General Public License as published
 +   by the Free Software Foundation, either version 3 of the License, or
 +   (at your option) any later version.
 +
 +   Guile 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 Lesser General Public
 +   License for more details.
 +
 +   You should have received a copy of the GNU Lesser General Public
 +   License along with Guile.  If not, see
 +   <https://www.gnu.org/licenses/>.  */