[gimp-help] Change gimp-help-2 references to gimp-help.

From: Jacob Boerema <jboerema src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp-help] Change gimp-help-2 references to gimp-help.
Date: Sun, 6 Jun 2021 18:03:18 +0000 (UTC)
commit c32b833a68d9eb32cb001b505374d6699ba74d0b
Author: Jacob Boerema <jgboerema gmail com>
Date:   Sun Jun 6 14:00:50 2021 -0400

    Change gimp-help-2 references to gimp-help.

 Makefile.GNU                       |  4 ++--
 Makefile.am                        |  4 ++--
 autogen.sh                         |  2 +-
 configure.ac                       |  2 +-
 make.help                          | 12 ++++++------
 stylesheets/authors.xml            |  2 +-
 stylesheets/doap2text.xsl          |  2 +-
 stylesheets/drafthtml.xsl          |  2 +-
 stylesheets/float-images.xsl       |  2 +-
 stylesheets/getsortkey.xsl         |  2 +-
 stylesheets/gimp-help-draft.css    |  4 ++--
 stylesheets/gimp-help-plain.css    |  6 +++---
 stylesheets/gimp-help-screen.css   | 10 +++++-----
 stylesheets/gimp22.css             | 12 ++++++------
 stylesheets/htmlalternate.xsl.in   | 14 +++++++-------
 stylesheets/plainhtml.xsl.in       |  2 +-
 stylesheets/plainprint.xsl         |  2 +-
 tools/get_po_status.pl             |  4 ++--
 tools/show_translation_progress.py |  4 ++--
 tools/validate_references.py       |  6 +++---
 20 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index fb13406ef..aff3af2fe 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -781,8 +781,8 @@ endif
 ####            Make language-specific HTML tarballs                ####
 ########################################################################
 
-tarball_prefix = gimp-help-2-html
-tarball_dir    = gimp-help-2
+tarball_prefix = gimp-help-html
+tarball_dir    = gimp-help
 HTMLMETAFILES  = README AUTHORS COPYING MAINTAINERS
 
 $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml \
diff --git a/Makefile.am b/Makefile.am
index 7681f326b..584d82d61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -834,8 +834,8 @@ endif
 ####            Make language-specific HTML tarballs                ####
 ########################################################################
 
-tarball_prefix = gimp-help-2-html
-tarball_dir    = gimp-help-2
+tarball_prefix = gimp-help-html
+tarball_dir    = gimp-help
 HTMLMETAFILES  = README AUTHORS COPYING MAINTAINERS
 
 $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml \
diff --git a/autogen.sh b/autogen.sh
index 49bd958e4..4c0073531 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@
 # tools and you shouldn't use this script.  Just call ./configure
 # directly.
 
-PROJECT="gimp-help-2"
+PROJECT="gimp-help"
 TEST_TYPE=-f
 FILE=src/gimp.xml
 
diff --git a/configure.ac b/configure.ac
index 6c51c26a2..e673edf73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-#  This the autoconf script for the gimp-help-2 project.
+#  This the autoconf script for the gimp-help project.
 #  The GPL version 2 applies to it, which you may get from
 #  http://www.gnu.org/.
 
diff --git a/make.help b/make.help
index 4d759c54d..4b88fcb92 100644
--- a/make.help
+++ b/make.help
@@ -1,11 +1,11 @@
 # Help text for the GIMP-manual build system.
-# 
+#
 # This text will be printed when you type
 #      make [...] help
 # where %LANGUAGES% (and %ALL_LINGUAS% & %LINGUAS%) are
 # replaced with the value of the respective 'make' variable
 # and lines starting with '#' (comments) are skipped.
-# 
+#
 # Feel free to enhance this text... :-)
 #
 
@@ -53,9 +53,9 @@ Checks:
   check-images     Same as "check-images-en"
 
 Packaging:
-  gimp-help-2-html-LANG.tar.gz
-  gimp-help-2-html-LANG.tar.bz2
-  gimp-help-2-html-LANG.zip
+  gimp-help-html-LANG.tar.gz
+  gimp-help-html-LANG.tar.bz2
+  gimp-help-html-LANG.zip
                    Make HTML package for the specified language LANG.
 
 Special (helper) targets for build-system development:
