From: Christopher Baines <mail@cbaines.net>
To: Oleg Pykhalov <go.wigust@gmail.com>
Cc: 28356-done@debbugs.gnu.org
Subject: bug#28356: [PATCH 1/1] doc: Replace server-list with server-blocks.
Date: Sun, 10 Sep 2017 12:02:09 +0100 [thread overview]
Message-ID: <20170910120209.3f4210b3@cbaines.net> (raw)
In-Reply-To: <87ingvuf1m.fsf@magnolia>
[-- Attachment #1: Type: text/plain, Size: 1828 bytes --]
On Thu, 07 Sep 2017 10:46:29 +0300
Oleg Pykhalov <go.wigust@gmail.com> wrote:
> Hello Christopher,
>
> Christopher Baines <mail@cbaines.net> writes:
>
> > On Tue, 05 Sep 2017 14:15:30 +0300
> > Oleg Pykhalov <go.wigust@gmail.com> wrote:
> >
> >> From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00
> >> 2001 From: Oleg Pykhalov <go.wigust@gmail.com>
> >> Date: Tue, 5 Sep 2017 14:04:14 +0300
> >> Subject: [PATCH 1/1] doc: Replace server-list with server-blocks.
> >>
> >> * doc/guix.texi (Web Services): Replace 'server-list' with
> >> 'server-blocks'. ---
> >> doc/guix.texi | 10 +++++-----
> >> 1 file changed, 5 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/doc/guix.texi b/doc/guix.texi
> >> index e7a88e19f..9ac52535b 100644
> >
> > 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?
>
> Yes, sorry for that.
>
> >> …
> > 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?
>
> 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.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]
prev parent reply other threads:[~2017-09-10 11:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 11:13 [bug#28356] [PATCH 0/1] doc: Replace server-list with server-blocks Oleg Pykhalov
2017-09-05 11:15 ` [bug#28356] [PATCH 1/1] " Oleg Pykhalov
2017-09-07 5:58 ` Christopher Baines
2017-09-07 7:46 ` Oleg Pykhalov
2017-09-10 11:02 ` Christopher Baines [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170910120209.3f4210b3@cbaines.net \
--to=mail@cbaines.net \
--cc=28356-done@debbugs.gnu.org \
--cc=go.wigust@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).