summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2004-11-05 06:42:22 (GMT)
committerFred Drake <fdrake@acm.org>2004-11-05 06:42:22 (GMT)
commite0bdaefaf43abaca4fb30e739768fcfbfd494139 (patch)
tree4b6bd5a91d373dcc0176a57cb8a3a1568be87af9
parent0384be3b079ef7e3ee39025ae99025514b367aa6 (diff)
downloadcpython-e0bdaefaf43abaca4fb30e739768fcfbfd494139.zip
cpython-e0bdaefaf43abaca4fb30e739768fcfbfd494139.tar.gz
cpython-e0bdaefaf43abaca4fb30e739768fcfbfd494139.tar.bz2
- remove some bogus <meta> tags from the document head
- clean up some of the generated markup
-rw-r--r--Doc/perl/l2hinit.perl15
1 files changed, 4 insertions, 11 deletions
diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl
index ce71c89..5b106e9 100644
--- a/Doc/perl/l2hinit.perl
+++ b/Doc/perl/l2hinit.perl
@@ -170,7 +170,7 @@ sub use_icon($$$) {
my $r = get_my_icon($1);
$s =~ s/\<tex2html_[a-z_]+_visible_mark\>/$r/;
}
- $s =~ s/<[aA] /<a rel="$rel" title="$title" \n /;
+ $s =~ s/<[aA] /<a rel="$rel" title="$title"\n /;
$s =~ s/ HREF=/ href=/;
return $s;
}
@@ -432,7 +432,7 @@ sub do_cmd_tableofcontents {
my($closures, $reopens) = preserve_open_tags();
anchor_label('contents', $CURRENT_FILE, $_); # this is added
$MY_CONTENTS_PAGE = "$CURRENT_FILE";
- join('', "<br />\n\\tableofchildlinks[off]", $closures
+ join('', "\\tableofchildlinks[off]", $closures
, make_section_heading($toc_title, 'h2'), $toc_mark
, $reopens, $_);
}
@@ -725,23 +725,16 @@ sub make_head_and_body($$) {
$charset = $CHARSET;
$charset =~ s/_/\-/go;
}
- # Remove section number from the title for use in the
- # <meta name='description' ...> element in the document head.
- my $metatitle = "$title";
- $metatitle =~ s/^\d+(\.\d+)*\s*//;
- $metatitle = meta_information($metatitle);
- $metatitle =~ s/ NAME=/ name=/g;
- $metatitle =~ s/ CONTENT=/ content=/g;
-
join('',
$MY_PARTIAL_HEADER,
- $metatitle,
"<title>", $title, "</title>\n</head>\n<body$body>");
}
sub replace_morelinks {
$more_links =~ s/ REL=/ rel=/g;
$more_links =~ s/ HREF=/ href=/g;
+ $more_links =~ s/<LINK /<link /g;
+ $more_links =~ s/">/" \/>/g;
$_ =~ s/$more_links_mark/$more_links/e;
}
>-rw-r--r--src/testlib/qbenchmarkevent.cpp4
-rw-r--r--src/testlib/qbenchmarkevent_p.h4
-rw-r--r--src/testlib/qbenchmarkmeasurement.cpp4
-rw-r--r--src/testlib/qbenchmarkmeasurement_p.h4
-rw-r--r--src/testlib/qbenchmarkvalgrind.cpp4
-rw-r--r--src/testlib/qbenchmarkvalgrind_p.h4
-rw-r--r--src/testlib/qplaintestlogger.cpp4
-rw-r--r--src/testlib/qplaintestlogger_p.h4
-rw-r--r--src/testlib/qsignaldumper.cpp4
-rw-r--r--src/testlib/qsignaldumper_p.h4
-rw-r--r--src/testlib/qsignalspy.h4
-rw-r--r--src/testlib/qtest.h4
-rw-r--r--src/testlib/qtest_global.h4
-rw-r--r--src/testlib/qtest_gui.h4
-rw-r--r--src/testlib/qtestaccessible.h4
-rw-r--r--src/testlib/qtestassert.h4
-rw-r--r--src/testlib/qtestcase.cpp4
-rw-r--r--src/testlib/qtestcase.h4
-rw-r--r--src/testlib/qtestdata.cpp4
-rw-r--r--src/testlib/qtestdata.h4
-rw-r--r--src/testlib/qtestevent.h4
-rw-r--r--src/testlib/qtesteventloop.h4
-rw-r--r--src/testlib/qtestkeyboard.h4
-rw-r--r--src/testlib/qtestlog.cpp4
-rw-r--r--src/testlib/qtestlog_p.h4
-rw-r--r--src/testlib/qtestmouse.h4
-rw-r--r--src/testlib/qtestresult.cpp6
-rw-r--r--src/testlib/qtestresult_p.h4
-rw-r--r--src/testlib/qtestspontaneevent.h4
-rw-r--r--src/testlib/qtestsystem.h4
-rw-r--r--src/testlib/qtesttable.cpp4
-rw-r--r--src/testlib/qtesttable_p.h4
-rw-r--r--src/testlib/qxmltestlogger.cpp4
-rw-r--r--src/testlib/qxmltestlogger_p.h4
40 files changed, 81 insertions, 81 deletions
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index e5d5d59..244eb8d 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtTest module of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h