From owner-svn-doc-head@FreeBSD.ORG  Sun Sep 21 21:00:42 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE2C3E4C;
 Sun, 21 Sep 2014 21:00:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD9BB934;
 Sun, 21 Sep 2014 21:00:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8LL0gxm003376;
 Sun, 21 Sep 2014 21:00:42 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8LL0f87003368;
 Sun, 21 Sep 2014 21:00:41 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201409212100.s8LL0f87003368@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 21 Sep 2014 21:00:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45654 - in head: en_US.ISO8859-1/htdocs/docproj
 en_US.ISO8859-1/htdocs/gnome/docs en_US.ISO8859-1/htdocs/ipv6
 en_US.ISO8859-1/htdocs/platforms/ia64 en_US.ISO8859-1/htdocs/projects/acpi...
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Sep 2014 21:00:42 -0000

Author: gavin
Date: Sun Sep 21 21:00:40 2014
New Revision: 45654
URL: http://svnweb.freebsd.org/changeset/doc/45654

Log:
  Use &cgibase; rather than hardcoding http://www.freebsd.org/cgi/
  
  There are a few remaining explicit uses of http://www.freebsd.org/cgi/
  but all of these appear to be outdated e.g. pointing to GNATS) and need
  updating.
  
  Switch &cgibase; to use protocol-relative links, rather than hardcoding
  http.  Switch two others (ftpbase and ftpbaseerrata) whilst here.

Modified:
  head/en_US.ISO8859-1/htdocs/docproj/doc-set.xml
  head/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml
  head/en_US.ISO8859-1/htdocs/ipv6/index.xml
  head/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml
  head/en_US.ISO8859-1/htdocs/projects/acpi/index.xml
  head/en_US.ISO8859-1/htdocs/search/search-mid.xml
  head/en_US.ISO8859-1/htdocs/search/search.xml
  head/share/xml/common.ent

Modified: head/en_US.ISO8859-1/htdocs/docproj/doc-set.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docproj/doc-set.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/docproj/doc-set.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -16,7 +16,7 @@
     <p>FreeBSD's documentation falls into three basic categories:</p>
 
     <ol>
-      <li><p><a href="http://www.FreeBSD.org/cgi/man.cgi"><b>The manual pages</b></a></p>
+      <li><p><a href="&cgibase;/man.cgi"><b>The manual pages</b></a></p>
 
 	<p>The Project does not really concern itself with these, since
 	  they are a part of the base system. The exception to this is the

Modified: head/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -156,7 +156,7 @@ WANT_GNOME=	yes
 	    <tt>gnomepanel</tt>, we check <tt>HAVE_GNOME</tt> to see if it
 	    contains <tt>gnomepanel</tt> (for more on the :M<tt>pattern</tt>
 	    make syntax, please refer to the
-	    <a href="http://www.FreeBSD.org/cgi/man.cgi?query=make&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+4.6-stable&amp;format=html">make(1)</a> manpage).
+	    <a href="&cgibase;/man.cgi?query=make&amp;sektion=0&amp;format=html">make(1)</a> manpage).
 	    If <tt>gnomepanel</tt> is found, then it is added the list of
 	    <tt>USE_GNOME</tt> dependencies, and the port-specific
 	    <tt>--with-gnome</tt> <tt>CONFIGURE_ARG</tt> is passed.

Modified: head/en_US.ISO8859-1/htdocs/ipv6/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/ipv6/index.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/ipv6/index.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -75,9 +75,9 @@
       </li>
       <li><b>June 7, 2011</b>: New set of IPv6-only snapshots uploaded.  Now
         with RFC 6106 DNS search list and nameserver support in
-	<a href='http://www.FreeBSD.org/cgi/man.cgi?query=rtsol&amp;sektion=8'>rtsol(8)</a>
+	<a href='&cgibase;/man.cgi?query=rtsol&amp;sektion=8'>rtsol(8)</a>
         and
-	<a href='http://www.FreeBSD.org/cgi/man.cgi?query=rtsold&amp;sektion=8'>rtsold(8)</a>,
+	<a href='&cgibase;/man.cgi?query=rtsold&amp;sektion=8'>rtsold(8)</a>,
 	also when installing.  Read more about the
         snapshots <a href="ipv6only.html">here</a> and find download links
         and netinstall documentation <a href="&ipv6onlysnap;">on the wiki</a>.

Modified: head/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -17,7 +17,7 @@
 
 		<p>Search the ia64 mailing list archives:</p>
 
