]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Do some web interface cleanup and restore the generic printer icon file.
authorMichael R Sweet <michael.r.sweet@gmail.com>
Mon, 2 May 2022 12:18:06 +0000 (08:18 -0400)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Mon, 2 May 2022 12:18:06 +0000 (08:18 -0400)
Fix a few old references to www.cups.org.

21 files changed:
CHANGES.md
backend/Makefile
backend/pseudo
cgi-bin/Makefile
cgi-bin/makedocset.c [deleted file]
doc/cups.css
doc/help/sharing.html
doc/help/spec-banner.html
doc/help/translation.html
doc/images/generic.png [new file with mode: 0644]
examples/testfile.ps
packaging/cups.spec.in
templates/da/help-printable.tmpl
templates/de/help-header.tmpl
templates/de/help-printable.tmpl
templates/es/help-printable.tmpl
templates/fr/help-printable.tmpl
templates/help-printable.tmpl
templates/ja/help-printable.tmpl
templates/pt_BR/help-printable.tmpl
templates/ru/help-printable.tmpl

index 3f158feffd2f3f69b585ea74f13bf81e57242dd4..d4af6211c073050677e9ebd5ae6a485c0c7fabf1 100644 (file)
@@ -15,6 +15,10 @@ Changes in CUPS v2.4.2 (TBA)
 - Re-added LibreSSL/OpenSSL support (Issue #362)
 - Updated the Solaris smf service file (Issue #368)
 - `cupsGetResponse` did not always set the last error.
+- Fixed a number of old references to the Apple CUPS web page.
+- Restored the default/generic printer icon file for the web interface.
+- Removed old stylesheet classes that are no longer used by the web
+  interface.
 
 
 Changes in CUPS v2.4.1 (27th January 2020)
index 33ba7e72bd5b911dc7ab0e272f2f8bad670dfacb..e5dd7619e2f86d2364aeadd09cfd0387eefc79f9 100644 (file)
@@ -20,7 +20,7 @@ include ../Makedefs
 # UBACKENDS are installed mode 0755 so cupsd will run them as an unprivileged
 # user...
 #
-# See http://www.cups.org/doc/api-filter.html for more info...
+# See <http://openprinting.github.io/cups/doc/api-filter.html> for more info...
 RBACKENDS =    \
                ipp \
                lpd \
index fb7facdcc65728047cadcc5ea02d72f58b20e508..e64c9465a637ae1e2192fa16b046dee884ec86a3 100644 (file)
@@ -2,15 +2,11 @@
 #
 # Psuedo-backend for CUPS testing purposes.
 #
-# Copyright 2011 by Apple Inc.
+# Copyright © 2022 by OpenPrinting.
+# Copyright © 2011 by Apple Inc.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
-#
-# This file is subject to the Apple OS-Developed Software exception.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 if test $# = 0; then
index e76012b9de7863eae5d9ee18ab4da74e51c8c6e5..803dc6266a6378e925973279b010ebfb8324546a 100644 (file)
@@ -1,6 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
+# Copyright © 2022 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products.
 #
@@ -23,7 +24,6 @@ OBJS  =       \
                classes.o \
                help.o \
                jobs.o \
-               makedocset.o \
                printers.o \
                testcgi.o \
                testhi.o \
@@ -73,7 +73,7 @@ unittests:    $(UNITTARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) 
 
 
 #
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
deleted file mode 100644 (file)
index 079b856..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Xcode documentation set generator.
- *
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
- *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
- *
- * Usage:
- *
- *   makedocset directory *.tokens
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-#include <errno.h>
-
-
-/*
- * Local structures...
- */
-
-typedef struct _cups_html_s            /**** Help file ****/
-{
-  char         *path;                  /* Path to help file */
-  char         *title;                 /* Title of help file */
-} _cups_html_t;
-
-typedef struct _cups_section_s         /**** Help section ****/
-{
-  char         *name;                  /* Section name */
-  cups_array_t *files;                 /* Files in this section */
-} _cups_section_t;
-
-
-/*
- * Local functions...
- */
-
-static int     compare_html(_cups_html_t *a, _cups_html_t *b);
-static int     compare_sections(_cups_section_t *a, _cups_section_t *b);
-static int     compare_sections_files(_cups_section_t *a, _cups_section_t *b);
-static void    write_index(const char *path, help_index_t *hi);
-static void    write_info(const char *path, const char *revision);
-static void    write_nodes(const char *path, help_index_t *hi);
-
-
-/*
- * 'main()' - Test the help index code.
- */
-
-int                                    /* O - Exit status */
-main(int  argc,                                /* I - Number of command-line args */
-     char *argv[])                     /* I - Command-line arguments */
-{
-  int          i;                      /* Looping var */
-  char         path[1024],             /* Path to documentation */
-               line[1024];             /* Line from file */
-  help_index_t *hi;                    /* Help index */
-  cups_file_t  *tokens,                /* Tokens.xml file */
-               *fp;                    /* Current file */
-
-
-  if (argc < 4)
-  {
-    puts("Usage: makedocset directory revision *.tokens");
-    return (1);
-  }
-
- /*
-  * Index the help documents...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation", argv[1]);
-  if ((hi = helpLoadIndex(NULL, path)) == NULL)
-  {
-    fputs("makedocset: Unable to index help files!\n", stderr);
-    return (1);
-  }
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation/index.html",
-           argv[1]);
-  write_index(path, hi);
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Nodes.xml", argv[1]);
-  write_nodes(path, hi);
-
- /*
-  * Write the Info.plist file...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Info.plist", argv[1]);
-  write_info(path, argv[2]);
-
- /*
-  * Merge the Tokens.xml files...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Tokens.xml", argv[1]);
-  if ((tokens = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create \"%s\": %s\n", path,
-           strerror(errno));
-    return (1);
-  }
-
-  cupsFilePuts(tokens, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-  cupsFilePuts(tokens, "<Tokens version=\"1.0\">\n");
-
-  for (i = 3; i < argc; i ++)
-  {
-    if ((fp = cupsFileOpen(argv[i], "r")) == NULL)
-    {
-      fprintf(stderr, "makedocset: Unable to open \"%s\": %s\n", argv[i],
-             strerror(errno));
-      return (1);
-    }
-
-    if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<?xml ", 6) ||
-        !cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<Tokens ", 8))
-    {
-      fprintf(stderr, "makedocset: Bad Tokens.xml file \"%s\"!\n", argv[i]);
-      return (1);
-    }
-
-    while (cupsFileGets(fp, line, sizeof(line)))
-    {
-      if (strcmp(line, "</Tokens>"))
-        cupsFilePrintf(tokens, "%s\n", line);
-    }
-
-    cupsFileClose(fp);
-  }
-
-  cupsFilePuts(tokens, "</Tokens>\n");
-
-  cupsFileClose(tokens);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'compare_html()' - Compare the titles of two HTML files.
- */
-
-static int                             /* O - Result of comparison */
-compare_html(_cups_html_t *a,          /* I - First file */
-             _cups_html_t *b)          /* I - Second file */
-{
-  return (_cups_strcasecmp(a->title, b->title));
-}
-
-
-/*
- * 'compare_sections()' - Compare the names of two help sections.
- */
-
-static int                             /* O - Result of comparison */
-compare_sections(_cups_section_t *a,   /* I - First section */
-                 _cups_section_t *b)   /* I - Second section */
-{
-  return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'compare_sections_files()' - Compare the number of files and section names.
- */
-
-static int                             /* O - Result of comparison */
-compare_sections_files(
-    _cups_section_t *a,                        /* I - First section */
-    _cups_section_t *b)                        /* I - Second section */
-{
-  int  ret = cupsArrayCount(b->files) - cupsArrayCount(a->files);
-
-  if (ret)
-    return (ret);
-  else
-    return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'write_index()' - Write an index file for the CUPS help.
- */
-
-static void
-write_index(const char   *path,                /* I - File to write */
-            help_index_t *hi)          /* I - Index of files */
-{
-  cups_file_t          *fp;            /* Output file */
-  help_node_t          *node;          /* Current help node */
-  _cups_section_t      *section,       /* Current section */
-                       key;            /* Section search key */
-  _cups_html_t         *html;          /* Current HTML file */
-  cups_array_t         *sections,      /* Sections in index */
-                       *sections_files,/* Sections sorted by size */
-                       *columns[3];    /* Columns in final HTML file */
-  int                  column,         /* Current column */
-                       lines[3],       /* Number of lines in each column */
-                       min_column,     /* Smallest column */
-                       min_lines;      /* Smallest number of lines */
-
-
- /*
-  * Build an array of sections and their files.
-  */
-
-  sections = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-  {
-    if (node->anchor)
-      continue;
-
-    key.name = node->section ? node->section : "Miscellaneous";
-    if ((section = (_cups_section_t *)cupsArrayFind(sections, &key)) == NULL)
-    {
-      section        = (_cups_section_t *)calloc(1, sizeof(_cups_section_t));
-      section->name  = key.name;
-      section->files = cupsArrayNew((cups_array_func_t)compare_html, NULL);
-
-      cupsArrayAdd(sections, section);
-    }
-
-    html = (_cups_html_t *)calloc(1, sizeof(_cups_html_t));
-    html->path  = node->filename;
-    html->title = node->text;
-
-    cupsArrayAdd(section->files, html);
-  }
-
- /*
-  * Build a sorted list of sections based on the number of files in each section
-  * and the section name...
-  */
-
-  sections_files = cupsArrayNew((cups_array_func_t)compare_sections_files,
-                                NULL);
-  for (section = (_cups_section_t *)cupsArrayFirst(sections);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections))
-    cupsArrayAdd(sections_files, section);
-
- /*
-  * Then build three columns to hold everything, trying to balance the number of
-  * lines in each column...
-  */
-
-  for (column = 0; column < 3; column ++)
-  {
-    columns[column] = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-    lines[column]   = 0;
-  }
-
-  for (section = (_cups_section_t *)cupsArrayFirst(sections_files);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections_files))
-  {
-    for (min_column = 0, min_lines = lines[0], column = 1;
-         column < 3;
-        column ++)
-    {
-      if (lines[column] < min_lines)
-      {
-        min_column = column;
-        min_lines  = lines[column];
-      }
-    }
-
-    cupsArrayAdd(columns[min_column], section);
-    lines[min_column] += cupsArrayCount(section->files) + 2;
-  }
-
- /*
-  * Write the HTML file...
-  */
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 "
-                   "Transitional//EN\" "
-                  "\"http://www.w3.org/TR/html4/loose.dtd\">\n"
-                  "<html>\n"
-                  "<head>\n"
-                  "<title>CUPS Documentation</title>\n"
-                  "<link rel='stylesheet' type='text/css' "
-                  "href='cups-printable.css'>\n"
-                  "</head>\n"
-                  "<body>\n"
-                  "<h1 class='title'>CUPS Documentation</h1>\n"
-                  "<table width='100%' summary=''>\n"
-                  "<tr>\n");
-
-  for (column = 0; column < 3; column ++)
-  {
-    if (column)
-      cupsFilePuts(fp, "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n");
-
-    cupsFilePuts(fp, "<td valign='top' width='33%'>");
-    for (section = (_cups_section_t *)cupsArrayFirst(columns[column]);
-         section;
-        section = (_cups_section_t *)cupsArrayNext(columns[column]))
-    {
-      cupsFilePrintf(fp, "<h2 class='title'>%s</h2>\n", section->name);
-      for (html = (_cups_html_t *)cupsArrayFirst(section->files);
-           html;
-          html = (_cups_html_t *)cupsArrayNext(section->files))
-       cupsFilePrintf(fp, "<p class='compact'><a href='%s'>%s</a></p>\n",
-                      html->path, html->title);
-    }
-    cupsFilePuts(fp, "</td>\n");
-  }
-  cupsFilePuts(fp, "</tr>\n"
-                   "</table>\n"
-                  "</body>\n"
-                  "</html>\n");
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_info()' - Write the Info.plist file.
- */
-
-static void
-write_info(const char *path,           /* I - File to write */
-           const char *revision)       /* I - Subversion revision number */
-{
-  cups_file_t  *fp;                    /* File */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePrintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                    "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
-                    "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-                    "<plist version=\"1.0\">\n"
-                    "<dict>\n"
-                    "\t<key>CFBundleIdentifier</key>\n"
-                    "\t<string>org.cups.docset</string>\n"
-                    "\t<key>CFBundleName</key>\n"
-                    "\t<string>CUPS Documentation</string>\n"
-                    "\t<key>CFBundleVersion</key>\n"
-                    "\t<string>%d.%d.%s</string>\n"
-                    "\t<key>CFBundleShortVersionString</key>\n"
-                    "\t<string>%d.%d.%d</string>\n"
-                    "\t<key>DocSetFeedName</key>\n"
-                    "\t<string>cups.org</string>\n"
-                    "\t<key>DocSetFeedURL</key>\n"
-                    "\t<string>http://www.cups.org/org.cups.docset.atom"
-                    "</string>\n"
-                    "\t<key>DocSetPublisherIdentifier</key>\n"
-                    "\t<string>org.cups</string>\n"
-                    "\t<key>DocSetPublisherName</key>\n"
-                    "\t<string>CUPS</string>\n"
-                    "</dict>\n"
-                    "</plist>\n",
-                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
-                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
-
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_nodes()' - Write the Nodes.xml file.
- */
-
-static void
-write_nodes(const char   *path,                /* I - File to write */
-            help_index_t *hi)          /* I - Index of files */
-{
-  cups_file_t  *fp;                    /* Output file */
-  int          id;                     /* Current node ID */
-  help_node_t  *node;                  /* Current help node */
-  int          subnodes;               /* Currently in Subnodes for file? */
-  int          needclose;              /* Need to close the current node? */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                  "<DocSetNodes version=\"1.0\">\n"
-                  "<TOC>\n"
-                  "<Node id=\"0\">\n"
-                  "<Name>CUPS Documentation</Name>\n"
-                  "<Path>Documentation/index.html</Path>\n"
-                  "</Node>\n");
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes), id = 1, subnodes = 0,
-           needclose = 0;
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes), id ++)
-  {
-    if (node->anchor)
-    {
-      if (!subnodes)
-      {
-        cupsFilePuts(fp, "<Subnodes>\n");
-       subnodes = 1;
-      }
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-                        "<Anchor>%s</Anchor>\n"
-                        "<Name>%s</Name>\n"
-                        "</Node>\n", id, node->filename, node->anchor,
-                    node->text);
-    }
-    else
-    {
-      if (subnodes)
-      {
-        cupsFilePuts(fp, "</Subnodes>\n");
-       subnodes = 0;
-      }
-
-      if (needclose)
-        cupsFilePuts(fp, "</Node>\n");
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-                        "<Name>%s</Name>\n", id, node->filename, node->text);
-      needclose = 1;
-    }
-  }
-
-  if (subnodes)
-    cupsFilePuts(fp, "</Subnodes>\n");
-
-  if (needclose)
-    cupsFilePuts(fp, "</Node>\n");
-
-  cupsFilePuts(fp, "</TOC>\n"
-                  "</DocSetNodes>\n");
-
-  cupsFileClose(fp);
-}
index 379489a174f973baf7479352e0ae33d44928c798..a51d123bfcd00900faac771f565a46c7e80880db 100644 (file)
@@ -213,31 +213,6 @@ td.cups-body {
   vertical-align: top;
 }
 
