Patchwork [v3] Replace docs.sun.com URLs by their OTN equivalents

login
register
mail settings
Submitter Rainer Orth
Date March 14, 2011, 7:32 p.m.
Message ID <yddvczlqyzg.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/86803/
State New
Headers show

Comments

Rainer Orth - March 14, 2011, 7:32 p.m.
In their infinite wisdom, Oracle has moved all contents from
docs.sun.com to the Oracle Technical Network without putting specific
redirects in place, thus invalidating more than a decade of links in a
single stroke.  Oh well ;-(

The following patch deals with the outfall.  I've decided to remove the
links from gcc/config/sol2.c, leaving only the citations in place.  In
the libstdc++ manual, OTOH, I've updated the URLs.  I've no idea how
stable they are going to be, tough: in about a week, the first link has
already been invalidated by inserting a /html somewhere in the middle.
So much for competent webmasters.

Unfortunately, I've again lost the battle against the DocBook/XSL tools:
even with the exact same version of docbook-xsl (1.75.2), I couldn't
properly regenerate doc/html/manual/abi.html.  I will never be able to
understand how people are able to cope with this mess.

When this patch is checked in, could someone with the right magic please
regenerate that file for me?  Thanks.

Ok for mainline and perhaps the 4.6 branch?

	Rainer


2011-03-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	gcc:
	* config/sol2.c (solaris_assemble_visibility): Remove obsolete
	URLs.

	libstdc++-v3:
	* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their OTN
	equivalents.
	* doc/html/manual/abi.html: Regenerate.
Benjamin Kosnik - March 14, 2011, 8 p.m.
> 	libstdc++-v3:
> 	* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their
> OTN equivalents.

This is ok.

-benjamin
Rainer Orth - March 14, 2011, 8:26 p.m.
Benjamin Kosnik <bkoz@redhat.com> writes:

>> 	libstdc++-v3:
>> 	* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their
>> OTN equivalents.
>
> This is ok.

Thanks.  Jakub, ok for 4.6, too?

Unless I'm mistaken, even doc patches require RM approval now?

	Rainer
Jakub Jelinek - March 14, 2011, 8:28 p.m.
On Mon, Mar 14, 2011 at 09:26:56PM +0100, Rainer Orth wrote:
> Benjamin Kosnik <bkoz@redhat.com> writes:
> >> 	libstdc++-v3:
> >> 	* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their
> >> OTN equivalents.
> >
> > This is ok.
> 
> Thanks.  Jakub, ok for 4.6, too?

Yeah.

	Jakub
Rainer Orth - March 14, 2011, 8:37 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> On Mon, Mar 14, 2011 at 09:26:56PM +0100, Rainer Orth wrote:
>> Benjamin Kosnik <bkoz@redhat.com> writes:
>> >> 	libstdc++-v3:
>> >> 	* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their
>> >> OTN equivalents.
>> >
>> > This is ok.
>> 
>> Thanks.  Jakub, ok for 4.6, too?
>
> Yeah.

Installed on both.  Benjamin, perhaps you could regenerate abi.html so
the ChangeLog doesn't lie?

Thanks.
	Rainer
Jonathan Wakely - March 14, 2011, 8:52 p.m.
On 14 March 2011 20:37, Rainer Orth wrote:
> Jakub Jelinek <jakub@redhat.com> writes:
>
>> On Mon, Mar 14, 2011 at 09:26:56PM +0100, Rainer Orth wrote:
>>> Benjamin Kosnik <bkoz@redhat.com> writes:
>>> >>   libstdc++-v3:
>>> >>   * doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their
>>> >> OTN equivalents.
>>> >
>>> > This is ok.
>>>
>>> Thanks.  Jakub, ok for 4.6, too?
>>
>> Yeah.
>
> Installed on both.  Benjamin, perhaps you could regenerate abi.html so
> the ChangeLog doesn't lie?

I can do that later, if Benjamin doesn't beat me to it (I just need to
check out a 4.6 branch)

I don't think we can regenerate a single html file, because running
'make doc-html' changes loads of indices and cross-reference URLs, so
I always just regenerate the entire doc/html directory and check it
all in.

Patch

diff -r 2cb06ad64348 gcc/config/sol2.c
--- a/gcc/config/sol2.c	Sun Mar 06 00:52:15 2011 +0100
+++ b/gcc/config/sol2.c	Sun Mar 06 00:59:45 2011 +0100
@@ -1,5 +1,5 @@ 
 /* General Solaris system support.
-   Copyright (C) 2004, 2005 , 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 , 2007, 2010, 2011 Free Software Foundation, Inc.
    Contributed by CodeSourcery, LLC.
 
 This file is part of GCC.
@@ -136,10 +136,8 @@ 
      STV_SINGLETON, and STV_ELIMINATE.
 
      See Linker and Libraries Guide, Ch. 2, Link-Editor, Defining
-     Additional Symbols with a mapfile,
-     http://docs.sun.com/app/docs/doc/819-0690/gdzmc?a=view
-     and Ch. 7, Object-File Format, Symbol Table Section,
-     http://docs.sun.com/app/docs/doc/819-0690/chapter6-79797?a=view  */
+     Additional Symbols, and Ch. 7, Object-File Format, Symbol Table
+     Section.  */
 
   static const char * const visibility_types[] = {
     NULL, "symbolic", "hidden", "hidden"
diff -r 2cb06ad64348 libstdc++-v3/doc/xml/manual/abi.xml
--- a/libstdc++-v3/doc/xml/manual/abi.xml	Sun Mar 06 00:52:15 2011 +0100
+++ b/libstdc++-v3/doc/xml/manual/abi.xml	Sun Mar 06 00:59:45 2011 +0100
@@ -1127,7 +1127,7 @@ 
   </biblioentry>
 
   <biblioentry>
-    <biblioid xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://docs.sun.com/app/docs/doc/819-0690" class="uri">
+    <biblioid xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://download.oracle.com/docs/cd/E19963-01/html/819-0690/index.html" class="uri">
       </biblioid>
       <citetitle>
 	Linker and Libraries Guide (document 819-0690)
@@ -1136,7 +1136,7 @@ 
 
 
   <biblioentry>
-    <biblioid xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://docs.sun.com/app/docs/doc/819-3689" class="uri">
+    <biblioid xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://download.oracle.com/docs/cd/E19422-01/819-3689/index.html" class="uri">
     </biblioid>
     <citetitle>
       Sun Studio 11: C++ Migration Guide (document 819-3689)