[tor-dev] website patches for new Tor relay guide sidenav entry

[nusenu]

Hi Silvia,

I submitted a (trivial) patch (in #24881) to add links to the new tor relay guide
on the website and to remove previous guides that have been merged into
the new guide.

I noticed that since than new commits have been merged and these patches
will probably no longer apply cleanly.

I will try to ensure they apply (rebase) shortly before you have time
to look at them if you can tell me approximately when that will be.

thanks,
nusenu

[Silvia [Hiro]]

Hi,
thanks for letting me know.
I have fixed the merge conflicts myself and merged.

-hiro

Post by nusenu
Hi Silvia,
I submitted a (trivial) patch (in #24881) to add links to the new tor relay guide
on the website and to remove previous guides that have been merged into
the new guide.
I noticed that since than new commits have been merged and these patches
will probably no longer apply cleanly.
I will try to ensure they apply (rebase) shortly before you have time
to look at them if you can tell me approximately when that will be.
thanks,
nusenu

[nusenu]

Post by Silvia [Hiro]
Hi,
thanks for letting me know.
I have fixed the merge conflicts myself and merged.

Since the page did no longer build after
"Fix merge conflicts in sidenav"
​https://gitweb.torproject.org/project/web/webwml.git/commit/?id=c257c6ccac167d74206771f13d63e04335272661

I attempted to fix this with my comment and branch at
https://trac.torproject.org/projects/tor/ticket/24881#comment:7

Do you have time to look into this?

I'd like to get this fixed before submitting upcoming
patches and I'd like to get them deployed before Alison is going
to release an upcoming blog post.

thanks,
nusenu