-td.sel, td.unsel {
-  border-left: thin solid #cccccc;
-  padding: 0 5px;
-  text-align: center;
-  vertical-align: middle;
-  width: 14%;
-}
-
-td.sel {
-  background: url(images/sel.gif);
-}
-
-td.unsel {
-  background: url(images/unsel.gif);
-}
-
-td.sel a, td.sel a:hover, td.unsel a:link:hover, td.unsel a:visited:hover,
-td.unsel a:active, td.unsel a, td.unsel a:visited {
-  color: #666666;
-  display: block;
-  font-weight: normal;
-  padding: 8px;
-  text-decoration: none;
-}
-
 td.trailer {
   background: #f0f0f0;
   border: solid thin #e0e0e0;
index a46f393bf2815939a3bb8e3d64956760f3480be3..ad08f5ca47509ca3fd48ff4386ddf1a0eeda684f 100644 (file)
@@ -80,7 +80,7 @@ The user <var>client.conf</var> file takes precedence over the system one.</p>
 override the default server for a single process, for example:</p>
 
 <pre class='command'>
-CUPS_SERVER=server:port firefox http://www.cups.org
+CUPS_SERVER=server:port firefox https://openprinting.github.io/cups
 </pre>
 
 <p>will run the Firefox web browser pointed to the specified server and
index 855a569efc29093a2d4f21cf6809b17470009cd0..6db2fa0e12a2b85769d5fddf18c34b23879a148c 100644 (file)
@@ -10,6 +10,7 @@
 <!--
   Banner file format specification for CUPS.
 
+  Copyright © 2022 by OpenPrinting.
   Copyright © 2008-2011 by Apple Inc.
 
   Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -42,7 +43,7 @@ Notice All work and no play makes Johnny a dull boy.
 Notice All work and no play makes Johnny a dull boy.
 
 # Images to place below the rest
-Image /usr/share/doc/cups/images/cups-icon.png
+Image /usr/local/share/company-logo.png
 Image /usr/share/doc/cups/images/smiley.jpg
 </pre>
 
index 7202c4c0ee93851aec0430530b3a5abf8a511ca3..cb8e4bb953f2e1483a49ea8eab2ad248ce256303 100644 (file)
@@ -13,7 +13,7 @@
 
 <H2 CLASS="title" ID="INTRO">Getting Started</H2>
 
-<P>Start by downloading the CUPS source code from <A HREF="https://www.cups.org/" TARGET="_blank">www.cups.org</A>. After you extract the files from the source archive (or clone the Git repository), you will want to copy the following files and directories:</P>
+<P>Start by downloading the CUPS source code from <A HREF="https://openprinting.github.io/cups/" TARGET="_blank">openprinting.github.io/cups</A>. After you extract the files from the source archive (or clone the Git repository), you will want to copy the following files and directories:</P>
 
 <UL>
 
diff --git a/doc/images/generic.png b/doc/images/generic.png
new file mode 100644 (file)
index 0000000..e61903b
Binary files /dev/null and b/doc/images/generic.png differ
index 54f09f66415744d74882b9492b9171f9a5c921e6..d6890093e3108e65b9f886c56fc57d8f83836ecb 100644 (file)
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset testprint 2.3 0
+%%BeginResource procset testprint 2.4 0
 %
 % PostScript test page for CUPS.
 %
-% Copyright (c) 2007-2011 Apple Inc.
-% Copyright (c) 1993-2007 Easy Software Products
+% Copyright (c) 2022 by OpenPrinting.
+% Copyright (c) 2007-2011 by Apple Inc.
+% Copyright (c) 1993-2007 by Easy Software Products
 %
 % Licensed under Apache License v2.0.  See the file "LICENSE" for more
 % information.
@@ -577,7 +578,7 @@ gsave
   (of Apple Inc., One Apple Park Way, Cupertino, CA 95014, USA.) show
   pageHeight 2 mul 4 add sub           % Move down...
   moveto                               % Position text
-  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
+  (Need help? Contact your operating system vendor or visit "http://openprinting.github.io/cups/".) show
 
   % Then the CUPS logo....
   gsave
index 3018fb24b469a65cf2963212542a5891b3fd50e4..e9e9d01a6ae24fe2a67f7a51ae3bb68524f9fa31 100644 (file)
@@ -46,8 +46,8 @@ Release: 0
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
-Url: http://www.cups.org
+Source: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
+Url: https://openprinting.github.io/cups
 Packager: Anonymous <anonymous@example.com>
 Vendor: OpenPrinting
 
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 4cc0229d5479422771b4b429504efb7cf5c6e29e..071dc04af6a7dc2c4843cbdbcaeb03abfc780948 100644 (file)
@@ -38,4 +38,4 @@ AUTOSAVE="org.cups.help" RESULTS="20">
 
 <P>Wenn Sie noch unerfahren im Umgang mit CUPS sind, lesen Sie die "<a href="/help/overview.html">CUPS-Übersicht</a>". Erfahrene Benutzer sollten "<a href="/help/whatsnew.html">Was ist neu in CUPS 2.0</a>" lesen.</P>
 
-<P>Die <A HREF="https://www.cups.org/">CUPS-Webseite</A> bietet ebenfalls viele Informationen, einschließlich Diskussionsforen für Benutzer, Antworten auf häufig gestellte Fragen sowie ein Formular für Fehlerberichte und Wünsche.</P>}
+<P>Die <A HREF="https://openprinting.github.io/cups/">CUPS-Webseite</A> bietet ebenfalls viele Informationen, einschließlich Diskussionsforen für Benutzer, Antworten auf häufig gestellte Fragen sowie ein Formular für Fehlerberichte und Wünsche.</P>}
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>
index 2463c1630c53e19504402c56d0d0dcf640f35619..83246b435c388c3ceb0227115c26689e1e26db92 100644 (file)
@@ -4,6 +4,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>{HELPTITLE}</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+       <LINK REL="SHORTCUT ICON" HREF="/apple-touch-icon.png" TYPE="image/png">
 </HEAD>
 <BODY>