-		<form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
+		<form action="&cgibase;/search.cgi" method="get">
 		  <input name="words" size="50" type="text"/>
 		  <input name="max" type="hidden" value="25"/>
 		  <input name="source" type="hidden" value="freebsd-ia64"/>

Modified: head/en_US.ISO8859-1/htdocs/projects/acpi/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/projects/acpi/index.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/projects/acpi/index.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -43,7 +43,7 @@
     <p>Information on using and debugging ACPI can be found in the
       <a href="/doc/en_US.ISO8859-1/books/handbook/acpi-debug.html">
       handbook entry</a> and
-      <a href="/cgi/man.cgi?query=acpi&amp;sektion=4&amp;format=html">man page</a>.</p>
+      <a href="&cgibase;/man.cgi?query=acpi&amp;sektion=4&amp;format=html">man page</a>.</p>
 
     <p>If you are looking for the list of completed projects not located
       on this page, it can be found
@@ -193,7 +193,7 @@
 	    cards but fails for others.  We could implement this in vm86
 	    calls from a proper video driver resume method.  Investigate
 	    integrate the techniques used by the <a
-	    href="http://www.freebsd.org/cgi/url.cgi?ports/sysutils/radeontool/pkg-descr">Radeontool
+	    href="&cgibase;/url.cgi?ports/sysutils/radeontool/pkg-descr">Radeontool
 	    port</a> in video resume.</td>
 	  <td> &nbsp; </td>
 	  <td> &nbsp; </td>

Modified: head/en_US.ISO8859-1/htdocs/search/search-mid.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/search/search-mid.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/search/search-mid.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -13,14 +13,14 @@
 
     <body>
 
-    <form action="http://www.FreeBSD.org/cgi/mid.cgi" method="get">
+    <form action="&cgibase;/mid.cgi" method="get">
       <b>Message-ID:</b><br/>
       <input name="id" type="text" size="50"/>
       <input name="db" value="mid" type="hidden"/>
       <input type="submit" value="Search"/>
     </form>
 
-    <form action="http://www.FreeBSD.org/cgi/mid.cgi" method="get">
+    <form action="&cgibase;/mid.cgi" method="get">
       <b>Answers to a Message-ID:</b><br/>
       <input name="db" value="irt" type="hidden"/>
       <input type="text" name="id" size="50"/>

Modified: head/en_US.ISO8859-1/htdocs/search/search.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/search/search.xml	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/en_US.ISO8859-1/htdocs/search/search.xml	Sun Sep 21 21:00:40 2014	(r45654)
@@ -21,8 +21,8 @@
       <li><a href="search-mid.html">Message-ID</a></li>
       <li><a href="https://bugs.FreeBSD.org/search/">
 	Problem Reports (Bugs) database</a></li>
-      <li><a href="http://www.FreeBSD.org/cgi/man.cgi">Manual Pages</a></li>
-      <li><a href="http://www.FreeBSD.org/cgi/ports.cgi">
+      <li><a href="&cgibase;/man.cgi">Manual Pages</a></li>
+      <li><a href="&cgibase;/ports.cgi">
 	Ports Changes</a></li>
     </ul>
 
@@ -41,7 +41,7 @@
 	href="&base;/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a> and <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>)</h2>
 
-    <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
+    <form action="&cgibase;/search.cgi" method="get">
 
       <h3>Search for:</h3>
 
@@ -100,7 +100,7 @@
     <p>The mailing lists (as well as many others) have also been archived by <a
 	href="http://markmail.org/browse/?q=list:org.freebsd">MarkMail</a>.</p>
 
-    <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
+    <form action="&cgibase;/search.cgi" method="get">
 
       <h3>Search for:</h3>
 

Modified: head/share/xml/common.ent
==============================================================================
--- head/share/xml/common.ent	Sun Sep 21 20:58:15 2014	(r45653)
+++ head/share/xml/common.ent	Sun Sep 21 21:00:40 2014	(r45654)
@@ -34,10 +34,10 @@
   use &enbase; instead of &base;.
 -->
 
-<!ENTITY cgibase "http://www.FreeBSD.org/cgi">
-<!ENTITY ftpbase "http://security.FreeBSD.org/advisories/">
+<!ENTITY cgibase "//www.FreeBSD.org/cgi">
+<!ENTITY ftpbase "//security.FreeBSD.org/advisories/">
 <!ENTITY ftpbaseold "ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/">
-<!ENTITY ftpbaseerrata "http://security.FreeBSD.org/advisories/">
+<!ENTITY ftpbaseerrata "//security.FreeBSD.org/advisories/">
 
 <!ENTITY os 'FreeBSD'>