@@ -71,7 +71,7 @@ Make variables (can be overridden at command-line):
                      1 = moderate (default), 2 = all, 0 = nearly silent
 
 More (optional) make variables (empty by default):
-  GIMP_PO_ROOT     Path to the local GIMP (not: gimp-help-2) git repository
+  GIMP_PO_ROOT     Path to the local GIMP (not: gimp-help) git repository
                    containing po files (po*/LANG.po) which may be used as
                    additional libraries of translations
   XSLTEXTRAFLAGS    Additional flags passed to the xsltproc tool
diff --git a/stylesheets/authors.xml b/stylesheets/authors.xml
index 86b2cdbe5..de70b574f 100644
--- a/stylesheets/authors.xml
+++ b/stylesheets/authors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE gimp-authors SYSTEM "authors.dtd">
 
-<!-- This file is supposed to list all gimp-help-2 documenters and contributors.-->
+<!-- This file is supposed to list all gimp-help documenters and contributors.-->
 <!-- It's in XML format so that it can easily be used for the About dialog. -->
 <!-- It has been copied from gimp and customized. -->
 
diff --git a/stylesheets/doap2text.xsl b/stylesheets/doap2text.xsl
index 738715ae0..276e81e9a 100644
--- a/stylesheets/doap2text.xsl
+++ b/stylesheets/doap2text.xsl
@@ -3,7 +3,7 @@
     Simple XSL transformation to create MAINTAINERS text version from
     gimp-help.doap.
 
-    This file is part of the gimp-help-2 project and is
+    This file is part of the gimp-help project and is
     (C) 2010 The GIMP Documentation Team (License: GPL).
 -->
 <xsl:stylesheet version="1.0"
diff --git a/stylesheets/drafthtml.xsl b/stylesheets/drafthtml.xsl
index a9058db1f..f02e4bb80 100644
--- a/stylesheets/drafthtml.xsl
+++ b/stylesheets/drafthtml.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This file is part of the gimp-help-2 project and is 
+<!-- This file is part of the gimp-help project and is
      (C) 2008 The GIMP Documentation Team.
      You may use this file in accordance to the GNU General Public License
      Version 2 which is available from http://www.gnu.org.
diff --git a/stylesheets/float-images.xsl b/stylesheets/float-images.xsl
index 85eedf629..d3ec157f8 100644
--- a/stylesheets/float-images.xsl
+++ b/stylesheets/float-images.xsl
@@ -3,7 +3,7 @@
     Customized docbook-xsl template to generate an additional class
     value for (inline)mediaobjects with condition attribute "float"
 
-    This file is part of the gimp-help-2 project.
+    This file is part of the gimp-help project.
     You may use this file in accordance to the GNU General Public License
     Version 2 which is available from http://www.gnu.org.
 -->
diff --git a/stylesheets/getsortkey.xsl b/stylesheets/getsortkey.xsl
index 2f83bb30b..05dafc103 100644
--- a/stylesheets/getsortkey.xsl
+++ b/stylesheets/getsortkey.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    This file is part of the gimp-help-2 project and is
+    This file is part of the gimp-help project and is
     (C) The GIMP Documentation Team.
     You may use this file in accordance to the GNU General Public License
     Version 2 which is available from http://www.gnu.org.
diff --git a/stylesheets/gimp-help-draft.css b/stylesheets/gimp-help-draft.css
index cec7d46b2..a210640e3 100644
--- a/stylesheets/gimp-help-draft.css
+++ b/stylesheets/gimp-help-draft.css
@@ -1,9 +1,9 @@
 /*
-   This file is part of gimp-help-2. It is copyrighted under the GNU
+   This file is part of gimp-help. It is copyrighted under the GNU
    General Public License Version 2 which you can get from
    http://www.gnu.org
 */
