From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dr014-0004D1-JW for guix-patches@gnu.org; Sun, 10 Sep 2017 07:03:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dr010-0003T7-NS for guix-patches@gnu.org; Sun, 10 Sep 2017 07:03:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49767) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dr010-0003T1-J0 for guix-patches@gnu.org; Sun, 10 Sep 2017 07:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dr010-00026Y-A9 for guix-patches@gnu.org; Sun, 10 Sep 2017 07:03:02 -0400 Subject: bug#28356: [PATCH 1/1] doc: Replace server-list with server-blocks. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Sun, 10 Sep 2017 12:02:09 +0100 From: Christopher Baines Message-ID: <20170910120209.3f4210b3@cbaines.net> In-Reply-To: <87ingvuf1m.fsf@magnolia> References: <871snlieja.fsf@magnolia> <87y3ptgzvx.fsf@magnolia> <20170907065852.51fe3c8b@cbaines.net> <87ingvuf1m.fsf@magnolia> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/dZiDuUfSGBiIloNXAev/rB5"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Oleg Pykhalov Cc: 28356-done@debbugs.gnu.org --Sig_/dZiDuUfSGBiIloNXAev/rB5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 07 Sep 2017 10:46:29 +0300 Oleg Pykhalov wrote: > Hello Christopher, >=20 > Christopher Baines writes: >=20 > > On Tue, 05 Sep 2017 14:15:30 +0300 > > Oleg Pykhalov wrote: > > =20 > >> From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00 > >> 2001 From: Oleg Pykhalov > >> Date: Tue, 5 Sep 2017 14:04:14 +0300 > >> Subject: [PATCH 1/1] doc: Replace server-list with server-blocks. > >>=20 > >> * doc/guix.texi (Web Services): Replace 'server-list' with > >> 'server-blocks'. --- > >> doc/guix.texi | 10 +++++----- > >> 1 file changed, 5 insertions(+), 5 deletions(-) > >>=20 > >> diff --git a/doc/guix.texi b/doc/guix.texi > >> index e7a88e19f..9ac52535b 100644 =20 > > > > I'm having problems applying this: > > > > error: sha1 information is lacking or useless (doc/guix.texi). > > error: could not build fake ancestor > > > > I think this might be happening, as I don't have something locally > > that coresponds to e7a88e19f. Is this patch on some version of > > guix.texi that hasn't made it in to the master branch yet? =20 >=20 > Yes, sorry for that. >=20 > >> =E2=80=A6 =20 > > Thanks for spotting this. Obviously I missed it when removing the > > nginx-service procedure. > > > > It looks like this is also a problem elsewhere in the docs, as I can > > see a few more instances of server-list. Also, it looks like > > upstream-list has exactly the same problem. I think it would be > > good to fix all of the server-list bits in this patch at least. > > Could you add them? =20 >=20 > Sure, I replaced all instances in which Emacs (query-replace) found in > doc/guix.texi. Awesome, I've now pushed this, along with another patch that fixes the same issue for upstream-list/upstream-blocks. --Sig_/dZiDuUfSGBiIloNXAev/rB5 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlm1G7FfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XezZRAAnbZnDFr+rvYuEy6ohJLDPfBq8WCmtMAztERe3Jgg19w8r1N1bk2hv8XT EvS6XHeQvZ8kcd5xg82Iaal86rVrFt0n1Y7zDbVHUtouA2tOIiiAfHhHGcY9s8F1 RggG/tiOVEnpTlseAj6jrcwiZJacsq0n3ZBgF7XE1xhAW/QkBKEpxrrPlliSVdF5 bSlU4vAeyDgKdFdNy4UgMZTU125dpXzgj9YENAq+4OIayF8ZyyLP7MXlK83gCULD qWXK+lrsrxMZsy/DaIvfQ15f7kiDiJFUCFY7zth0JUHb6SJUZ/fYsF5Rul7EYkir PaOz3rFTNPacsF4bAwY6DEogQlJp3aJ+tiBx0jd2OC/umzMpl6VEuohh5s+CBhHz 65fyL6+p9FG2wpMilvyIV1HMYRQ+ZdWiK3af5uHNQMAOktVylWe6ATKgNzHgksef +NSd4xYDd6QPfq+Lpj1AcuSl2XlZu/MH+s2B0eKQi3uUJMc5pWBE0mMZdZc7Iqp3 1oYqiJyEwzIkrmcFt93BjIcHApI6uLvGvx54/SPg4cvu5TuKLrnf7p72e9D0lqPK n35FFApR8pl/4e37RC/kfE0PiLjETWyKDv4c6qB065x50/vzSDORdmx+buP0fCRA usX9AlLPYiqhz63tVcpZKPaJqxeGNAwPTtIQrkxZrS2ONcBdQqA= =kI/D -----END PGP SIGNATURE----- --Sig_/dZiDuUfSGBiIloNXAev/rB5--