Bug#821280: refcard: updated french translation
Package: refcard
Tags: l10n, patch
Severity: wishlist
Hi,
Please find attached the updated french translation for refcard,
proofread by the french localisation team.
Note that the build is not perfect in french :
the copyright notice is not displayed (-a4.pdf & -lt.pdf) and the end of
the dpkg table overwrite the network title ("Le réseau") (only -a4.pdf).
I've seen #821119 and I will try with
make USE_DBLATEX=2 refcard-fr-a4.pdf
and report back here if there is any improvement.
Baptiste
# French translation of the Debian reference card
# Copyright (C) 2005, 2008, 2010 Debian French l10n team .
# This file is distributed under the same license as the refcard package.
#
# Nicolas Caniart , 2005.
# Jean-Luc Coulon (f5ibh) , 2008.
# David Prévot , 2010.
# Baptiste Jammet , 2016.
msgid ""
msgstr ""
"Project-Id-Version: refcard 9.0\n"
"POT-Creation-Date: 2016-04-03 19:19+0200\n"
"PO-Revision-Date: 2016-04-09 19:58+0100\n"
"Last-Translator: Baptiste Jammet \n"
"Language-Team: French \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Attribute 'lang' of:
#: entries.dbk:4
msgid "en-GB"
msgstr "fr"
#. type: Content of:
#: entries.dbk:7
msgid "Debian GNU/Linux Reference Card"
msgstr "Carte de Référence Debian GNU/Linux"
#. type: Content of:
#: entries.dbk:10
msgid "The 101 most important things when using Debian GNU/Linux"
msgstr ""
"Les 101 informations les plus importantes pour utiliser Debian GNU/Linux"
#. type: Content of:
#: entries.dbk:13
msgid ""
" 2004 2010 W. Martin Borgert 2016 Holger Wansing 2004 2010 "
"Your Name (\"Language\") "
msgstr ""
" 2004 2010 W. Martin Borgert 2016 Holger Wansing 2005 Nicolas Caniart 2008 Jean-Luc Coulon 2010 "
"David Prévot 2016 Baptiste Jammet "
"(version française) "
#. type: Content of:
#: entries.dbk:28
msgid ""
"This document may be used under the terms of the GNU General Public License "
"version 3 or higher. The license text can be found at http://";
"www.gnu.org/copyleft/gpl.html\">http://www.gnu.org/copyleft/gpl.html "
"and /usr/share/common-licenses/GPL-3."
msgstr ""
"Ce document peut être utilisé selon les termes de la « GNU General Public "
"License » version 3 ou supérieure. Le texte de la licence est disponible sur "
"http://www.gnu.org/copyleft/gpl.html\";>http://www.gnu.org/";
"copyleft/gpl.html et dans le fichier /usr/share/common-"
"licenses/GPL-3."
#. type: Content of:
#: entries.dbk:35 entries.dbk:369
msgid "APT"
msgstr "APT"
#. type: Content of:
#: entries.dbk:36
msgid "Debian"
msgstr "Debian"
#. type: Content of:
#: entries.dbk:37
msgid "dpkg"
msgstr "dpkg"
#. type: Content of:
#: entries.dbk:38
msgid "reference card"
msgstr "fiche de référence"
#. type: Content of:
#: entries.dbk:39
msgid "basic commands"
msgstr "commandes de base"
#. type: Content of:
#: entries.dbk:40
msgid "Version"
msgstr "Version"
#. type: Content of:
#: entries.dbk:41
msgid "Made by"
msgstr "Réalisé par"
#. type: Content of:
#: entries.dbk:45
msgid "Getting Help"
msgstr "Obtenir de l'aide"
#. type: Content of:
#: entries.dbk:48
msgid "man page or man bash"
msgstr "man page ou man bash"
#. type: Content of:
#: entries.dbk:50
msgid "Read online help for every command and many configuration files."
msgstr ""
"Lire l'aide en ligne concernant chaque commande et de nombreux fichiers de "
"configuration."
#. type: Content of:
#: entries.dbk:54
msgid ""
"command --"
"help, -h"
msgstr ""
"commande "
"--help, -h"
#. type: Content of:
#: entries.dbk:57
msgid "Brief help for most commands."
msgstr "Aide concise pour la plupart des commandes."
#. type: Content of:
#: entries.dbk:61
msgid ""
"/usr/share/doc/package-name/"
msgstr ""
"/usr/share/doc/nom-de-paquet/"
""
#. type: Content of:
#: entries.dbk:62
msgid ""
"Find all documentation here, optional file README.Debian contains specifics."
msgstr ""
"On trouve ici toutes les documentations, un fichier optionnel "
"README.Debian contient les informations spécifiques à "
"Debian."
#. type: Content of:
#: entries.dbk:67
msgid "http://www.debian.org/doc/\";>Web documentation"
msgstr ""
"http://www.debian.org/doc/\";>Documentation sur le web"
#. type: Content of:
#: entries.dbk:69
msgid ""
"Reference, manuals, FAQs, HOWTOs, etc. at http://www.debian.org/doc/";
""
msgstr ""
"Référence, manuels, FAQ, HOWTO, etc., sur http://www.debian.org/doc/";
""
#. type: Content of:
#: entries.dbk:73
msgid ""
"http://lists.debian.org/\";>Mailing lists at "
"http://lists.debian.org/"
msgstr ""
"http://lists.debian.org/\";>Listes de diffusion sur "
"http://lists.debian.org/"
#. type: Content of:
#: entries.dbk:76
msgid "The community is always helpful, search for users."
msgstr "La communauté Debian peut vous aider, voir Users."
#. type: Content of:
#: entries.dbk:80
msgid ""
"http://wiki.debian.org/\";>The Wiki at http
manpages.debian.org back online
Dear colleagues, Thanks to help of DSA and after tinkering with the code (changes I will push to SVN soon) we have restored the manpages.debian.org service again. The new service aggresively caches the information to prevent spawning multiple CGI processes and using up resources in Glinka. This is done using both mod_cache in the server side and caching in the CGI script. The reason the service was down since Monday is that traffic to this service has increase substantially. We are receiving these days, for some undetermined reason, over 216.000 request each day for Apache's manpages (a2ensite, a2dissite, a2enmod, a2dismod, and a2ensite). Previously, access to the CGI was not cached so all these queries were continously using up resources. Now these queries do not longer hit the server. Sorry for the inconveniences the downtime of the service might have caused. Should you find any issues with the new code, please let me know, I will do my best to fix it. Best regards Javier Fernández-Sanguino signature.asc Description: PGP signature
r11107 - /man-cgi/conf/htaccess
Author: jfs Date: Sun Apr 17 15:11:33 2016 New Revision: 11107 URL: http://svn.debian.org/wsvn/?sc=1&rev=11107 Log: Add redirect so that http://manpages.debian.org// works. Add redirect for static content Modified: man-cgi/conf/htaccess Modified: man-cgi/conf/htaccess URL: http://svn.debian.org/wsvn/man-cgi/conf/htaccess?rev=11107&op=diff == --- man-cgi/conf/htaccess (original) +++ man-cgi/conf/htaccess Sun Apr 17 15:11:33 2016 @@ -1,6 +1,6 @@ -Options ExecCGI Indexes FollowSymLinks -IndexOptions -FancyIndexing -AddHandler cgi-script .cgi +#Options ExecCGI Indexes FollowSymLinks +#IndexOptions -FancyIndexing +#AddHandler cgi-script .cgi # Redirect errors to the script ErrorDocument 404 /static/not_found.html @@ -24,8 +24,12 @@ RedirectMatch 301 ^/man/([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?sektion=$1\&query=$2\&apropos=0\&manpath=sid\&locale=en RedirectMatch 301 ^/(?:([^/]+)/)?man([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?sektion=$2\&query=$3\&apropos=0\&manpath=sid\&locale=$1 RedirectMatch 301 ^/man/([a-z]*)/(?:([^/]+)/)?([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?manpath=$1\&sektion=$3\&query=$4\&apropos=0\&locale=$2 +RedirectMatch 301 ^/([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?query=$2\&sektion=$1\&apropos=0 RedirectMatch 301 ^/man/(?:([^/]+)/)?(.*$) /cgi-bin/man.cgi?query=$2\&apropos=1\&manpath=sid\&format=html\&locale=$1 RedirectMatch 301 ^/index.html /cgi-bin/man.cgi +RedirectMatch 301 ^/faq.html /cgi-bin/man.cgi?query=help.html +RedirectMatch 301 ^/help.html /cgi-bin/man.cgi?query=help.html +RedirectMatch 301 ^/info.html /cgi-bin/man.cgi?query=info.html # file types
r11108 - /man-cgi/man.cgi
Author: jfs
Date: Sun Apr 17 15:17:06 2016
New Revision: 11108
URL: http://svn.debian.org/wsvn/?sc=1&rev=11108
Log:
- Use CGI.pm instead of the Perl4 code. This makes it easier to run the script
throught the command line and handles all the URL encoding stuff
- Use CGI::Cache to cache the contents of some queries in a temporary location.
Since this module is not package in Debian we need to source it from a
location which is currently /srv/manpages.debian.org/lib
Modified:
man-cgi/man.cgi
Modified: man-cgi/man.cgi
URL: http://svn.debian.org/wsvn/man-cgi/man.cgi?rev=11108&op=diff
==
--- man-cgi/man.cgi (original)
+++ man-cgi/man.cgi Sun Apr 17 15:17:06 2016
@@ -40,9 +40,13 @@
# !!! man.cgi is stale perl4 code !!!
+use lib '/srv/manpages.debian.org/lib';
use File::stat;
use Time::localtime;
use Error qw(:try);
+
+use CGI qw/ :standard -debug /;
+use CGI::Cache;
$www{'title'} = 'Debian Hypertext Man Pages';
$www{'home'} = 'http://manpages.debian.org';
@@ -69,7 +73,6 @@
'', '',
'All', '',
'0', '',
-
'1', '1',
'1c', '1',
'1C', '1',
@@ -124,8 +127,9 @@
'n', 'n - New Commands',
);
-$manLocalDir = '/srv/manpages.debian.org/extractor/manpages-dists';
-$manFilesDir = '/srv/manpages.debian.org/extractor/manpages-files';
+$baseDir = '/srv/manpages.debian.org';
+$manLocalDir = $baseDir.'/extractor/manpages-dists';
+$manFilesDir = $baseDir.'/extractor/manpages-files';
#$manPathDefault = 'Debian Sid';
# DEFAULT manual pages - review for each release
$manPathDefault = 'Debian 8 jessie';
@@ -285,17 +289,52 @@
$webmasterDesc = 'the service administrator';
#$manstat = 'http://www.de.freebsd.org/de/stat/man';
+# Set up CGI cache
+CGI::Cache::setup();
+# Set up a cache in /manpages_cache/man-cgi, with publicly
+# unreadable cache entries, a maximum size of 10 megabytes,
+# and a time-to-live of 24 hours.
+CGI::Cache::setup( { cache_options =>
+ { cache_root => $baseDir.'/manpages_cache',
+ namespace => 'man_cgi',
+ directory_umask => 077,
+ max_size => 10 * 1024 * 1024,
+ default_expires_in => '24 hours',
+ }
+ } );
+# CGI::Vars requires CGI version 2.50 or better
+# TODO: set key based on other man variables
+$cgiquery = new CGI;
+CGI::Cache::set_key( $cgiquery->Vars );
+CGI::Cache::invalidate_cache_entry() if $cgiquery->param( 'force_regenerate' )
eq 'true';
+
&secure_env;
# CGI Interface -- runs at load time
-&do_man(&env('SCRIPT_NAME'), &env('PATH_INFO'), &env('QUERY_STRING'))
-unless defined($main'plexus_configured);
+&do_man();
$enable_include_links = 0;
-# Plexus Native Interface
+# Query the manapge
sub do_man {
-local($BASE, $path, $form) = @_;
-local($_, %form, $query, $proto, $name, $section, $apropos);
+local($_, $query, $name, $section, $apropos, $package, $version);
+
+local $BASE = $cgiquery->script_name();
+local $path = $cgiquery->url();
+local $format = $cgiquery->param('format') || 'html';
+local $name = $cgiquery->param('query');
+$name = clean_input($name);
+local $section = $cgiquery->param('sektion') || '';
+local $apropos = $cgiquery->param('apropos');
+local $alttitle = $cgiquery->param('title');
+local $manpath = $cgiquery->param('manpath');
+local $locale = $cgiquery->param('locale') || 'en';
+# Debian-specific, provide a package and version
+local $package = $cgiquery->param('package');
+local $version = $cgiquery->param('version');
+
+print "DEBUG: Query string is '".$cgiquery->query_string()."'\n" if $debug;
+print "DEBUG: Manpage name is '$name'\n" if $debug;
+print "DEBUG: Manpage section is '$section'\n" if $debug;
# spinner is buggy, shit
local($u) = $www{'home'}.'/cgi-bin/man.cgi';
@@ -309,26 +348,18 @@
return &include_output($path)
if ($enable_include_links && $path =~ m%^/usr/include/% && -f $path);
-return &indexpage if ($form eq "");
-
-&decode_form($form, *form, 0);
-
-$format = $form{'format'};
+return &indexpage if ($cgiquery->query_string() eq "");
+
$format = 'html' if $format !~ /^(ps|pdf|ascii|latin1|dvi|troff)$/;
-local($fform) = &dec($form);
-if ($fform =~ m%^([\w\_\-\:\+\.]+)$%) {
- return &man($1, '');
-} elsif ($fform =~ m%^([\w\_\-\:\+\.]+)\(([0-9a-zA-Z]+)\)$%) {
- return &man($1, $2);
-}
-
-$name = $query = clean_input($form{'query'});
-$section = $form{'sektion'};
-$apropos = $form{'apropos'};
-$alttitle = $form{'title'};
-$manpath = $form{'manpath'};
-$locale = $form{'locale'};
+# TODO - review
+#local($fform) = &dec($form);
+#if ($fform =~ m%^([\w\_\-\:\+\.]+)$%) {
+# return &man($1, '');
+#} elsif ($fform =~ m%^([\w\_\-\:\+\.]+)\
r11109 - /man-cgi/man.cgi
Author: jfs
Date: Sun Apr 17 15:22:12 2016
New Revision: 11109
URL: http://svn.debian.org/wsvn/?sc=1&rev=11109
Log:
- Use CGI.pm's print header to print the HTTP headers
- Add caching values to content return. this will be provided
by CGI.pm in the "old" Expires: HTTP header
- Make the references to the information and help pages work
now by moving them into specific queries
Modified:
man-cgi/man.cgi
Modified: man-cgi/man.cgi
URL: http://svn.debian.org/wsvn/man-cgi/man.cgi?rev=11109&op=diff
==
--- man-cgi/man.cgi (original)
+++ man-cgi/man.cgi Sun Apr 17 15:22:12 2016
@@ -291,7 +291,7 @@
# Set up CGI cache
CGI::Cache::setup();
-# Set up a cache in /manpages_cache/man-cgi, with publicly
+# Set up a cache in manpages_cache/man-cgi, with publicly
# unreadable cache entries, a maximum size of 10 megabytes,
# and a time-to-live of 24 hours.
CGI::Cache::setup( { cache_options =>
@@ -340,10 +340,10 @@
local($u) = $www{'home'}.'/cgi-bin/man.cgi';
local($u)= $BASE;
-return &faq_output($u) if ($path =~ /\/(faq|help)\.html$/);
-return &info_output($u) if ($path =~ /\/info\.html$/);
-#return ©right_output($u) if ($path =~ /copyright.html$/);
-return &get_the_sources if ($path =~ /source$/);
+return &faq_output($u) if ($name =~ /(faq|help)\.html$/);
+return &info_output($u) if ($name =~ /info\.html$/);
+#return ©right_output($u) if ($name =~ /copyright.html$/);
+return &get_the_sources if ($name =~ /source$/);
return &include_output($path)
if ($enable_include_links && $path =~ m%^/usr/include/% && -f $path);
@@ -390,7 +390,7 @@
# - support routines
sub debug {
-&http_header("text/plain");
+print header (-type=>'text/plain');
print @_,"\n--\n\n\n";
}
@@ -399,7 +399,7 @@
$file = $0 if ! -f $file;
open(R, $file) || &mydie("open $file: $!\n");
-print "Content-type: text/plain\n\n";
+&http_header ("text/plain", "+10d");
while() { print }
close R;
exit;
@@ -410,7 +410,7 @@
$file = $0 if ! -f $file;
open(R, $file) || &mydie("open $file: $!\n");
-print "Content-type: text/plain\n\n";
+&http_header ("text/plain", "+3d");
while() { print }
close R;
exit;
@@ -426,9 +426,7 @@
$filename = &encode_url($filename);
$filename .= '.tar.gz';
-print qq{Content-type: application/x-gzip\n} .
-qq{Content-disposition: attachment; filename="$filename"\n} .
-"\n";
+print header (-type=>'application/x-gzip', -expires=>'+10d', -attachment
=> "$filename");
local(@m);
local($m) = $manPath{"$manpath"};
@@ -448,21 +446,23 @@
exit(0);
}
-sub http_header {
-local($content_type) = @_;
-print "Content-type: $content_type\n\n";
+# Print the HTTP header for the pages
+sub http_header ($;$) {
+local($content_type, $expiration) = @_;
+$expiration = "now" if ! defined $expiration;
+print header (-type=> "$content_type", -expires=> "$expiration");
}
sub env { defined($main'ENV{$_[0]}) ? $main'ENV{$_[0]} : undef; }
-sub printenv {
+sub printenv () {
# Print the environment, useful for debugging
while (($key,$value) = each %ENV) {
print "$key=$value\n";
}
}
-sub apropos {
+sub apropos ($){
local($query) = @_;
local($_, $title, $head, *APROPOS);
local($names, $section, $msg, $key);
@@ -480,7 +480,8 @@
$head = &encode_data($query);
}
-&http_header("text/html");
+print header (type=>'text/html',
+ -expires=>'+3h');
print &html_header("Apropos $title");
print "$www{'head'}\n\n";
&formquery;
@@ -593,7 +594,7 @@
if ($format eq "html") {
$header="text/html";
$header = $header."; charset=".lc($charset) if $charset;
- &http_header("$header");
+ &http_header("$header", "+1d");
print &html_header("$title");
print "$www{'head'}\n\n";
&formquery;
@@ -603,17 +604,17 @@
# Content-encoding: x-gzip
if ($format eq "ps") {
- &http_header("application/postscript");
+ &http_header("application/postscript", "+1d");
} elsif ($format eq "pdf") {
- &http_header("application/pdf");
+ &http_header("application/pdf", "+1d");
} elsif ($format eq "dvi") {
- &http_header("application/x-dvi");
+ &http_header("application/x-dvi", "+1d");
} elsif ($format eq "troff") {
- &http_header("application/x-troff-mandoc");
+ &http_header("application/x-troff-mandoc", "+1d");
} else {
$header="text/plain";
$header = $header."; charset=".lc($charset) if $charset;
- &http_header($header);
+ &http_header($header, "+1d");
}
}
@@ -725,7 +726,7 @@
# run a PostScript t
r11110 - /man-cgi/man.cgi
Author: jfs
Date: Sun Apr 17 15:47:21 2016
New Revision: 0
URL: http://svn.debian.org/wsvn/?sc=1&rev=0
Log:
- Make it possible to enable/disable the cache in the script.
- Before the cache is enabled make sure that the module can be loaded and that
the cache directory
exists. If the pre-conditions are matched then load and enable cache
- Define the input to all functions
Modified:
man-cgi/man.cgi
Modified: man-cgi/man.cgi
URL: http://svn.debian.org/wsvn/man-cgi/man.cgi?rev=0&op=diff
==
--- man-cgi/man.cgi (original)
+++ man-cgi/man.cgi Sun Apr 17 15:47:21 2016
@@ -41,20 +41,49 @@
use lib '/srv/manpages.debian.org/lib';
+
+# Basic modules
use File::stat;
use Time::localtime;
use Error qw(:try);
-
use CGI qw/ :standard -debug /;
-use CGI::Cache;
$www{'title'} = 'Debian Hypertext Man Pages';
$www{'home'} = 'http://manpages.debian.org';
$www{'head'} = qq[http://www.debian.org/logos/openlogo-nd-50.png"; Alt="[Debian Logo]">http://www.debian.org/Pics/debian.png"; width="179" height="61" alt="Debian
project">] .
"";
+# Main directories with the manpages and the files
+$baseDir = '/srv/manpages.debian.org';
+$manLocalDir = $baseDir.'/extractor/manpages-dists';
+$manFilesDir = $baseDir.'/extractor/manpages-files';
+
# Set this to 1 (or above) to debug the CGI script
$debug = 0;
+
+# Set this to 0 to not cache content locally
+$cache = 1;
+
+# Cache configuration (if possible)
+$cache_root = $baseDir.'/manpages_cache';
+if (! -e $cache_root ) {
+$cache = 0;
+print "DEBUG: CGI::Cache module requested, but cache will be disabled
as $cache_root is not readable\n" if $debug;
+}
+if ($cache) {
+$module_test = eval {
+ require CGI::Cache;
+ CGI::Cache->import();
+ 1;
+};
+if(! $module_test) {
+# Cannot find CGI::Cache, disable cache
+$cache = 0;
+print "DEBUG: Could not load CGI::Cache module, missing library\n" if
$debug;
+} else {
+print "DEBUG: CGI::Cache module loaded\n" if $debug;
+}
+}
#$command{'man'} = 'man'; # 8Bit clean man
#$command{'man'} = '/home/wosch/bin/cgi-man'; # 8Bit clean man
@@ -127,9 +156,6 @@
'n', 'n - New Commands',
);
-$baseDir = '/srv/manpages.debian.org';
-$manLocalDir = $baseDir.'/extractor/manpages-dists';
-$manFilesDir = $baseDir.'/extractor/manpages-files';
#$manPathDefault = 'Debian Sid';
# DEFAULT manual pages - review for each release
$manPathDefault = 'Debian 8 jessie';
@@ -289,24 +315,26 @@
$webmasterDesc = 'the service administrator';
#$manstat = 'http://www.de.freebsd.org/de/stat/man';
+$cgiquery = new CGI;
# Set up CGI cache
-CGI::Cache::setup();
+if ($cache) {
+CGI::Cache::setup();
# Set up a cache in manpages_cache/man-cgi, with publicly
# unreadable cache entries, a maximum size of 10 megabytes,
# and a time-to-live of 24 hours.
-CGI::Cache::setup( { cache_options =>
- { cache_root => $baseDir.'/manpages_cache',
- namespace => 'man_cgi',
- directory_umask => 077,
- max_size => 10 * 1024 * 1024,
- default_expires_in => '24 hours',
- }
- } );
+CGI::Cache::setup( { cache_options =>
+{ cache_root => $cache_root,
+namespace => 'man_cgi',
+directory_umask => 077,
+max_size => 10 * 1024 * 1024,
+default_expires_in => '24 hours',
+}
+} );
# CGI::Vars requires CGI version 2.50 or better
# TODO: set key based on other man variables
-$cgiquery = new CGI;
-CGI::Cache::set_key( $cgiquery->Vars );
-CGI::Cache::invalidate_cache_entry() if $cgiquery->param( 'force_regenerate' )
eq 'true';
+CGI::Cache::set_key( $cgiquery->Vars );
+CGI::Cache::invalidate_cache_entry() if $cgiquery->param(
'force_regenerate' ) eq 'true';
+}
&secure_env;
# CGI Interface -- runs at load time
@@ -315,7 +343,7 @@
$enable_include_links = 0;
# Query the manapge
-sub do_man {
+sub do_man ($$$) {
local($_, $query, $name, $section, $apropos, $package, $version);
local $BASE = $cgiquery->script_name();
@@ -389,13 +417,13 @@
# - support routines
-sub debug {
+sub debug () {
print header (-type=>'text/plain');
print @_,"\n--\n\n\n";
}
-sub get_the_sources {
-local($file) = '/usr/lib/cgi-bin/man.cgi';
+sub get_the_sources () {
+local($file) = $baseDir.'/cgi-bin/man.cgi';
$file = $0 if ! -f $file;
open(R, $file) || &mydie("open $file: $!\n");
@@ -405,7 +433,7 @@
exit;
}
-sub detailed_information {
+sub detailed_information () {
local($file) = $baseDir.'/www/README.txt';
$file = $0 if ! -f $file;
@@ -453,7 +481,7 @@
print header (-type=> "$content_type", -expi
r11111 - /man-cgi/conf/apache.conf
Author: jfs Date: Sun Apr 17 15:49:05 2016 New Revision: 1 URL: http://svn.debian.org/wsvn/?sc=1&rev=1 Log: - Add HTTP virtual host - Add mod_cache to cache contents returned by the script - Adjust permissions for the static manpages (require includes and other fancy options) Modified: man-cgi/conf/apache.conf Modified: man-cgi/conf/apache.conf URL: http://svn.debian.org/wsvn/man-cgi/conf/apache.conf?rev=1&op=diff == --- man-cgi/conf/apache.conf(original) +++ man-cgi/conf/apache.confSun Apr 17 15:49:05 2016 @@ -1,39 +1,67 @@ - -ServerAdmin j...@debian.org + + ServerName manpages.debian.net -ErrorLog /srv/manpages.debian.org/manpages.debian.org-error.log -CustomLog /srv/manpages.debian.org/manpages.debian.org-access.log combined -# For debugging: -#ErrorLog /srv/manpages.debian.org/logs/error.log -#CustomLog /srv/manpages.debian.org/logs/access.log combined - + ServerAdmin j...@debian.org + ErrorLog /var/log/apache2/manpages.debian.org-error.log + # Enable to anonymse IP addresses + #CustomLog /var/log/apache2/manpages.debian.org-access.log privacy + CustomLog /var/log/apache2/manpages.debian.org-access.log combined - -Use CommonVirtualHostConfiguration -ServerName manpages.debian.net -RedirectPermanent / http://manpages.debian.org/ + RedirectPermanent / https://manpages.debian.org/ - -Use CommonVirtualHostConfiguration -ServerName manpages.debian.org +Use common-debian-service-https-redirect * manpages.debian.org + + ServerName manpages.debian.org - -UserDir disabled - + Use common-debian-service-ssl manpages.debian.org + Use common-ssl-HSTS + + ServerAdmin j...@debian.org + ErrorLog /var/log/apache2/manpages.debian.org-error.log + # Enable to anonymse IP addresses + #CustomLog /var/log/apache2/manpages.debian.org-access.log privacy + CustomLog /var/log/apache2/manpages.debian.org-access.log combined + + + UserDir disabled + + + CacheEnable disk / + # Alternative mechanism using mod_rewrite (this is currently implemented # with .htaccess and using mod_redirect -# -# RewriteEngine on -# RewriteRule ^man/([^/]+)/(.*)$ cgi-bin/man.cgi?query=$2&sektion=$1 [L] -# RewriteRule ^man/([^/]+)$ cgi-bin/man.cgi?query=$1 [L] -# +# +# RewriteEngine on +# RewriteRule ^man/([^/]+)/(.*)$ cgi-bin/man.cgi?query=$2&sektion=$1 [L] +# RewriteRule ^man/([^/]+)$ cgi-bin/man.cgi?query=$1 [L] +# -DocumentRoot /srv/manpages.debian.org/www + DocumentRoot /srv/manpages.debian.org/www ScriptAlias /cgi-bin/ /srv/manpages.debian.org/cgi-bin/ -AddDefaultCharset utf-8 + AddDefaultCharset utf-8 + + + Require all granted + AllowOverride FileInfo + + + Require all granted + AllowOverride Limit + Options +ExecCGI + + + + Require all granted + # The static content requires the option to nclude files but it is not allowed in Debian vhosts + AllowOverride FileInfo Indexes Limit Options=All,Multiviews + + + Require all granted + # The static content requires the option to nclude files but it is not allowed in Debian vhosts + AllowOverride FileInfo Indexes Limit Options=All,Multiviews + # vim:set syn=apache: -
r11112 - /man-cgi/INSTALL
Author: jfs Date: Sun Apr 17 15:56:30 2016 New Revision: 2 URL: http://svn.debian.org/wsvn/?sc=1&rev=2 Log: Update the INSTALL instruccions Modified: man-cgi/INSTALL Modified: man-cgi/INSTALL URL: http://svn.debian.org/wsvn/man-cgi/INSTALL?rev=2&op=diff == --- man-cgi/INSTALL (original) +++ man-cgi/INSTALL Sun Apr 17 15:56:30 2016 @@ -1,6 +1,6 @@ This is a simple INSTALL description of how to setup a -manpages.debian.org server. +manpages.debian.org server with the CGI script in this directory The man.cgi script serves manpages that have been previously extracted from a local Debian mirror, in order to set it up you need to take the following @@ -49,13 +49,17 @@ Notice that there are rewriting rules in place so that users can directly go - to http://manpages.debian.org/man/1/bash or - http://manpages.debian.org/man/bash. In both cases users are redirect to the - latest Debian manpages (i.e. Sid's) + to + http://manpages.debian.org/man/1/bash + http://manpages.debian.org/man/bash + http://manpages.debian.org/1/bash + + In all of these cases users are redirected to the latest Debian manpages + (i.e. Sid's) -- Install the man.cgi script in your server's CGI directory. This will - typically be /usr/lib/cgi-bin/ +- Install the man.cgi script in your server's CGI directory. This can + be the cgi-bin of your ApacheRoot configuration (unless you setup a different location for the manpages.debian.org vhost cgis) @@ -63,6 +67,35 @@ the manpages where extracted. Make sure the man.cgi script is executable + +- Install the man.cgi script dependencies. Currently the script requires: + +* (mandatory) CGI +Available at http://search.cpan.org/~lds/CGI.pm-3.43/CGI.pm + +* (optional) CGI::Cache and its dependencies (such as Tie::Restore) +Available at http://search.cpan.org/~dcoppit/CGI-Cache-1.4207/lib/CGI/Cache.pm + + These dependencies can be installed either in the server's location for + Perl libraries (/usr/local/share/perl/) or in a library directory that the + man.CGI will source + +- Test the CGI by running it from the command line like this: + + +$ perl -T man.cgi +(offline mode: enter name=value pairs on standard input; press ^D or ^Z when done) +query=test +[ press ^D, after this the script should provide the HTTP headers and HTML content] +Date: Sun, 17 Apr 2016 15:53:57 GMT +Content-Type: text/html; charset=ISO-8859-1 + + + + +(...) + + - Install a simple index.html script that redirects to the manpage interface in the server's document root. This is useful for people that go to
r11113 - /man-cgi/TODO
Author: jfs Date: Sun Apr 17 15:58:46 2016 New Revision: 3 URL: http://svn.debian.org/wsvn/?sc=1&rev=3 Log: Remove useless lines Modified: man-cgi/TODO Modified: man-cgi/TODO URL: http://svn.debian.org/wsvn/man-cgi/TODO?rev=3&op=diff == --- man-cgi/TODO(original) +++ man-cgi/TODOSun Apr 17 15:58:46 2016 @@ -22,15 +22,10 @@ - Available translations misses manual pages in non-standard encoding dirs. For example, the wireless-tools provides the following: -/usr/share/man/man7 /usr/share/man/man7/wireless.7.gz -/usr/share/man/cs/man7 /usr/share/man/cs/man7/wireless.7.gz -/usr/share/man/fr.UTF-8/man7 /usr/share/man/fr.UTF-8/man7/wireless.7.gz -/usr/share/man/fr.ISO8859-1/man7 /usr/share/man/fr.ISO8859-1/man7/wireless.7.gz - IMPROVEMENTS:
Bug#821119: [debian-refcard] change build mechanism to improve layout for cs, el and sk
On 2016-04-15 20:10, Holger Wansing wrote: > When building the pdfs with > make USE_DBLATEX=2 refcard-XX-a4.pdf > (this means using dblatex instead of xmlroff) I get a pdf with a correct > copyright notice, coloured URLs and better usage of the available space Note, that when I started the refcard, I tried four different toolchains: dblatex, docbook2latex(?), fop, and xmlroff. I don't remember now, but neither docbook2latex nor fop did work well for this usecase. Depending on the language I had acceptable results with dblatex or xmlroff. Unfortunately, both dblatex and xmlroff are more or less "one person projects". While xmlroff had no further development since many years, dblatex is alive and kicking, integrating patches from others and getting better with every release. Maybe it is time to focus on only one tool, dblatex, and fix remaining issues with it?
Bug#821280: refcard: updated french translation
Control: tags -1 + pending Baptiste Jammet wrote: > Package: refcard > Tags: l10n, patch > Severity: wishlist > > Hi, > > Please find attached the updated french translation for refcard, > proofread by the french localisation team. committed. -- Created with Sylpheed 3.5.0 under D E B I A N L I N U X 8 . 0 " J E S S I E " . Registered Linux User #311290 - https://linuxcounter.net/
Processed: Re: Bug#821280: refcard: updated french translation
Processing control commands: > tags -1 + pending Bug #821280 [refcard] refcard: updated french translation Added tag(s) pending. -- 821280: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821280 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#821280: refcard: updated french translation
Hi, Dixit Holger Wansing, le 17/04/2016 : >I have built the french pdfs, and I see no grave problems. >PDFs attached. > >Could you please have a look? The pdf looks fine. I think I don't have the exact same buildchain locally. There is only the window title that is wrong, I think something with encoding (there is strange characters istead of "é" and non-breakable space), but the old one had the same problem. Thanks. Baptiste pgpYmCuzjK8mj.pgp Description: OpenPGP digital signature
Bug#821119: [debian-refcard] change build mechanism to improve layout for cs, el and sk
Hi, "W. Martin Borgert" wrote: > On 2016-04-15 20:10, Holger Wansing wrote: > > When building the pdfs with > > make USE_DBLATEX=2 refcard-XX-a4.pdf > > (this means using dblatex instead of xmlroff) I get a pdf with a correct > > copyright notice, coloured URLs and better usage of the available space > > Note, that when I started the refcard, I tried four different > toolchains: dblatex, docbook2latex(?), fop, and xmlroff. I don't > remember now, but neither docbook2latex nor fop did work well > for this usecase. Depending on the language I had acceptable > results with dblatex or xmlroff. Unfortunately, both dblatex > and xmlroff are more or less "one person projects". While > xmlroff had no further development since many years, dblatex is > alive and kicking, integrating patches from others and getting > better with every release. > > Maybe it is time to focus on only one tool, dblatex, and fix > remaining issues with it? The intend to change cs, el and sk to use dblatex is a step in exactly that direction then :-) That would leave only ar, he, hi, ja, zh_CN and zh_TW for xmlroff. And for that languages I am unable to build promising results with dblatex, at least with the actual buildchain. And more aggressive changes on the buildchain are probably out of my skills. However the Hebrew translator has already volunteered on working to improve the build for he, so maybe there is a chance for some improvement for he, if not for other languages as well. Holger -- Created with Sylpheed 3.5.0 under D E B I A N L I N U X 8 . 0 " J E S S I E " . Registered Linux User #311290 - https://linuxcounter.net/
Bug#821119: Fw: Change build mechanism for sk [ Re: Debian refcard: call to update translations ]
forward to the bug Date: Sat, 16 Apr 2016 22:59:11 +0200 From: helix84 To: Holger Wansing Cc: Peter Mann , Debian Sk Subject: Re: Debian refcard: call to update translations Hi Holger, I looked at accent signs and they are displayed correctly. I looked at rendering in Acrobat and in the Google Docs viewer and I don't see anything wrong, either. I'll try to do the translation update within a week. Thank you, Ivan On Sat, Apr 16, 2016 at 9:32 PM, Holger Wansing wrote: > Hi, > > Holger Wansing wrote: > > Hi all, > > > > We have recently updated the content of Debian refcard for Stretch. > > > > Since you are noted as last translator, I would like to ask if you could > > take the time to update the translation again. > > For most languages, there is only very few work to do. > > I have another request: > > I would like to change the build method for the Slovak pdf file. > Therefore I need a proofread of the new file, to ensure that everything > is still fine with the pdf, that the fonts are correctly displayed, > the text is clearly readable etc. > > So I have attached the pdf, and would appreciate you to have a look > at it for checking. > Thanks > > > Holger -- Created with Sylpheed 3.5.0 under D E B I A N L I N U X 8 . 0 " J E S S I E " . Registered Linux User #311290 - https://linuxcounter.net/