-  
+
 body
 {
     color: white;
diff --git a/stylesheets/gimp-help-plain.css b/stylesheets/gimp-help-plain.css
index ecb0c41f6..77729f753 100644
--- a/stylesheets/gimp-help-plain.css
+++ b/stylesheets/gimp-help-plain.css
@@ -1,7 +1,7 @@
-/* This file is part of gimp-help-2. It is copyrighted under the GNU
+/* This file is part of gimp-help. It is copyrighted under the GNU
    General Public License Version 2 which you can get from
    http://www.gnu.org */
-  
+
 body
 {
   font-family: sans-serif;
@@ -93,7 +93,7 @@ div.sect2 { margin-top: 10px; }
 
 .note {
     border: 1px solid darkgreen;
-    background-color: #b0e1a9;  
+    background-color: #b0e1a9;
 }
 
 .guilabel, .guimenu, .guisubmenu, .guimenuitem .guibutton {
diff --git a/stylesheets/gimp-help-screen.css b/stylesheets/gimp-help-screen.css
index 1ed604859..80facf3a1 100644
--- a/stylesheets/gimp-help-screen.css
+++ b/stylesheets/gimp-help-screen.css
@@ -1,7 +1,7 @@
-/* This file is part of gimp-help-2. It is copyrighted under the GNU
+/* This file is part of gimp-help. It is copyrighted under the GNU
    General Public License Version 2 which you can get from
-   http://www.gnu.org 
-   
+   http://www.gnu.org
+
    Browser wrangling and typographic design by
      Oyvind Kolas / pippin gimp org
 
@@ -25,7 +25,7 @@
 */
 
 /* Questrial
-Used as Heading font 
+Used as Heading font
  */
 /* questrial-regular - latin */
 @font-face {
@@ -865,7 +865,7 @@ h2.subtitle {
   background-image: none;
 }
 /*************************************** /
-/  gimp-help-2 specific alterations      /
+/  gimp-help specific alterations      /
 / ***************************************/
 /* titlepage */
 div.book .titlepage {
diff --git a/stylesheets/gimp22.css b/stylesheets/gimp22.css
index c346f8b8c..cdeaec2ca 100644
--- a/stylesheets/gimp22.css
+++ b/stylesheets/gimp22.css
@@ -1,7 +1,7 @@
-/* This file is part of gimp-help-2. It is copyrighted under the GNU
+/* This file is part of gimp-help. It is copyrighted under the GNU
    General Public License Version 2 which you can get from
-   http://www.gnu.org 
-   
+   http://www.gnu.org
+
    This  CSS file is (nearly) equivalent to
            gimp-help-screen.css, SVN revision 2043,
    (just before we switched to the new color scheme  at 2007-08-26).
@@ -467,7 +467,7 @@
                border-top: 1px solid black;
        }
        .answer {
-               
+
        }
        b.keycap,.keycap {
                border: 1px solid;
@@ -610,7 +610,7 @@
        }
        /*********** /
        /  graphics  /
-       / ***********/ 
+       / ***********/
        div.preface .titlepage .title,div.colophon .title,div.chapter .titlepage .title
        {
                background-image: url("images/title-bg.png");
@@ -629,7 +629,7 @@
                background-image: none;
        }
        /*************************************** /
-       /  gimp-help-2 specific alterations      /
+       /  gimp-help specific alterations      /
        / ***************************************/
        /* titlepage */
        div.book .titlepage {
diff --git a/stylesheets/htmlalternate.xsl.in b/stylesheets/htmlalternate.xsl.in
index 2fb17e501..7e30cc303 100644
--- a/stylesheets/htmlalternate.xsl.in
+++ b/stylesheets/htmlalternate.xsl.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This file is part of the gimp-help-2 project and is 
+<!-- This file is part of the gimp-help project and is
      (C) 2002, 2003, 2004, 2005, 2006, 2007 Daniel Egger, Róman Joost
      You may use this file in accordance to the GNU General Public License
      Version 2 which is available from http://www.gnu.org. -->
@@ -11,7 +11,7 @@
 
   <!--
       template: output.html.stylesheets
-  
+
       This is a modified copy of the docbook-xsl-1.72 template;
       it will replace the original template.
       Its string value is a list of HTML <link> tags with attribute
@@ -22,7 +22,7 @@
   -->
   <xsl:template name="output.html.stylesheets">
     <xsl:param name="stylesheets" select="''"/>
-  
+
     <xsl:choose>
       <xsl:when test="contains($stylesheets, ' ')">
         <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
@@ -44,7 +44,7 @@
             </xsl:attribute>
           </xsl:if>
         </link>
-  
+
         <!-- here's our modification, calling the new template below -->
         <xsl:if test="$html.stylesheet.alternate != ''">
           <xsl:call-template name="output.html.stylesheet.alternates">
@@ -55,10 +55,10 @@
       </xsl:when>
     </xsl:choose>
   </xsl:template>
-  
+
   <!--
       template: output.html.stylesheets.alternates
-  
+
       This is also a modified copy of the docbook-xsl-1.72 template.
       It produces the HTML <link> tags for alternate styleshhets,
       using the file's basename without '.css' extension as the
@@ -67,7 +67,7 @@
   <xsl:template name="output.html.stylesheet.alternates">
     <!-- parameter: a space-separated list of filenames -->
     <xsl:param name="alternates" select="''"/>
-  
+
     <xsl:choose>
       <xsl:when test="contains($alternates, ' ')">
         <xsl:variable name="href" select="substring-before($alternates, ' ')"/>
diff --git a/stylesheets/plainhtml.xsl.in b/stylesheets/plainhtml.xsl.in
index 7ad691eb9..ede51d7e5 100644
--- a/stylesheets/plainhtml.xsl.in
+++ b/stylesheets/plainhtml.xsl.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This file is part of the gimp-help-2 project and is
+<!-- This file is part of the gimp-help project and is
      (C) 2002-2012 Daniel Egger, Róman Joost
      You may use this file in accordance to the GNU General Public License
      Version 2 which is available from http://www.gnu.org.
diff --git a/stylesheets/plainprint.xsl b/stylesheets/plainprint.xsl
index c0d7850ae..1cc224505 100644
--- a/stylesheets/plainprint.xsl
+++ b/stylesheets/plainprint.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  This file is part of the gimp-help-2 project and is
+  This file is part of the gimp-help project and is
   (C) 2002, 2003, 2004, 2005, 2006 Daniel Egger, Róman Joost
   You may use this file in accordance to the GNU General Public License
   Version 2 which is available from http://www.gnu.org.
diff --git a/tools/get_po_status.pl b/tools/get_po_status.pl
index be6326622..a14ac94f6 100644
--- a/tools/get_po_status.pl
+++ b/tools/get_po_status.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #
-# gimp-help-2 -- get translation status
-# Copyright (C) 2008-2012 The GIMP Documentation Team.
+# gimp-help -- get translation status
+# Copyright (C) 2008-2021 The GIMP Documentation Team.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/show_translation_progress.py b/tools/show_translation_progress.py
index 3e6163df7..661e9f1e9 100644
--- a/tools/show_translation_progress.py
+++ b/tools/show_translation_progress.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# This file is part of the gimp-help-2 project and is
+# This file is part of the gimp-help project and is
 # Copyright 2004, 2005, 2006, 2007 Roman Joost
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -342,7 +342,7 @@ class Statistics(object):
 
 
 def get_linguas(gimpbuildpath):
-    """ returns the linguas set in configure.in in gimp-help-2 dir """
+    """ returns the linguas set in configure.in in gimp-help dir """
     gimphtmlpath = os.path.join(gimpbuildpath, "html")
     if not os.path.exists(gimphtmlpath):
         print(f"WARNING: html directory {gimphtmlpath} not found!")
diff --git a/tools/validate_references.py b/tools/validate_references.py
index 8d7ac7359..b0e044694 100644
--- a/tools/validate_references.py
+++ b/tools/validate_references.py
@@ -7,7 +7,7 @@
   finds orphaned images files.
 """
 
-# gimp-help-2 -- validate_references.py
+# gimp-help -- validate_references.py
 #
 # Copyright (C) 2006, 2007 Róman Joost
 #           (C) 2008, 2009 Róman Joost, Ulf-D. Ehlert
@@ -360,7 +360,7 @@ def main():
     # Check for the correct directory.
     if not (os.path.isdir("images/") and os.path.isdir("src/")):
         usage(66, "This script must be called from the " +
-                   "gimp-help-2 root directory.")
+                  "gimp-help root directory.")
 
     # We need an existing xml source file to parse.
     if not os.path.isfile(xml_root_file):
@@ -421,7 +421,7 @@ Usage: validate_references.py [options] [language ...]
     options:
         -h | --help          this help
         -v | --verbose       verbose; may be provided twice (-vv)
-        -r | --root <dir>    specify the gimp-help-2 root directory
+        -r | --root <dir>    specify the gimp-help root directory
         -x | --xmldir <dir>  specify the XML files directory
         -o | --orphaned      check for orphaned image files
         -b | --broken        check for broken links (default action)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]