← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/hplip/gutsy-security

« back to all changes in this revision

Viewing changes to doc/troubleshooting/scanning.html

  • Committer: Bazaar Package Importer
  • Author(s): Till Kamppeter
  • Date: 2006-09-15 18:00:07 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060915180007-96mez3nck3oy5wij
Tags: 1.6.7-2ubuntu1
* Merge from debian unstable.
* Removed patches 50_ui-supportform-cleanups.dpatch and
  55_ui-supportform-debian.dpatch, there is no support window in the HP
  toolbox any more.
* HPLIP (file io/hpiod/usbext.h) includes linux/compiler.h which is not
  part of Ubuntu Linux and not needed. Removed the include with patch
  80_no-compiler.h.dpatch.
* debian/control: Let the "Conflicts:" of hpijs-ppds be only a "Breaks:"
  to facilitate an update from the previous version when both hpijs and
  hpijs-ppds are installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/troubleshooting/scanning.html
11
11
  <link rel="stylesheet" href="../styles/default.css" type="text/css" /> 
12
12
       <meta name="author" content="" />
13
13
       <meta name="email" content="" />
 
14
  <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
 
15
  <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
14
16
 </head>
15
17
 
16
18
 <body>
58
60
                <menu compact="compact">
59
61
                    <li><a href="../tech_docs/index.html" title="">Technical Documentation</a></li> 
60
62
                    <li><a href="http://sourceforge.net/projects/hplip/" title="Our project page on Sourceforge.net">Sourceforge Project Page</a></li> 
61
 
                    <li><a href="../license.html" title="Software License">Software License</a></li> 
62
 
                    <li><a href="http://www.hp.com/" title="HP is a technology solutions provider to consumers, businesses and institutions globally.">www.hp.com</a></li> 
63
 
                    <li><a href="http://www.linuxprinting.org/" title="Resources to help with printing under free operating systems like GNU/Linux">www.linuxprinting.org</a></li> 
64
 
                    <li><a href="http://www.cups.org/" title="Common UNIX Printing System">www.cups.org</a></li> 
 
63
                    <li><a href="../license.html" title="Software License">Software License</a></li>
 
64
                    <li><a a href="../other_support.html" title="Other Support Information">Other Support Information</a></li>
 
65
                    <li><a a href="../about.html" title="About">About HPLIP</a></li>
65
66
                    <li><a href="../contacts.html" title="Contacts">Contacts</a></li>
66
67
                </menu>
67
68
            </td>
120
121
            <td class="footer"><a href="mailto:hplip@hp.com">Contact Site Maintainer</a></td>
121
122
        </tr>
122
123
        <tr>
123
 
            <td colspan="3" class="footer"><a href="http://sourceforge.net/" alt="Hosted by Sourceforge.net"><img src="../images/sflogo.png"/></a></td>
 
124
            <td colspan="3" class="footer"><a href="http://sourceforge.net/" alt="Hosted by Sourceforge.net"><img src="../images/sflogo.png" border="0"></a></td>
124
125
        </tr>
125
126
    
126
127
    </table>