autoupdate

4 files changed, 19 insertions, 16 deletions

diff --git a/doc/gendocs_template b/doc/gendocs_template
index ee6a5c566e..ccce0be2aa 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -85,7 +85,7 @@ Please send broken links and other corrections or suggestions to
 <a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.
 </p>
 
-<p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2010 Free Software Foundation, Inc.</p>
 
 <p>Verbatim copying and distribution of this entire article is
 permitted in any medium, provided this notice is preserved.</p>
diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min
index 58b8944add..a5412841e4 100644
--- a/doc/gendocs_template_min
+++ b/doc/gendocs_template_min
@@ -90,7 +90,7 @@ Please send broken links and other corrections (or suggestions) to
 <a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.
 </p>
 
-<p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2010 Free Software Foundation, Inc.</p>
 
 <p>Verbatim copying and distribution of this entire article is
 permitted in any medium, provided this notice is preserved.</p>
diff --git a/doc/gnu-oids.texi b/doc/gnu-oids.texi
index 46cfd62286..da9146cc13 100644
--- a/doc/gnu-oids.texi
+++ b/doc/gnu-oids.texi
@@ -1,6 +1,6 @@
 @c This table of OID's is included in the GNU Coding Standards.
 @c
-@c Copyright 2008, 2009 Free Software Foundation, Inc.
+@c Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 @c
 @c Copying and distribution of this file, with or without modification,
 @c are permitted in any medium without royalty provided the copyright
@@ -27,7 +27,10 @@
 1.3.6.1.4.1.11591.5 GNU Mailutils
 
 @c Added 2009-03-03 on request from Simon Josefsson <simon@josefsson.org>
-1.3.6.1.4.1.11591.5 GNU Shishi
+1.3.6.1.4.1.11591.6 GNU Shishi
+
+@c Added 2010-05-17 on request from Eric Blossom <eb@comsec.com>
+1.3.6.1.4.1.11591.7 GNU Radio
 
 1.3.6.1.4.1.11591.12 digestAlgorithm
   1.3.6.1.4.1.11591.12.2 TIGER/192
@@ -47,4 +50,3 @@
       1.3.6.1.4.1.11591.13.2.44 Serpent-256-CFB
   1.3.6.1.4.1.11591.14 CRC algorithms
     1.3.6.1.4.1.11591.14.1 CRC 32
-
diff --git a/doc/maintain.texi b/doc/maintain.texi
index 0eb366ae85..8274ac3827 100644
--- a/doc/maintain.texi
+++ b/doc/maintain.texi
@@ -5,7 +5,7 @@
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c This date is automagically updated when you save this file:
-@set lastupdate May 13, 2010
+@set lastupdate May 17, 2010
 @c %**end of header
 
 @dircategory GNU organization
@@ -1233,12 +1233,12 @@ version, and checking that the result exactly matches the new version.
 @node Distribution on ftp.gnu.org
 @section Distribution on @code{ftp.gnu.org}
 @cindex GNU ftp site
-@cindex @code{ftp.gnu.org}, the GNU ftp site
+@cindex @code{ftp.gnu.org}, the GNU release site
 
-GNU packages are distributed through directory @file{/gnu} on
-@code{ftp.gnu.org}.  Each package should have a subdirectory
-named after the package, and all the distribution files for the package
-should go in that subdirectory.
+GNU packages are distributed through the directory @file{/gnu} on
+@code{ftp.gnu.org}, via both HTTP and FTP.  Each package should have a
+subdirectory named after the package, and all the distribution files
+for the package should go in that subdirectory.
 
 @c If you have an interest in seeing the monthly download logs from the FTP
 @c site at @code{ftp.gnu.org} for your program, that is something that
@@ -1254,13 +1254,13 @@ versions on @code{ftp.gnu.org}.
 @cindex beta releases
 @cindex pretest releases
 
-@cindex @code{alpha.gnu.org}, ftp site for test releases
+@cindex @code{alpha.gnu.org}, test release site
 When you release a greatly changed new major version of a program, you
 might want to do so as a pretest.  This means that you make a tar file,
 but send it only to a group of volunteers that you have recruited.  (Use
 a suitable GNU mailing list/newsgroup to recruit them.)
 
-We normally use the FTP server @code{alpha.gnu.org} for pretests and
+We normally use the server @code{alpha.gnu.org} for pretests and
 prerelease versions.  @xref{Automated FTP Uploads}, for procedural details
 of putting new versions on @code{alpha.gnu.org}.
 
@@ -1645,7 +1645,7 @@ Your package's web page (normally
 @item
 Your package's download location (normally
 @indicateurl{http://ftp.gnu.org/gnu/@var{package}/}).  It is also
-useful to mention the FTP mirror list at
+useful to mention the mirror list at
 @url{http://www.gnu.org/order/ftp.html}, and that
 @url{http://ftpmirror.gnu.org/@var{package/}} will automatically
 redirect to a nearby mirror.
@@ -2035,15 +2035,16 @@ Note that this uses a space, not a slash.
 @cindex source repository
 @cindex version control system
 @cindex FTP site
+@cindex release site
 @cindex hosting
 
 We recommend using @code{savannah.gnu.org} for the source code
 repository for your package, but that's not required.  @xref{Old
 Versions}, for more information about Savannah.
 
-We strongly urge you to use @code{ftp.gnu.org} as the standard FTP
+We strongly urge you to use @code{ftp.gnu.org} as the standard
 distribution site.  Doing so makes it easier for developers and users
-to find the latest GNU releases.  However, it is ok to use another FTP
+to find the latest GNU releases.  However, it is ok to use another
 server if you wish, provided it allows access from the general public
 without limitation (for instance, without excluding any country).