Christian Perrier wrote: > Your review should be sent as an answer to this mail.
I thought I'd caught up, but I was still one behind. Well, I've adopted everything you had, but also: - The configuration of PPPoE is aborted. It can be attempted again by + The configuration of PPPoE has been aborted. It can be attempted again by (A couple of times.) Template: ppp/username Type: string -_Description: PPP login: +_Description: ISP account username: A "login" is the process of authenticating one's username and password. Talking about a "login username" is fine, but in a context like this, "PPP login" is unhelpfully ambiguous - especially when there's an extra wrinkle: it's not asking for my username (=jbr); it's not even asking for the name of the UID that pppd will run under (=ppp); it wants the "username" of my *account* with the ISP (which for me is "xibalba"). Template: ppp/password Type: password -_Description: PPP password: +_Description: ISP account password: For consistency. Then in the control file: -Uploaders: Eddy Petrișor <[EMAIL PROTECTED]> +Uploaders: Eddy Petri?or <[EMAIL PROTECTED]> Oops, I'd better fix that. LATIN SMALL LETTER S WITH COMMA BELOW. + The Point-to-Point Protocol provides a standard way to transmit No need to repeat the "(PPP)". datagrams over a serial link, as well as a standard way for the machines - at either end of the link (the "peers") to negotiate various optional - characteristics of the link. Using PPP, a serial link can be used to - transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections - between the peers. + at either end of the link to negotiate various optional characteristics + of the link. + . + This package is most commonly used to manage a modem for dial-up or + certain kinds of broadband connections. The old version gives a technical description of what the protocol is for, in terms of abstract "peers". But ppp is installed by default (with Priority: optional, and often safely removable); new users deserve some sort of clue as to what the package is actually *for*! -- JBR Ankh kak! (Ancient Egyptian blessing)
--- ../ppp.old/debian/ppp-udeb.templates 2007-10-02 09:04:33.000000000 +0100 +++ debian/ppp-udeb.templates 2007-10-06 13:47:40.000000000 +0100 @@ -5,43 +5,43 @@ Template: ppp/no_concentrators Type: error -_Description: No concentrator was found +_Description: No PPPoE concentrator All network interfaces have been probed, but a PPPoE concentrator was not detected. . - The configuration of PPPoE is aborted. It can be attempted again by + The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/interface Type: string Default: _ Description: Interface name: - Please enter the name of the network interface connected to your PPPoE + Please enter the name of the network interface connected to the PPPoE modem. Template: ppp/username Type: string -_Description: PPP login: +_Description: ISP account username: Please enter the username for the PPP connection. . - This information should have been provided to you by your Internet Service + This information should have been provided by your Internet Service Provider. Template: ppp/password Type: password -_Description: PPP password: +_Description: ISP account password: Please enter the password for the PPP connection. . - This information should have been provided to you by your Internet Service + This information should have been provided by your Internet Service Provider. Template: ppp/detect_failed Type: error -_Description: No Ethernet interface found +_Description: No Ethernet interface PPPoE networking cannot be configured because no Ethernet interface was detected. . - The configuration of PPPoE is aborted. It can be attempted again by + The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/detect_progress @@ -52,9 +52,9 @@ Type: error _Description: Failed authentication A PPPoE connection was attempted, but the provided login information was - incorrect. Because of this the authentication failed. + probably incorrect. . - Please make sure you type the correct username and password. + Please check the username and password you provided. . The configuration of PPPoE is aborted. It can be attempted again by selecting the relevant menu entry. @@ -62,11 +62,9 @@ Template: ppp/unhandled Type: error _Description: Unhandled error - It seems that the attempt to create a connection resulted in an unhandled - error. Probably there is some exceptional situation which prevents - establishing the connection. + An unidentified error happened while attempting to create a connection. . - The configuration of PPPoE is aborted. It can be attempted again by + The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/please_wait --- ../ppp.old/debian/control 2007-10-02 09:04:33.000000000 +0100 +++ debian/control 2007-10-06 14:04:21.000000000 +0100 @@ -13,13 +13,14 @@ Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.7.2005-07-09-2), makedev (<< 2.3.1-56) Replaces: ppp-pam, ppp-udeb Suggests: iptables -Description: Point-to-Point Protocol (PPP) daemon - The Point-to-Point Protocol (PPP) provides a standard way to transmit +Description: Point-to-Point Protocol (PPP) - daemon + The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines - at either end of the link (the "peers") to negotiate various optional - characteristics of the link. Using PPP, a serial link can be used to - transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections - between the peers. + at either end of the link to negotiate various optional characteristics + of the link. + . + This package is most commonly used to manage a modem for dial-up or + certain kinds of broadband connections. Package: ppp-udeb XC-Package-Type: udeb @@ -28,20 +29,23 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils Provides: configured-network XB-Installer-Menu-Item: 1700 -Description: Point-to-Point Protocol (PPP) daemon - The Point-to-Point Protocol (PPP) provides a standard way to transmit +Description: Point-to-Point Protocol (PPP) - package for Debian Installer + The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines - at either end of the link (the "peers") to negotiate various optional - characteristics of the link. Using PPP, a serial link can be used to - transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections - between the peers. + at either end of the link to negotiate various optional characteristics + of the link. . - ppp-udeb is a minimal ppp package used by the debian-installer. + This package is a minimal ppp package used by the Debian Installer. Package: ppp-dev Section: devel Architecture: all Priority: extra Depends: ${shlibs:Depends} -Description: Selected headers from the ppp package - Contains some files needed to build some packages related to pppd. +Description: Point-to-Point Protocol (PPP) - development files + The Point-to-Point Protocol provides a standard way to transmit + datagrams over a serial link, as well as a standard way for the machines + at either end of the link to negotiate various optional characteristics + of the link. + . + This package provides files needed to build pppd-related software.
Template: debian-installer/ppp-udeb/title Type: text # Main menu item _Description: Configure and start a PPPoE connection Template: ppp/no_concentrators Type: error _Description: No PPPoE concentrator All network interfaces have been probed, but a PPPoE concentrator was not detected. . The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/interface Type: string Default: _ Description: Interface name: Please enter the name of the network interface connected to the PPPoE modem. Template: ppp/username Type: string _Description: ISP account username: Please enter the username for the PPP connection. . This information should have been provided by your Internet Service Provider. Template: ppp/password Type: password _Description: ISP account password: Please enter the password for the PPP connection. . This information should have been provided by your Internet Service Provider. Template: ppp/detect_failed Type: error _Description: No Ethernet interface PPPoE networking cannot be configured because no Ethernet interface was detected. . The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/detect_progress Type: text _Description: Searching for concentrators on ${IFACE}... Template: ppp/wrong_login Type: error _Description: Failed authentication A PPPoE connection was attempted, but the provided login information was probably incorrect. . Please check the username and password you provided. . The configuration of PPPoE is aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/unhandled Type: error _Description: Unhandled error An unidentified error happened while attempting to create a connection. . The configuration of PPPoE has been aborted. It can be attempted again by selecting the relevant menu entry. Template: ppp/please_wait Type: text _Description: Please wait...
Source: ppp Section: admin Priority: optional Maintainer: Marco d'Itri <[EMAIL PROTECTED]> Uploaders: Eddy Petrișor <[EMAIL PROTECTED]> Build-Depends: debhelper (>> 4.1.17), libpcap0.8-dev, libpam0g-dev, zlib1g-dev Standards-Version: 3.7.2.2 Package: ppp Section: admin Architecture: any Depends: ${shlibs:Depends}, libpam-modules, libpam-runtime (>= 0.76-13.1), netbase, procps Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.7.2005-07-09-2), makedev (<< 2.3.1-56) Replaces: ppp-pam, ppp-udeb Suggests: iptables Description: Point-to-Point Protocol (PPP) - daemon The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines at either end of the link to negotiate various optional characteristics of the link. . This package is most commonly used to manage a modem for dial-up or certain kinds of broadband connections. Package: ppp-udeb XC-Package-Type: udeb Section: debian-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils Provides: configured-network XB-Installer-Menu-Item: 1700 Description: Point-to-Point Protocol (PPP) - package for Debian Installer The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines at either end of the link to negotiate various optional characteristics of the link. . This package is a minimal ppp package used by the Debian Installer. Package: ppp-dev Section: devel Architecture: all Priority: extra Depends: ${shlibs:Depends} Description: Point-to-Point Protocol (PPP) - development files The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines at either end of the link to negotiate various optional characteristics of the link. . This package provides files needed to build pppd-related software.