diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2020-01-20 14:36:39 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2020-01-20 14:36:39 +0900 |
commit | 94a45abf22ab122b1100eb88b544c5e94db23747 (patch) | |
tree | b5bf3b4239328cbd481512284bed58ae93a7aca9 /doc | |
parent | 801845bca0384d7e9105b157b1773d99220fe399 (diff) | |
download | cups-94a45abf22ab122b1100eb88b544c5e94db23747.tar.gz cups-94a45abf22ab122b1100eb88b544c5e94db23747.tar.bz2 cups-94a45abf22ab122b1100eb88b544c5e94db23747.zip |
Imported Upstream version 2.2.12upstream/2.2.12
Diffstat (limited to 'doc')
-rw-r--r-- | doc/cups.css | 2 | ||||
-rw-r--r-- | doc/de/index.html.in | 2 | ||||
-rw-r--r-- | doc/es/index.html.in | 2 | ||||
-rw-r--r-- | doc/help/man-cupsd.conf.html | 6 | ||||
-rw-r--r-- | doc/help/man-ipptoolfile.html | 4 | ||||
-rw-r--r-- | doc/index.html.in | 2 | ||||
-rw-r--r-- | doc/ja/index.html.in | 2 | ||||
-rw-r--r-- | doc/pt_BR/index.html.in | 2 | ||||
-rw-r--r-- | doc/ru/index.html.in | 2 |
9 files changed, 13 insertions, 11 deletions
diff --git a/doc/cups.css b/doc/cups.css index da6ac15..79774b1 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -76,6 +76,7 @@ float: left; margin-left: 0.5%; margin-right: 0; + padding-bottom: 40px; width: 33%; } .row .thirds:first-child { @@ -86,6 +87,7 @@ float: left; margin-left: 0.5%; margin-right: 0; + padding-bottom: 40px; width: 49.75%; } .row .halves:first-child { diff --git a/doc/de/index.html.in b/doc/de/index.html.in index cbae07b..cdc29b1 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -50,6 +50,6 @@ </div> </div> </div> - <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2018 Apple Inc. Alle Rechte vorbehalten.</div> + <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div> </body> </html> diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 6c12f4f..6343c38 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -50,6 +50,6 @@ </div> </div> </div> - <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor © 2007-2018 Apple Inc. Todos los derechos reservados.</div> + <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor © 2007-2019 Apple Inc. Todos los derechos reservados.</div> </body> </html> diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 4ba6ecf..8850f35 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -219,7 +219,7 @@ The value "0" disables log rotation. The default is "1048576" (1MB). <dt><a name="MultipleOperationTimeout"></a><b>MultipleOperationTimeout </b><i>seconds</i> <dd style="margin-left: 5.0em">Specifies the maximum amount of time to allow between files in a multiple file print job. -The default is "300" (5 minutes). +The default is "900" (15 minutes). <dt><a name="Policy"></a><b><Policy </b><i>name</i><b>> </b>... <b></Policy></b> <dd style="margin-left: 5.0em">Specifies access control for the named policy. <dt><a name="Port"></a><b>Port </b><i>number</i> @@ -294,7 +294,7 @@ The <i>DenyTLS1.0</i> option disables TLS v1.0 support - this sets the minimum p The default is "No". <dt><a name="Timeout"></a><b>Timeout </b><i>seconds</i> <dd style="margin-left: 5.0em">Specifies the HTTP request timeout. -The default is "300" (5 minutes). +The default is "900" (15 minutes). <dt><a name="WebInterface"></a><b>WebInterface yes</b> <dd style="margin-left: 5.0em"><dt><b>WebInterface no</b> <dd style="margin-left: 5.0em">Specifies whether the web interface is enabled. @@ -601,7 +601,7 @@ Require authentication for accesses from outside the 10. network: <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a> CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>) <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2> -Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. </body> </html> diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html index c426af7..d8cae81 100644 --- a/doc/help/man-ipptoolfile.html +++ b/doc/help/man-ipptoolfile.html @@ -230,7 +230,7 @@ The following predicates are understood following the <b>EXPECT</b> test directi <dd style="margin-left: 5.0em">Makes the <b>EXPECT</b> conditions apply only if the specified variable is not defined. <dt><b>IN-GROUP </b><i>tag</i> <dd style="margin-left: 5.0em">Requires the <b>EXPECT</b> attribute to be in the specified group tag. -<dt><b>OF-TYPE </b><i>tag[,tag,...]</i> +<dt><b>OF-TYPE </b><i>tag[|tag,...]</i> <dd style="margin-left: 5.0em">Requires the <b>EXPECT</b> attribute to use one of the specified value tag(s). <dt><b>REPEAT-LIMIT </b><i>number</i> <dd style="margin-left: 5.0em"><br> @@ -532,7 +532,7 @@ IANA IPP Registry (<a href="http://www.iana.org/assignments/ipp-registrations)"> PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp)">http://www.pwg.org/ipp)</a>, RFC 8011 (<a href="http://tools.ietf.org/html/rfc8011">http://tools.ietf.org/html/rfc8011</a>) <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2> -Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. </body> </html> diff --git a/doc/index.html.in b/doc/index.html.in index 0cb0164..48f18ad 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -50,6 +50,6 @@ </div> </div> </div> - <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2018 Apple Inc. All rights reserved.</div> + <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div> </body> </html> diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 08549f9..eacc157 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -50,6 +50,6 @@ </div> </div> </div> - <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2018 Apple Inc. All rights reserved.</div> + <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div> </body> </html> diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index ace8226..b3ea358 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -51,6 +51,6 @@ </div> </div> </div> - <div class="footer">CUPS e o logo do CUPS são marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2018 Apple Inc. Todos os direitos reservados.</div> + <div class="footer">CUPS e o logo do CUPS são marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.</div> </body> </html> diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index 7bfc5a3..47dc6d8 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -51,6 +51,6 @@ </div> </div> </div> - <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2018) компании Apple Inc. Все права защищены.</div> + <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.</div> </body> </html> |