From owner-svn-doc-projects@FreeBSD.ORG Mon Jan 28 14:42:16 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1FE58223; Mon, 28 Jan 2013 14:42:16 +0000 (UTC) (envelope-from dru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 11AEC9D; Mon, 28 Jan 2013 14:42:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SEgGZj004088; Mon, 28 Jan 2013 14:42:16 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SEgGNQ004087; Mon, 28 Jan 2013 14:42:16 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201301281442.r0SEgGNQ004087@svn.freebsd.org> From: Dru Lavigne Date: Mon, 28 Jan 2013 14:42:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40776 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 14:42:16 -0000 Author: dru Date: Mon Jan 28 14:42:15 2013 New Revision: 40776 URL: http://svnweb.freebsd.org/changeset/doc/40776 Log: White space fix only. Translators can ignore. Approved by: gjb (mentor) Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Mon Jan 28 05:09:12 2013 (r40775) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Mon Jan 28 14:42:15 2013 (r40776) @@ -21,6 +21,7 @@ Synopsis + PPP @@ -29,10 +30,10 @@ FreeBSD has a number of ways to link one computer to - another. To establish a network or Internet connection through a - dial-up modem, or to allow others to do so through you, requires - the use of PPP or SLIP. This chapter describes setting up - these modem-based communication services in detail. + another. To establish a network or Internet connection through + a dial-up modem, or to allow others to do so through you, + requires the use of PPP or SLIP. This chapter describes setting + up these modem-based communication services in detail. After reading this chapter, you will know: @@ -50,7 +51,7 @@ How to set up PPPoA (PPP over ATM). - + How to configure and set up a SLIP client and server (&os; 7.X only). @@ -82,21 +83,23 @@ - You may be wondering what the main difference is between user - PPP and kernel PPP. The answer is simple: user PPP processes the - inbound and outbound data in userland rather than in the kernel. - This is expensive in terms of copying the data between the kernel - and userland, but allows a far more feature-rich PPP implementation. - User PPP uses the tun device to communicate - with the outside world whereas kernel PPP uses the + You may be wondering what the main difference is between + user PPP and kernel PPP. The answer is simple: user PPP + processes the inbound and outbound data in userland rather than + in the kernel. This is expensive in terms of copying the data + between the kernel and userland, but allows a far more + feature-rich PPP implementation. User PPP uses the + tun device to communicate with the + outside world whereas kernel PPP uses the ppp device. Throughout in this chapter, user PPP will simply be - referred to as ppp unless a distinction - needs to be made between it and any other PPP software such as - pppd (&os; 7.X only). Unless otherwise stated, all of - the commands explained in this chapter should be executed as + referred to as ppp unless a + distinction needs to be made between it and any other PPP + software such as pppd + (&os; 7.X only). Unless otherwise stated, all of the + commands explained in this chapter should be executed as root. @@ -104,33 +107,33 @@ - - Tom - Rhodes - Updated and enhanced by - + + Tom + Rhodes + Updated and enhanced by + - - Brian - Somers + + Brian + Somers Originally contributed by - + Nik Clayton With input from - - + + Dirk - Frömberg - - - Peter - Childs - + Frömberg + + + Peter + Childs + @@ -164,14 +167,14 @@ PPP - An account with an Internet Service Provider (ISP) which - you connect to using PPP. + An account with an Internet Service Provider (ISP) + which you connect to using PPP. A modem or - other device connected to your system and properly configured - to allow you to connect to your ISP. + other device connected to your system and properly + configured to allow you to connect to your ISP. @@ -194,9 +197,9 @@ password - Your login name and password. (Either a - regular &unix; style login and password pair, or a PAP or CHAP - login and password pair). + Your login name and password. (Either a + regular &unix; style login and password pair, or a PAP + or CHAP login and password pair). @@ -205,26 +208,27 @@ The IP address of one or more name servers. - Normally, you will be given two IP addresses by your ISP to - use for this. If they have not given you at least one, then - you can use the enable dns command in - ppp.conf and - ppp will set the name servers for - you. This feature depends on your ISPs PPP implementation - supporting DNS negotiation. + Normally, you will be given two IP addresses by your + ISP to use for this. If they have not given you at + least one, then you can use the enable + dns command in ppp.conf + and ppp will set the name + servers for you. This feature depends on your ISPs + PPP implementation supporting DNS negotiation. - The following information may be supplied by your ISP, but - is not completely necessary: + The following information may be supplied by your ISP, + but is not completely necessary: - The IP address of your ISP's gateway. The gateway is - the machine to which you will connect and will be set up as - your default route. If you do not have - this information, we can make one up and your ISP's PPP - server will tell us the correct value when we connect. + The IP address of your ISP's gateway. The gateway + is the machine to which you will connect and will be + set up as your default route. If + you do not have this information, we can make one up + and your ISP's PPP server will tell us the correct value + when we connect. This IP number is referred to as HISADDR by @@ -234,7 +238,7 @@ The netmask you should use. If your ISP has not provided you with one, you can safely use 255.255.255.255. + role="netmask">255.255.255.255. @@ -242,28 +246,30 @@ static IP address - If your ISP provides you with a static IP address and - hostname, you can enter it. Otherwise, we simply let the - peer assign whatever IP address it sees fit. + If your ISP provides you with a static IP address + and hostname, you can enter it. Otherwise, we simply + let the peer assign whatever IP address it sees + fit. - If you do not have any of the required information, contact - your ISP. + If you do not have any of the required information, + contact your ISP. Throughout this section, many of the examples showing the contents of configuration files are numbered by line. These numbers serve to aid in the presentation and - discussion only and are not meant to be placed in the actual - file. Proper indentation with tab and space characters is - also important. + discussion only and are not meant to be placed in the + actual file. Proper indentation with tab and space + characters is also important. - Automatic <application>PPP</application> Configuration + Automatic <application>PPP</application> + Configuration PPP @@ -271,17 +277,19 @@ Both ppp and pppd - (the kernel level implementation of PPP, &os; 7.X only) use the configuration - files located in the /etc/ppp directory. - Examples for user ppp can be found in - /usr/share/examples/ppp/. - - Configuring ppp requires that you edit a - number of files, depending on your requirements. What you put - in them depends to some extent on whether your ISP allocates IP - addresses statically (i.e., you get given one IP address, and - always use that one) or dynamically (i.e., your IP address - changes each time you connect to your ISP). + (the kernel level implementation of PPP, &os; 7.X only) + use the configuration files located in the /etc/ppp directory. + Examples for user ppp can be found in /usr/share/examples/ppp/. + + Configuring ppp requires that you + edit a number of files, depending on your requirements. + What you put in them depends to some extent on whether your + ISP allocates IP addresses statically (i.e., you get given + one IP address, and always use that one) or dynamically + (i.e., your IP address changes each time you connect to + your ISP). PPP and Static IP Addresses @@ -292,14 +300,14 @@ You will need to edit the - /etc/ppp/ppp.conf configuration file. It - should look similar to the example below. + /etc/ppp/ppp.conf configuration file. + It should look similar to the example below. Lines that end in a : start in - the first column (beginning of the line)— all other - lines should be indented as shown using spaces or - tabs. + the first column (beginning of the line)— all + other lines should be indented as shown using spaces + or tabs. 1 default: @@ -327,7 +335,8 @@ Identifies the default entry. Commands in this - entry are executed automatically when ppp is run. + entry are executed automatically when ppp is + run. @@ -335,13 +344,14 @@ Line 2: - Enables logging parameters. When the configuration - is working satisfactorily, this line should be reduced - to saying: + Enables logging parameters. When the + configuration is working satisfactorily, this line + should be reduced to saying: - set log phase tun + set log phase tun - in order to avoid excessive log file sizes. + in order to avoid excessive log file + sizes. @@ -350,10 +360,11 @@ Tells PPP how to identify itself to the peer. - PPP identifies itself to the peer if it has any trouble - negotiating and setting up the link, providing information - that the peers administrator may find useful when - investigating such problems. + PPP identifies itself to the peer if it has any + trouble negotiating and setting up the link, + providing information that the peers administrator + may find useful when investigating such + problems. @@ -366,7 +377,8 @@ /dev/cuau0 and COM2 is - /dev/cuau1. + /dev/cuau1. @@ -374,9 +386,9 @@ Line 5: - Sets the speed you want to connect at. If 115200 - does not work (it should with any reasonably new modem), - try 38400 instead. + Sets the speed you want to connect at. If + 115200 does not work (it should with any reasonably + new modem), try 38400 instead. @@ -390,14 +402,15 @@ The dial string. User PPP uses an expect-send - syntax similar to the &man.chat.8; program. Refer to - the manual page for information on the features of this - language. - - Note that this command continues onto the next line - for readability. Any command in - ppp.conf may do this if the last - character on the line is a \ character. + syntax similar to the &man.chat.8; program. Refer + to the manual page for information on the features + of this language. + + Note that this command continues onto the next + line for readability. Any command in + ppp.conf may do this if the + last character on the line is a \ + character. @@ -406,7 +419,8 @@ Sets the idle timeout for the link. 180 seconds - is the default, so this line is purely cosmetic. + is the default, so this line is purely + cosmetic. @@ -415,8 +429,8 @@ Tells PPP to ask the peer to confirm the local - resolver settings. If you run a local name server, this - line should be commented out or removed. + resolver settings. If you run a local name server, + this line should be commented out or removed. @@ -424,8 +438,8 @@ Line 10: - A blank line for readability. Blank lines are ignored - by PPP. + A blank line for readability. Blank lines are + ignored by PPP. @@ -435,9 +449,10 @@ Identifies an entry for a provider called provider. This could be changed - to the name of your ISP so - that later you can use the - to start the connection. + to the name of your ISP so + that later you can use the to start + the connection. @@ -445,21 +460,22 @@ Line 12: - Sets the phone number for this provider. Multiple - phone numbers may be specified using the colon - (:) or pipe character - (|) as a separator. The difference - between the two separators is described in &man.ppp.8;. - To summarize, if you want to rotate through the numbers, - use a colon. If you want to always attempt to dial the - first number first and only use the other numbers if the - first number fails, use the pipe character. Always - quote the entire set of phone numbers as shown. - - You must enclose the phone number in quotation marks - (") if there is any intention on using - spaces in the phone number. This can cause a simple, yet - subtle error. + Sets the phone number for this provider. + Multiple phone numbers may be specified using the + colon (:) or pipe character + (|) as a separator. The + difference between the two separators is described + in &man.ppp.8;. To summarize, if you want to rotate + through the numbers, use a colon. If you want to + always attempt to dial the first number first and + only use the other numbers if the first number + fails, use the pipe character. Always quote the + entire set of phone numbers as shown. + + You must enclose the phone number in quotation + marks (") if there is any + intention on using spaces in the phone number. + This can cause a simple, yet subtle error. @@ -468,11 +484,11 @@ Identifies the user name and password. When - connecting using a &unix; style login prompt, these - values are referred to by the set - login command using the \U and \P - variables. When connecting using PAP or CHAP, these - values are used at authentication time. + connecting using a &unix; style login prompt, these + values are referred to by the set + login command using the \U and \P + variables. When connecting using PAP or CHAP, these + values are used at authentication time. @@ -482,14 +498,16 @@ PAP CHAP - If you are using PAP or CHAP, there will be no login - at this point, and this line should be commented out or - removed. See PAP and CHAP - authentication for further details. - - The login string is of the same chat-like syntax as - the dial string. In this example, the string works for - a service whose login session looks like this: + If you are using PAP or CHAP, there will be no + login at this point, and this line should be + commented out or removed. See PAP and CHAP + authentication for further details. + + The login string is of the same chat-like + syntax as the dial string. In this example, the + string works for a service whose login session looks + like this: J. Random Provider login: foo @@ -510,11 +528,12 @@ protocol: ppp timeout - Sets the default idle timeout (in seconds) for the - connection. Here, the connection will be closed - automatically after 300 seconds of inactivity. If you - never want to timeout, set this value to zero or use - the command line switch. + Sets the default idle timeout (in seconds) for + the connection. Here, the connection will be closed + automatically after 300 seconds of inactivity. If + you never want to timeout, set this value to zero + or use the command line + switch. @@ -549,29 +568,31 @@ protocol: ppp Adds a default route to your ISP's gateway. The - special word HISADDR is replaced with - the gateway address specified on line 17. It is - important that this line appears after line 17, - otherwise HISADDR will not yet be - initialized. - - If you do not wish to run ppp in , - this line should be moved to the - ppp.linkup file. + special word HISADDR is replaced + with the gateway address specified on line 17. It + is important that this line appears after line 17, + otherwise HISADDR will not yet + be initialized. + + If you do not wish to run ppp in + , this line should be moved + to the ppp.linkup file. It is not necessary to add an entry to - ppp.linkup when you have a static IP - address and are running ppp in mode as your - routing table entries are already correct before you connect. - You may however wish to create an entry to invoke programs after - connection. This is explained later with the sendmail - example. + ppp.linkup when you have a static + IP address and are running ppp in + mode as your routing table entries are already correct + before you connect. You may however wish to create an + entry to invoke programs after connection. This is + explained later with the sendmail example. Example configuration files can be found in the - /usr/share/examples/ppp/ directory. + /usr/share/examples/ppp/ + directory. @@ -607,31 +628,33 @@ protocol: ppp Line 17: - The number after the / character - is the number of bits of the address that ppp will - insist on. You may wish to use IP numbers more - appropriate to your circumstances, but the above example - will always work. - - The last argument (0.0.0.0) tells - PPP to start negotiations using address 0.0.0.0 rather than 10.0.0.1 and is necessary for some - ISPs. Do not use 0.0.0.0 as the first - argument to set ifaddr as it prevents - PPP from setting up an initial route in - mode. + The number after the / + character is the number of bits of the address that + ppp will insist on. You may wish to use IP numbers + more appropriate to your circumstances, but the + above example will always work. + + The last argument (0.0.0.0) + tells PPP to start negotiations using address + 0.0.0.0 rather than + 10.0.0.1 and is + necessary for some ISPs. Do not use + 0.0.0.0 as the first argument + to set ifaddr as it prevents + PPP from setting up an initial route in + mode. - If you are not running in mode, you - will need to create an entry in - /etc/ppp/ppp.linkup. - ppp.linkup is used after a connection has - been established. At this point, ppp will - have assigned the interface addresses and it will now be - possible to add the routing table entries: + If you are not running in mode, + you will need to create an entry in + /etc/ppp/ppp.linkup. + ppp.linkup is used after a connection + has been established. At this point, + ppp will have assigned the interface + addresses and it will now be possible to add the routing + table entries: 1 provider: 2 add default HISADDR @@ -683,82 +706,82 @@ protocol: ppp When you configure ppp to - receive incoming calls on a machine connected to a LAN, you - must decide if you wish to forward packets to the LAN. If you - do, you should allocate the peer an IP number from your LAN's - subnet, and use the command enable proxy in - your /etc/ppp/ppp.conf file. You should - also confirm that the /etc/rc.conf file - contains the following: + receive incoming calls on a machine connected to a LAN, + you must decide if you wish to forward packets to the LAN. + If you do, you should allocate the peer an IP number from + your LAN's subnet, and use the command enable + proxy in your + /etc/ppp/ppp.conf file. You should + also confirm that the /etc/rc.conf + file contains the following: gateway_enable="YES" - - Which getty? + + Which getty? - Configuring FreeBSD for Dial-up - Services provides a good description on enabling - dial-up services using &man.getty.8;. - - An alternative to getty is mgetty (from - comms/mgetty+sendfax - port), - a smarter version of getty designed - with dial-up lines in mind. - - The advantages of using mgetty is - that it actively talks to modems, - meaning if port is turned off in - /etc/ttys then your modem will not answer - the phone. - - Later versions of mgetty (from - 0.99beta onwards) also support the automatic detection of - PPP streams, allowing your clients script-less access to - your server. + Configuring FreeBSD for + Dial-up Services provides a good description + on enabling dial-up services using &man.getty.8;. + + An alternative to getty is mgetty (from + comms/mgetty+sendfax + port), a smarter version of getty + designed with dial-up lines in mind. + + The advantages of using mgetty is + that it actively talks to modems, + meaning if port is turned off in + /etc/ttys then your modem will not + answer the phone. + + Later versions of mgetty (from + 0.99beta onwards) also support the automatic detection of + PPP streams, allowing your clients script-less access to + your server. - Refer to Mgetty and + Refer to Mgetty and AutoPPP for more information on - mgetty. - + mgetty. + - - <application>PPP</application> Permissions + + <application>PPP</application> Permissions - The ppp command must normally be - run as the root user. If however, - you wish to allow ppp to run in - server mode as a normal user by executing - ppp as described below, that user - must be given permission to run ppp - by adding them to the network group - in /etc/group. - - You will also need to give them access to one or more - sections of the configuration file using the - allow command: - - allow users fred mary - - If this command is used in the default - section, it gives the specified users access to - everything. - + The ppp command must normally be + run as the root user. If however, + you wish to allow ppp to run in + server mode as a normal user by executing + ppp as described below, that user + must be given permission to run ppp + by adding them to the network + group in /etc/group. + + You will also need to give them access to one or more + sections of the configuration file using the + allow command: + + allow users fred mary + + If this command is used in the + default section, it gives the specified + users access to everything. + - - PPP Shells for Dynamic-IP Users + + PPP Shells for Dynamic-IP Users - - PPP shells - + + PPP shells + - Create a file called - /etc/ppp/ppp-shell containing the - following: + Create a file called + /etc/ppp/ppp-shell containing the + following: - #!/bin/sh + #!/bin/sh IDENT=`echo $0 | sed -e 's/^.*-\(.*\)$/\1/'` CALLEDAS="$IDENT" TTY=`tty` @@ -772,30 +795,31 @@ echo "Starting PPP for $IDENT" exec /usr/sbin/ppp -direct $IDENT - This script should be executable. Now make a symbolic - link called ppp-dialup to this script - using the following commands: - - &prompt.root; ln -s ppp-shell /etc/ppp/ppp-dialup - - You should use this script as the - shell for all of your dialup users. - This is an example from /etc/passwd - for a dialup PPP user with username - pchilds (remember do not directly edit - the password file, use &man.vipw.8;). + This script should be executable. Now make a + symbolic link called ppp-dialup to + this script using the following commands: + + &prompt.root; ln -s ppp-shell /etc/ppp/ppp-dialup + + You should use this script as the + shell for all of your dialup users. + This is an example from /etc/passwd + for a dialup PPP user with username + pchilds (remember do not directly + edit the password file, use &man.vipw.8;). pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup - Create a /home/ppp directory that + Create a /home/ppp directory that is world readable containing the following 0 byte files: -r--r--r-- 1 root wheel 0 May 27 02:23 .hushlogin -r--r--r-- 1 root wheel 0 May 27 02:22 .rhosts - which prevents /etc/motd from being - displayed. + which prevents /etc/motd from + being displayed. @@ -805,31 +829,32 @@ exec /usr/sbin/ppp -direct $IDENTPPP shells - Create the ppp-shell file as above, - and for each account with statically assigned IPs create a - symbolic link to ppp-shell. + Create the ppp-shell file as + above, and for each account with statically assigned + IPs create a symbolic link to + ppp-shell. For example, if you have three dialup customers, - fred, sam, and - mary, that you route /24 CIDR networks - for, you would type the following: + fred, sam, + and mary, that you route /24 CIDR + networks for, you would type the following: &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-mary - Each of these users dialup accounts should have their - shell set to the symbolic link created above (for example, - mary's shell should be + Each of these users dialup accounts should have + their shell set to the symbolic link created above (for + example, mary's shell should be /etc/ppp/ppp-mary). - Setting Up <filename>ppp.conf</filename> for Dynamic-IP - Users + Setting Up <filename>ppp.conf</filename> for + Dynamic-IP Users - The /etc/ppp/ppp.conf file should - contain something along the lines of: + The /etc/ppp/ppp.conf file + should contain something along the lines of: default: set debug phase lcp chat @@ -847,17 +872,17 @@ ttyu1: The indenting is important. - The default: section is loaded for - each session. For each dialup line enabled in - /etc/ttys create an entry similar to - the one for ttyu0: above. Each line - should get a unique IP address from your pool of IP - addresses for dynamic users. + The default: section is loaded + for each session. For each dialup line enabled in + /etc/ttys create an entry similar + to the one for ttyu0: above. Each + line should get a unique IP address from your pool of + IP addresses for dynamic users. - Setting Up <filename>ppp.conf</filename> for Static-IP - Users + Setting Up <filename>ppp.conf</filename> for + Static-IP Users Along with the contents of the sample /usr/share/examples/ppp/ppp.conf @@ -891,140 +916,146 @@ mary: add 203.14.103.0 netmask 255.255.255.0 HISADDR - - <command>mgetty</command> and AutoPPP + + <command>mgetty</command> and AutoPPP - - mgetty - + + mgetty + - - AutoPPP - + + AutoPPP + - - LCP - + + LCP + - By default the By default the comms/mgetty+sendfax port - comes - with the AUTO_PPP option enabled - allowing mgetty to detect the LCP phase - of PPP connections and automatically spawn off a ppp - shell. However, since the default login/password - sequence does not occur it is necessary to authenticate - users using either PAP or CHAP. + comes with the AUTO_PPP option enabled + allowing mgetty to detect the LCP + phase of PPP connections and automatically spawn off a + ppp shell. However, since the default login/password + sequence does not occur it is necessary to authenticate + users using either PAP or CHAP. - This section assumes the user has successfully - compiled, and installed the This section assumes the user has successfully + compiled, and installed the comms/mgetty+sendfax port on - his system. + his system. - Make sure your - /usr/local/etc/mgetty+sendfax/login.config - file has the following in it: + Make sure your + /usr/local/etc/mgetty+sendfax/login.config + file has the following in it: - /AutoPPP/ - - /etc/ppp/ppp-pap-dialup + /AutoPPP/ - - /etc/ppp/ppp-pap-dialup - This will tell mgetty to run the - ppp-pap-dialup script for detected - PPP connections. + This will tell mgetty to run the + ppp-pap-dialup script for detected + PPP connections. - Create a file called - /etc/ppp/ppp-pap-dialup containing the - following (the file should be executable): + Create a file called + /etc/ppp/ppp-pap-dialup containing + the following (the file should be executable): - #!/bin/sh + #!/bin/sh exec /usr/sbin/ppp -direct pap$IDENT - For each dialup line enabled in - /etc/ttys, create a corresponding entry - in /etc/ppp/ppp.conf. This will - happily co-exist with the definitions we created - above. + For each dialup line enabled in + /etc/ttys, create a corresponding + entry in /etc/ppp/ppp.conf. This + will happily co-exist with the definitions we created + above. - pap: + pap: enable pap set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40 enable proxy - Each user logging in with this method will need to have *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Mon Jan 28 15:00:59 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 47A7F66A; Mon, 28 Jan 2013 15:00:59 +0000 (UTC) (envelope-from dru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 39CE716B; Mon, 28 Jan 2013 15:00:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SF0x5o009800; Mon, 28 Jan 2013 15:00:59 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SF0xEk009799; Mon, 28 Jan 2013 15:00:59 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201301281500.r0SF0xEk009799@svn.freebsd.org> From: Dru Lavigne Date: Mon, 28 Jan 2013 15:00:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40777 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 15:00:59 -0000 Author: dru Date: Mon Jan 28 15:00:58 2013 New Revision: 40777 URL: http://svnweb.freebsd.org/changeset/doc/40777 Log: White space fix only. Translators can ignore. Approved by: bcr (mentor) Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users/chapter.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users/chapter.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users/chapter.xml Mon Jan 28 14:42:15 2013 (r40776) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users/chapter.xml Mon Jan 28 15:00:58 2013 (r40777) @@ -9,7 +9,7 @@ - Neil + Neil Blakey-Milner Contributed by @@ -22,22 +22,21 @@ Synopsis - FreeBSD allows multiple users to use the computer at the same time. - Obviously, only one of those users can be sitting in front of the screen and - keyboard at any one time - - Well, unless you hook up multiple terminals, but we will - save that for . - , but any number of users can log in through the - network to get their work done. To use the system every user must have - an account. + FreeBSD allows multiple users to use the computer at the + same time. Obviously, only one of those users can be sitting in + front of the screen and keyboard at any one time + Well, unless you hook up multiple terminals, but + we will save that for . + , but any number of users can log in through the + network to get their work done. To use the system every user + must have an account. After reading this chapter, you will know: - The differences between the various user accounts on a FreeBSD - system. + The differences between the various user accounts on a + FreeBSD system. @@ -49,18 +48,19 @@ - How to change account details, such as the user's full name, or - preferred shell. + How to change account details, such as the user's full + name, or preferred shell. How to set limits on a per-account basis, to control the - resources such as memory and CPU time that accounts and groups of - accounts are allowed to access. + resources such as memory and CPU time that accounts and + groups of accounts are allowed to access. - How to use groups to make account management easier. + How to use groups to make account management + easier. @@ -81,8 +81,8 @@ processes are run by users, so user and account management are of integral importance on FreeBSD systems. - Every account on a FreeBSD system has certain information associated - with it to identify the account. + Every account on a FreeBSD system has certain information + associated with it to identify the account. @@ -90,12 +90,12 @@ The user name as it would be typed at the - login: prompt. User names must be unique across - the computer; you may not have two users with the same - user name. There are a number of rules for creating valid user - names, documented in &man.passwd.5;; you would typically use user - names that consist of eight or fewer all lower case - characters. + login: prompt. User names must be unique + across the computer; you may not have two users with the + same user name. There are a number of rules for creating + valid user names, documented in &man.passwd.5;; you would + typically use user names that consist of eight or fewer + all lower case characters. @@ -103,10 +103,10 @@ Password - Each account has a password associated with it. The password - may be blank, in which case no password will be required to access - the system. This is normally a very bad idea; every account - should have a password. + Each account has a password associated with it. The + password may be blank, in which case no password will be + required to access the system. This is normally a very + bad idea; every account should have a password. @@ -114,19 +114,21 @@ User ID (UID) - The UID is a number, traditionally from 0 to 65535 + The UID is a number, traditionally from 0 to + 65535 It is possible to use UID/GIDs as large as 4294967295, but such IDs can cause serious problems with software that makes assumptions about the values of IDs. - , used to uniquely identify - the user to the system. Internally, FreeBSD uses the UID to - identify users—any FreeBSD commands that allow you to - specify a user name will convert it to the UID before working with - it. This means that you can have several accounts with different - user names but the same UID. As far as FreeBSD is concerned these - accounts are one user. It is unlikely you will ever need to do - this. + , used to uniquely identify the user to the + system. Internally, FreeBSD uses the UID to + identify users—any FreeBSD commands that allow + you to specify a user name will convert it to the UID + before working with it. This means that you can have + several accounts with different user names but the + same UID. As far as FreeBSD is concerned these + accounts are one user. It is unlikely you will ever + need to do this. @@ -134,11 +136,13 @@ Group ID (GID) - The GID is a number, traditionally from 0 to 65535, used to uniquely identify - the primary group that the user belongs to. Groups are a - mechanism for controlling access to resources based on a user's - GID rather than their UID. This can significantly reduce the size - of some configuration files. A user may also be in more than one + The GID is a number, traditionally from 0 to + 65535, used to + uniquely identify the primary group that the user belongs + to. Groups are a mechanism for controlling access to + resources based on a user's GID rather than their UID. + This can significantly reduce the size of some + configuration files. A user may also be in more than one group. @@ -147,9 +151,9 @@ Login class - Login classes are an extension to the group mechanism that - provide additional flexibility when tailoring the system to - different users. + Login classes are an extension to the group mechanism + that provide additional flexibility when tailoring the + system to different users. @@ -157,10 +161,11 @@ Password change time - By default FreeBSD does not force users to change their - passwords periodically. You can enforce this on a per-user basis, - forcing some or all of your users to change their passwords after - a certain amount of time has elapsed. + By default FreeBSD does not force users to change + their passwords periodically. You can enforce this on a + per-user basis, forcing some or all of your users to + change their passwords after a certain amount of time has + elapsed. @@ -168,13 +173,13 @@ Account expiry time - By default FreeBSD does not expire accounts. If you are - creating accounts that you know have a limited lifespan, for - example, in a school where you have accounts for the students, - then you can specify when the account expires. After the expiry - time has elapsed the account cannot be used to log in to the - system, although the account's directories and files will - remain. + By default FreeBSD does not expire accounts. If you + are creating accounts that you know have a limited + lifespan, for example, in a school where you have accounts + for the students, then you can specify when the account + expires. After the expiry time has elapsed the account + cannot be used to log in to the system, although the + account's directories and files will remain. @@ -182,9 +187,10 @@ User's full name - The user name uniquely identifies the account to FreeBSD, but - does not necessarily reflect the user's real name. This - information can be associated with the account. + The user name uniquely identifies the account to + FreeBSD, but does not necessarily reflect the user's real + name. This information can be associated with the + account. @@ -192,14 +198,16 @@ Home directory - The home directory is the full path to a directory on the - system in which the user will start when logging on to the - system. A common convention is to put all user home directories - under + The home directory is the full path to a directory on + the system in which the user will start when logging on to + the system. A common convention is to put all user home + directories under /home/username - or /usr/home/username. - The user would store their personal files in their home directory, - and any directories they may create in there. + or + /usr/home/username. + The user would store their personal files in their home + directory, and any directories they may create in + there. @@ -207,10 +215,11 @@ User shell - The shell provides the default environment users use to - interact with the system. There are many different kinds of - shells, and experienced users will have their own preferences, - which can be reflected in their account settings. + The shell provides the default environment users use + to interact with the system. There are many different + kinds of shells, and experienced users will have their own + preferences, which can be reflected in their account + settings. @@ -345,26 +354,31 @@ &man.adduser.8; The recommended command-line application for adding - new users. + new users. + &man.rmuser.8; The recommended command-line application for - removing users. + removing users. + &man.chpass.1; - A flexible tool to change user database information. + A flexible tool to change user database + information. + &man.passwd.1; The simple command-line tool to change user - passwords. + passwords. + &man.pw.8; A powerful and flexible tool to modify all aspects - of user accounts. + of user accounts. @@ -374,21 +388,23 @@ <command>adduser</command> - accounts - adding + accounts + adding - adduser + adduser - /usr/share/skel + /usr/share/skel skeleton directory &man.adduser.8; is a simple program for adding new users. It creates entries in the system passwd and group files. It will also create a home directory for the new user, - copy in the default configuration files (dotfiles) from + copy in the default configuration files + (dotfiles) from /usr/share/skel, and can optionally mail the new user a welcome message. @@ -428,9 +444,9 @@ Goodbye! - The password you type in is not echoed, nor are asterisks - displayed. Make sure that you do not mistype the password. - + The password you type in is not echoed, nor are + asterisks displayed. Make sure that you do not mistype the + password. @@ -439,13 +455,12 @@ Goodbye! rmuser - accounts - removing + accounts + removing - You can use &man.rmuser.8; to - completely remove a user from the system. - &man.rmuser.8; performs the following + You can use &man.rmuser.8; to completely remove a user + from the system. &man.rmuser.8; performs the following steps: @@ -453,51 +468,60 @@ Goodbye! Removes the user's &man.crontab.1; entry (if any). + Removes any &man.at.1; jobs belonging to the user. + Kills all processes owned by the user. + Removes the user from the system's local password file. + Removes the user's home directory (if it is owned by the user). + Removes the incoming mail files belonging to the user from /var/mail. + Removes all files owned by the user from temporary - file storage areas such as /tmp. + file storage areas such as + /tmp. + Finally, removes the username from all groups to which it belongs in /etc/group. - - If a group becomes empty and the group name is the - same as the username, the group is removed; this - complements the per-user unique groups created by - &man.adduser.8;. - + + If a group becomes empty and the group name is the + same as the username, the group is removed; this + complements the per-user unique groups created by + &man.adduser.8;. + - &man.rmuser.8; cannot be used to remove - superuser accounts, since that is almost always an indication - of massive destruction. + &man.rmuser.8; cannot be used to remove superuser + accounts, since that is almost always an indication of massive + destruction. By default, an interactive mode is used, which attempts to make sure you know what you are doing. - <command>rmuser</command> Interactive Account Removal + <command>rmuser</command> Interactive Account + Removal &prompt.root; rmuser jru Matching password entry: @@ -534,11 +558,13 @@ Removing files belonging to jru from /va You will be asked for your password - after exiting the editor if you are not the superuser. + after exiting the editor if you are not the + superuser. - Interactive <command>chpass</command> by Superuser + Interactive <command>chpass</command> by + Superuser #Changing user database information for jru. Login: jru @@ -561,7 +587,8 @@ Other information: information, and only for themselves. - Interactive <command>chpass</command> by Normal User + Interactive <command>chpass</command> by Normal + User #Changing user database information for jru. Shell: /usr/local/bin/zsh @@ -579,8 +606,9 @@ Other information: &man.ypchfn.1;, and &man.ypchsh.1;. NIS support is automatic, so specifying the yp before the command is - not necessary. If this is confusing to you, do not worry, NIS will - be covered in . + not necessary. If this is confusing to you, do not worry, + NIS will be covered in . @@ -588,16 +616,17 @@ Other information: passwd - accounts - changing password + accounts + changing password &man.passwd.1; is the usual way to change your own password as a user, or another user's password as the superuser. - To prevent accidental or unauthorized changes, the original - password must be entered before a new password can be set. + To prevent accidental or unauthorized changes, the + original password must be entered before a new password can + be set. @@ -613,7 +642,8 @@ passwd: done - Changing Another User's Password as the Superuser + Changing Another User's Password as the + Superuser &prompt.root; passwd jru Changing local password for jru. @@ -634,6 +664,7 @@ passwd: done <command>pw</command> + pw &man.pw.8; is a command line utility to create, remove, @@ -673,35 +704,36 @@ passwd: done they provide a way to quickly check that usage without calculating it every time. Quotas are discussed in . + linkend="quotas"/>. - The other resource limits include ways to limit the amount of - CPU, memory, and other resources a user may consume. These are - defined using login classes and are discussed here. + The other resource limits include ways to limit the amount + of CPU, memory, and other resources a user may consume. These + are defined using login classes and are discussed here. /etc/login.conf Login classes are defined in /etc/login.conf. The precise semantics are - beyond the scope of this section, but are described in detail in the - &man.login.conf.5; manual page. It is sufficient to say that each - user is assigned to a login class (default by - default), and that each login class has a set of login capabilities - associated with it. A login capability is a + beyond the scope of this section, but are described in detail in + the &man.login.conf.5; manual page. It is sufficient to say + that each user is assigned to a login class + (default by default), and that each login + class has a set of login capabilities associated with it. A + login capability is a name=value pair, where name is a well-known identifier and value is an arbitrary - string processed accordingly depending on the name. Setting up login - classes and capabilities is rather straight-forward and is also - described in &man.login.conf.5;. + string processed accordingly depending on the name. Setting up + login classes and capabilities is rather straight-forward and is + also described in &man.login.conf.5;. The system does not normally read the configuration in - /etc/login.conf directly, but reads the database - file /etc/login.conf.db which provides - faster lookups. - To generate /etc/login.conf.db from + /etc/login.conf directly, but reads the + database file /etc/login.conf.db which + provides faster lookups. To generate + /etc/login.conf.db from /etc/login.conf, execute the following command: @@ -709,230 +741,230 @@ passwd: done Resource limits are different from plain vanilla login - capabilities in two ways. First, for every limit, there is a soft - (current) and hard limit. A soft limit may be adjusted by the user - or application, but may be no higher than the hard limit. The latter - may be lowered by the user, but never raised. Second, most resource - limits apply per process to a specific user, not the user as a whole. - Note, however, that these differences are mandated by the specific - handling of the limits, not by the implementation of the login - capability framework (i.e., they are not really - a special case of login capabilities). + capabilities in two ways. First, for every limit, there is a + soft (current) and hard limit. A soft limit may be adjusted by + the user or application, but may be no higher than the hard + limit. The latter may be lowered by the user, but never raised. + Second, most resource limits apply per process to a specific + user, not the user as a whole. Note, however, that these + differences are mandated by the specific handling of the limits, + not by the implementation of the login capability framework + (i.e., they are not really a special case + of login capabilities). - And so, without further ado, below are the most commonly used - resource limits (the rest, along with all the other login + And so, without further ado, below are the most commonly + used resource limits (the rest, along with all the other login capabilities, may be found in &man.login.conf.5;). - coredumpsize + coredumpsize - coredumpsize - - limiting users - coredumpsize - - The limit on the size of a core file generated by a program - is, for obvious reasons, subordinate to other limits on disk - usage (e.g., filesize, or disk quotas). - Nevertheless, it is often used as a less-severe method of - controlling disk space consumption: since users do not generate - core files themselves, and often do not delete them, setting this - may save them from running out of disk space should a large - program (e.g., emacs) crash. + coredumpsize + limiting users + coredumpsize + + The limit on the size of a core file generated by a + program is, for obvious reasons, subordinate to other + limits on disk usage (e.g., filesize, + or disk quotas). Nevertheless, it is often used as a + less-severe method of controlling disk space consumption: + since users do not generate core files themselves, and + often do not delete them, setting this may save them from + running out of disk space should a large program (e.g., + emacs) crash. - cputime + cputime - cputime - - limiting users - cputime - - This is the maximum amount of CPU time a user's process may - consume. Offending processes will be killed by the kernel. - - - This is a limit on CPU time - consumed, not percentage of the CPU as displayed in some - fields by &man.top.1; and &man.ps.1;. A limit on the - latter is, at the time of this writing, not possible, and - would be rather useless: a compiler—probably a - legitimate task—can easily use almost 100% of a CPU - for some time. - + cputime + + limiting users + cputime + + This is the maximum amount of CPU time a user's + process may consume. Offending processes will be killed + by the kernel. + + + This is a limit on CPU time + consumed, not percentage of the CPU as displayed in + some fields by &man.top.1; and &man.ps.1;. A limit on + the latter is, at the time of this writing, not + possible, and would be rather useless: a + compiler—probably a legitimate task—can + easily use almost 100% of a CPU for some time. + - filesize + filesize - filesize - - limiting users - filesize - - This is the maximum size of a file the user may possess. - Unlike disk quotas, this limit is - enforced on individual files, not the set of all files a user - owns. + filesize + + limiting users + filesize + + This is the maximum size of a file the user may + possess. Unlike disk + quotas, this limit is enforced on individual + files, not the set of all files a user owns. - maxproc + maxproc - maxproc - - limiting users - maxproc - + maxproc + + limiting users + maxproc + This is the maximum number of processes a user may be - running. This includes foreground and background processes - alike. For obvious reasons, this may not be larger than the - system limit specified by the kern.maxproc - &man.sysctl.8;. Also note that setting this - too small may hinder a - user's productivity: it is often useful to be logged in - multiple times or execute pipelines. Some tasks, such as - compiling a large program, also spawn multiple processes (e.g., - &man.make.1;, &man.cc.1;, and other intermediate + running. This includes foreground and background + processes alike. For obvious reasons, this may not be + larger than the system limit specified by the + kern.maxproc &man.sysctl.8;. Also note + that setting this too small may hinder a user's + productivity: it is often useful to be logged in multiple + times or execute pipelines. Some tasks, such as + compiling a large program, also spawn multiple processes + (e.g., &man.make.1;, &man.cc.1;, and other intermediate preprocessors). - memorylocked + memorylocked - memorylocked - - limiting users - memorylocked - + memorylocked + + limiting users + memorylocked + This is the maximum amount a memory a process may have requested to be locked into main memory (e.g., see &man.mlock.2;). Some system-critical programs, such as - &man.amd.8;, lock into main memory such that in the event + &man.amd.8;, lock into main memory such that in the event of being swapped out, they do not contribute to a system's thrashing in time of trouble. - memoryuse + memoryuse - memoryuse - - limiting users - memoryuse - - This is the maximum amount of memory a process may consume - at any given time. It includes both core memory and swap - usage. This is not a catch-all limit for restricting memory - consumption, but it is a good start. + memoryuse + limiting users + memoryuse + + This is the maximum amount of memory a process may + consume at any given time. It includes both core memory and + swap usage. This is not a catch-all limit for restricting + memory consumption, but it is a good start. - openfiles + openfiles - openfiles - - limiting users - openfiles - + openfiles + limiting users + openfiles + This is the maximum amount of files a process may have - open. In FreeBSD, files are also used to represent sockets and - IPC channels; thus, be careful not to set this too low. The - system-wide limit for this is defined by the + open. In FreeBSD, files are also used to represent + sockets and IPC channels; thus, be careful not to set this + too low. The system-wide limit for this is defined by the kern.maxfiles &man.sysctl.8;. - sbsize + sbsize - sbsize - - limiting users - sbsize - - This is the limit on the amount of network memory, and thus - mbufs, a user may consume. This originated as a response to an - old DoS attack by creating a lot of sockets, but can be - generally used to limit network communications. + sbsize + limiting users + sbsize + + This is the limit on the amount of network memory, and + thus mbufs, a user may consume. This originated as a + response to an old DoS attack by creating a lot of + sockets, but can be generally used to limit network + communications. - stacksize + stacksize - stacksize - - limiting users - stacksize - + stacksize + limiting users + stacksize + This is the maximum size a process' stack may grow to. - This alone is not sufficient to limit the amount of memory a - program may use; consequently, it should be used in conjunction - with other limits. + This alone is not sufficient to limit the amount of memory + a program may use; consequently, it should be used in + conjunction with other limits. - There are a few other things to remember when setting resource - limits. Following are some general tips, suggestions, and - miscellaneous comments. + There are a few other things to remember when setting + resource limits. Following are some general tips, suggestions, + and miscellaneous comments. - Processes started at system startup by - /etc/rc are assigned to the - daemon login class. + Processes started at system startup by + /etc/rc are assigned to the + daemon login class. - Although the /etc/login.conf that comes - with the system is a good source of reasonable values for most - limits, only you, the administrator, can know what is appropriate - for your system. Setting a limit too high may open your system - up to abuse, while setting it too low may put a strain on - productivity. + Although the /etc/login.conf that + comes with the system is a good source of reasonable values + for most limits, only you, the administrator, can know what + is appropriate for your system. Setting a limit too high + may open your system up to abuse, while setting it too low + may put a strain on productivity. - Users of the X Window System (X11) should probably be granted - more resources than other users. X11 by itself takes a lot of - resources, but it also encourages users to run more programs - simultaneously. + Users of the X Window System (X11) should probably be + granted more resources than other users. X11 by itself + takes a lot of resources, but it also encourages users to + run more programs simultaneously. - Remember that many limits apply to individual processes, not - the user as a whole. For example, setting - openfiles to 50 means - that each process the user runs may open up to 50 files. Thus, - the gross amount of files a user may open is the value of - openfiles multiplied by the value of - maxproc. This also applies to memory - consumption. + Remember that many limits apply to individual processes, + not the user as a whole. For example, setting + openfiles to 50 means that each process + the user runs may open up to 50 files. Thus, the gross + amount of files a user may open is the value of + openfiles multiplied by the value of + maxproc. This also applies to memory + consumption. - For further information on resource limits and login classes and - capabilities in general, please consult the relevant manual pages: - &man.cap.mkdb.1;, &man.getrlimit.2;, &man.login.conf.5;. + For further information on resource limits and login classes + and capabilities in general, please consult the relevant manual + pages: &man.cap.mkdb.1;, &man.getrlimit.2;, + &man.login.conf.5;. @@ -947,27 +979,28 @@ passwd: done groups A group is simply a list of users. Groups are identified by - their group name and GID (Group ID). In FreeBSD (and most other &unix; like - systems), the two factors the kernel uses to decide whether a process - is allowed to do something is its user ID and list of groups it - belongs to. Unlike a user ID, a process has a list of groups - associated with it. You may hear some things refer to the group ID - of a user or process; most of the time, this just means the first - group in the list. + their group name and GID (Group ID). In FreeBSD (and most other + &unix; like systems), the two factors the kernel uses to decide + whether a process is allowed to do something is its user ID and + list of groups it belongs to. Unlike a user ID, a process has a + list of groups associated with it. You may hear some things + refer to the group ID of a user or process; most + of the time, this just means the first group in the list. The group name to group ID map is in - /etc/group. This is a plain text file with four - colon-delimited fields. The first field is the group name, the - second is the encrypted password, the third the group ID, and the - fourth the comma-delimited list of members. It can safely be edited - by hand (assuming, of course, that you do not make any syntax - errors!). For a more complete description of the syntax, see the - &man.group.5; manual page. + /etc/group. This is a plain text file with + four colon-delimited fields. The first field is the group name, + the second is the encrypted password, the third the group ID, + and the fourth the comma-delimited list of members. It can + safely be edited by hand (assuming, of course, that you do not + make any syntax errors!). For a more complete description of + the syntax, see the &man.group.5; manual page. If you do not want to edit /etc/group - manually, you can use the &man.pw.8; command to add and edit groups. - For example, to add a group called teamtwo and - then confirm that it exists you can use: + manually, you can use the &man.pw.8; command to add and edit + groups. For example, to add a group called + teamtwo and then confirm that it exists + you can use: Adding a Group Using &man.pw.8; @@ -977,14 +1010,16 @@ passwd: done teamtwo:*:1100: - The number 1100 above is the group ID of the - group teamtwo. Right now, - teamtwo has no members, and is thus rather - useless. Let's change that by inviting jru to - the teamtwo group. + The number 1100 above is the group ID of + the group teamtwo. Right now, + teamtwo has no members, and is thus + rather useless. Let's change that by inviting + jru to the teamtwo + group. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 14:01:09 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 815DF9CA; Wed, 30 Jan 2013 14:01:09 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 61D00B52; Wed, 30 Jan 2013 14:01:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UE18k4057298; Wed, 30 Jan 2013 14:01:08 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UE0s6M057167; Wed, 30 Jan 2013 14:00:54 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301400.r0UE0s6M057167@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 14:00:54 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40818 - in projects/xml-tools: bn_BD.ISO10646-1/articles/explaining-bsd bn_BD.ISO10646-1/articles/new-users da_DK.ISO8859-1/articles/ipsec-must da_DK.ISO8859-1/articles/pxe da_DK.ISO88... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 14:01:09 -0000 Author: gabor Date: Wed Jan 30 14:00:53 2013 New Revision: 40818 URL: http://svnweb.freebsd.org/changeset/doc/40818 Log: - Migrate the documentation set to DocBook 4.5 Added: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog.xml (contents, props changed) projects/xml-tools/mn_MN.UTF-8/share/xml/catalog.xml (contents, props changed) projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog.xml (contents, props changed) projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog.xml (contents, props changed) Modified: projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml projects/xml-tools/bn_BD.ISO10646-1/articles/new-users/article.xml projects/xml-tools/da_DK.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/da_DK.ISO8859-1/articles/pxe/article.xml projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/contributing/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/laptop/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/new-users/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/de_DE.ISO8859-1/books/developers-handbook/book.xml projects/xml-tools/de_DE.ISO8859-1/books/faq/book.xml projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/book.xml projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog.xml projects/xml-tools/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/compiz-fusion/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/contributing/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/explaining-bsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/freebsd-questions/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/greek-language-support/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/laptop/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/linux-users/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/nanobsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/new-users/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/problem-reports/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/releng-packages/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/releng/article.xml projects/xml-tools/el_GR.ISO8859-7/books/faq/book.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/book.xml projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog.xml projects/xml-tools/en_US.ISO8859-1/articles/bsdl-gpl/article.xml projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml projects/xml-tools/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml projects/xml-tools/en_US.ISO8859-1/articles/compiz-fusion/article.xml projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributing/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributors/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cups/article.xml projects/xml-tools/en_US.ISO8859-1/articles/custom-gcc/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cvs-freebsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/article.xml projects/xml-tools/en_US.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/en_US.ISO8859-1/articles/laptop/article.xml projects/xml-tools/en_US.ISO8859-1/articles/ldap-auth/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-emulation/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml projects/xml-tools/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pr-guidelines/article.xml projects/xml-tools/en_US.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/en_US.ISO8859-1/articles/rc-scripting/article.xml projects/xml-tools/en_US.ISO8859-1/articles/relaydelay/article.xml projects/xml-tools/en_US.ISO8859-1/articles/releng-packages/article.xml projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml projects/xml-tools/en_US.ISO8859-1/articles/remote-install/article.xml projects/xml-tools/en_US.ISO8859-1/articles/serial-uart/article.xml projects/xml-tools/en_US.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml projects/xml-tools/en_US.ISO8859-1/articles/wp-toolbox/article.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/bibliography/book.xml projects/xml-tools/en_US.ISO8859-1/books/corp-net-guide/book.xml projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/share/xml/catalog projects/xml-tools/en_US.ISO8859-1/share/xml/catalog.xml projects/xml-tools/en_US.ISO8859-1/share/xml/entities.ent projects/xml-tools/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/contributing/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fdp-es/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/laptop/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml projects/xml-tools/es_ES.ISO8859-1/books/faq/book.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/book.xml projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog.xml projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/committers-guide/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributing/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributors/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/fonts/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/laptop/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/mh/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/new-users/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/releng-packages/article.xml projects/xml-tools/fr_FR.ISO8859-1/books/developers-handbook/book.xml projects/xml-tools/fr_FR.ISO8859-1/books/faq/book.xml projects/xml-tools/fr_FR.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/book.xml projects/xml-tools/fr_FR.ISO8859-1/books/porters-handbook/book.xml projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog.xml projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/cups/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/article.xml projects/xml-tools/hu_HU.ISO8859-2/books/faq/book.xml projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/book.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/book.xml projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog.xml projects/xml-tools/it_IT.ISO8859-15/articles/committers-guide/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/explaining-bsd/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/filtering-bridges/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/new-users/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/vm-design/article.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/book.xml projects/xml-tools/it_IT.ISO8859-15/books/unix-introduction/book.xml projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog.xml projects/xml-tools/ja_JP.eucJP/articles/contributing/article.xml projects/xml-tools/ja_JP.eucJP/articles/contributors/article.xml projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml projects/xml-tools/ja_JP.eucJP/articles/fonts/article.xml projects/xml-tools/ja_JP.eucJP/articles/ipsec-must/article.xml projects/xml-tools/ja_JP.eucJP/articles/problem-reports/article.xml projects/xml-tools/ja_JP.eucJP/books/design-44bsd/book.xml projects/xml-tools/ja_JP.eucJP/books/faq/book.xml projects/xml-tools/ja_JP.eucJP/books/fdp-primer/book.xml projects/xml-tools/ja_JP.eucJP/books/handbook/book.xml projects/xml-tools/ja_JP.eucJP/books/porters-handbook/book.xml projects/xml-tools/ja_JP.eucJP/share/xml/catalog projects/xml-tools/ja_JP.eucJP/share/xml/catalog.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/book.xml projects/xml-tools/mn_MN.UTF-8/share/xml/catalog projects/xml-tools/nl_NL.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/contributing/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/book.xml projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog.xml projects/xml-tools/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml projects/xml-tools/pl_PL.ISO8859-2/articles/new-users/article.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/book.xml projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog projects/xml-tools/pt_BR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/contributing/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/hubs/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/new-users/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/pt_BR.ISO8859-1/books/faq/book.xml projects/xml-tools/pt_BR.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/pt_BR.ISO8859-1/books/handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/articles/committers-guide/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/console-server/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/contributing/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cups/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/custom-gcc/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/explaining-bsd/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fonts/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/freebsd-questions/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/geom-class/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/hubs/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/ipsec-must/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/laptop/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/linux-comparison/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/mh/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/new-users/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/portbuild/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pr-guidelines/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/problem-reports/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/relaydelay/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/releng-packages/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/releng/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/solid-state/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/vm-design/article.xml projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/book.xml projects/xml-tools/ru_RU.KOI8-R/books/developers-handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/books/faq/book.xml projects/xml-tools/ru_RU.KOI8-R/books/fdp-primer/book.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog.xml projects/xml-tools/share/xml/freebsd45.dtd projects/xml-tools/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml projects/xml-tools/tr_TR.ISO8859-9/share/xml/catalog.xml projects/xml-tools/zh_CN.GB2312/articles/contributing/article.xml projects/xml-tools/zh_CN.GB2312/articles/cvs-freebsd/article.xml projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml projects/xml-tools/zh_CN.GB2312/articles/nanobsd/article.xml projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml projects/xml-tools/zh_CN.GB2312/articles/remote-install/article.xml projects/xml-tools/zh_CN.GB2312/books/arch-handbook/book.xml projects/xml-tools/zh_CN.GB2312/books/handbook/book.xml projects/xml-tools/zh_CN.GB2312/books/porters-handbook/book.xml projects/xml-tools/zh_CN.GB2312/share/xml/catalog projects/xml-tools/zh_CN.GB2312/share/xml/catalog.xml projects/xml-tools/zh_TW.Big5/articles/contributing/article.xml projects/xml-tools/zh_TW.Big5/articles/cvs-freebsd/article.xml projects/xml-tools/zh_TW.Big5/articles/freebsd-questions/article.xml projects/xml-tools/zh_TW.Big5/articles/hubs/article.xml projects/xml-tools/zh_TW.Big5/articles/mailing-list-faq/article.xml projects/xml-tools/zh_TW.Big5/articles/nanobsd/article.xml projects/xml-tools/zh_TW.Big5/articles/pr-guidelines/article.xml projects/xml-tools/zh_TW.Big5/articles/problem-reports/article.xml projects/xml-tools/zh_TW.Big5/articles/remote-install/article.xml projects/xml-tools/zh_TW.Big5/books/developers-handbook/book.xml projects/xml-tools/zh_TW.Big5/books/faq/book.xml projects/xml-tools/zh_TW.Big5/books/fdp-primer/book.xml projects/xml-tools/zh_TW.Big5/books/handbook/book.xml projects/xml-tools/zh_TW.Big5/books/porters-handbook/book.xml projects/xml-tools/zh_TW.Big5/share/xml/catalog projects/xml-tools/zh_TW.Big5/share/xml/catalog.xml Modified: projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,7 +1,5 @@ - - - + + + + + + + + + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,10 +1,6 @@ - -%entities; - -]> + Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,8 +1,6 @@ - -%entities; +FreeBSD From Scratch"> ]> Modified: projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> + Modified: projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,8 +1,6 @@ - -%entities; +FreeBSD Update Server"> ]> Modified: projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Writing a GEOM Class Modified: projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> + Modified: projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> + Modified: projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> + Modified: projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; -]> +
Modified: projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml Wed Jan 30 12:02:29 2013 (r40817) +++ projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml Wed Jan 30 14:00:53 2013 (r40818) @@ -1,9 +1,6 @@ - -%entities; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 16:10:56 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F14EEFDC; Wed, 30 Jan 2013 16:10:55 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B57CE37D; Wed, 30 Jan 2013 16:10:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UGAtE4097941; Wed, 30 Jan 2013 16:10:55 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UGAtBS097937; Wed, 30 Jan 2013 16:10:55 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301610.r0UGAtBS097937@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 16:10:55 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40826 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 16:10:56 -0000 Author: gabor Date: Wed Jan 30 16:10:54 2013 New Revision: 40826 URL: http://svnweb.freebsd.org/changeset/doc/40826 Log: - Some minor adjustments Modified: projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl projects/xml-tools/share/xsl/freebsd-xhtml.xsl Modified: projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl Wed Jan 30 15:22:59 2013 (r40825) +++ projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl Wed Jan 30 16:10:54 2013 (r40826) @@ -12,5 +12,8 @@ + + + Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Wed Jan 30 15:22:59 2013 (r40825) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Wed Jan 30 16:10:54 2013 (r40826) @@ -7,10 +7,6 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" exclude-result-prefixes="#default"> - - - - @@ -22,7 +18,6 @@ - Modified: projects/xml-tools/share/xsl/freebsd-xhtml.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml.xsl Wed Jan 30 15:22:59 2013 (r40825) +++ projects/xml-tools/share/xsl/freebsd-xhtml.xsl Wed Jan 30 16:10:54 2013 (r40826) @@ -13,4 +13,3 @@ - From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 16:19:09 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4F9B026E; Wed, 30 Jan 2013 16:19:09 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4235B61E; Wed, 30 Jan 2013 16:19:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UGJ98V099211; Wed, 30 Jan 2013 16:19:09 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UGJ9xY099209; Wed, 30 Jan 2013 16:19:09 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301619.r0UGJ9xY099209@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 16:19:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40827 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 16:19:09 -0000 Author: gabor Date: Wed Jan 30 16:19:08 2013 New Revision: 40827 URL: http://svnweb.freebsd.org/changeset/doc/40827 Log: - Generate html and html-split with XSLT rather than DSSSL - Good bye HTML Tidy Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:10:54 2013 (r40826) +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:19:08 2013 (r40827) @@ -40,14 +40,9 @@ # used to set additional variables, such as # "%generate-article-toc%". # -# TIDYFLAGS Additional flags to pass to Tidy. Typically -# used to set "-raw" flag to handle 8bit characters. -# # EXTRA_CATALOGS Additional catalog files that should be used by # any SGML processing applications. # -# NO_TIDY If you do not want to use tidy, set this to "YES". -# # GEN_INDEX If this document has an index (HAS_INDEX) and this # variable is defined, then index.xml will be added # to the list of dependencies for source files, and @@ -118,9 +113,6 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml # List of supported SP_ENCODINGs SP_ENCODING_LIST?= ISO-8859-2 KOI8-R -# Which stylesheet type to use. 'dsssl' or 'xsl' -STYLESHEET_TYPE?= dsssl - .if defined(SPELLCHECK) DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl .endif @@ -147,25 +139,19 @@ JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl + FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog - ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog - -.if ${STYLESHEET_TYPE} == "dsssl" -DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog -.elif ${STYLESHEET_TYPE} == "xsl" DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog -.endif - CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports - DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog + COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl XSLTPROCFLAGS?= --nonet -XSLHTML?= ${DOC_PREFIX}/share/xsl/freebsd-html.xsl -XSLHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-html-chunk.xsl +XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl +XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl @@ -253,12 +239,6 @@ TOUCH?= /usr/bin/touch XARGS?= /usr/bin/xargs GROFF?= groff -TIDY_VER!= ${TIDY} -v 2>&1 -.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008" -TIDYOPTS?= -wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS} -.else -TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} -.endif HTML2TXT?= ${PREFIX}/bin/links HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS} HTML2PDB?= ${PREFIX}/bin/iSiloBSD @@ -407,10 +387,6 @@ CLEANFILES+= ${.CURDIR:T}.pdb .endif .endif -.if (${STYLESHEET_TYPE} == "xsl") -CLEANFILES+= ${DOC}.xml .sxerr -.endif - .if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \ (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \ ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt") @@ -420,7 +396,6 @@ CLEANFILES+= ${LOCAL_CSS_SHEET} .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) && \ (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \ ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt") -CLEANFILES+= LEGALNOTICE.html trademarks.html .endif .endfor # _curformat in ${FORMATS} # @@ -500,62 +475,17 @@ NO_RTF= yes .endif .endfor -# HTML-SPLIT ------------------------------------------------------------- +# XHTML ------------------------------------------------------------- -.if ${STYLESHEET_TYPE} == "dsssl" -index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ - ${LOCAL_IMAGES_TXT} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} - ${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} -.elif ${STYLESHEET_TYPE} == "xsl" index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTMLCHUNK} \ - ${DOC}.xml -.endif -.if !defined(NO_TIDY) - ${REINPLACE_TABS_CMD} $$(${XARGS} < HTML.manifest) - -${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest) -.endif + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.xml -# HTML ------------------------------------------------------------------- - -.if ${STYLESHEET_TYPE} == "dsssl" -${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ - ${LOCAL_IMAGES_TXT} ${HTML_INDEX} ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} - ${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \ - (${RM} -f ${.TARGET} && false) -.elif ${STYLESHEET_TYPE} == "xsl" ${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_CSS_SHEET} ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTML} \ - ${DOC}.xml > ${.TARGET} -.endif -.if !defined(NO_TIDY) - ${REINPLACE_TABS_CMD} ${.TARGET} - -${TIDY} ${TIDYOPTS} ${.TARGET} -.endif - -# HTML-TEXT -------------------------------------------------------------- - -# Special target to produce HTML with no images in it. -.if ${STYLESHEET_TYPE} == "dsssl" -${DOC}.html-text: ${SRCS} ${HTML_INDEX} ${LOCAL_IMAGES_TXT} - ${GEN_INDEX_SGML_CMD} - ${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \ - ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \ - (${RM} -f ${.TARGET} && false) -.elif ${STYLESHEET_TYPE} == "xsl" -${DOC}.html-text: ${DOC}.xml ${HTML_INDEX} - ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'0'" ${XSLHTML} \ - ${DOC}.xml > ${.TARGET} -.endif + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.xml > ${.TARGET} ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \ ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET} @@ -577,7 +507,7 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMA .if !target(${DOC}.txt) .if !defined(NO_PLAINTEXT) -${DOC}.txt: ${DOC}.html-text +${DOC}.txt: ${DOC}.html ${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET} .else ${DOC}.txt: From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 16:37:00 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1C7A1463; Wed, 30 Jan 2013 16:37:00 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EA1817AD; Wed, 30 Jan 2013 16:36:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UGax1p005661; Wed, 30 Jan 2013 16:36:59 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UGaxfp005660; Wed, 30 Jan 2013 16:36:59 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301636.r0UGaxfp005660@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 16:36:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40828 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 16:37:00 -0000 Author: gabor Date: Wed Jan 30 16:36:59 2013 New Revision: 40828 URL: http://svnweb.freebsd.org/changeset/doc/40828 Log: - Add support for epub generation Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:19:08 2013 (r40827) +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:36:59 2013 (r40828) @@ -152,6 +152,7 @@ COLLATEINDEX= ${PREFIX}/share/sgml/docbo XSLTPROCFLAGS?= --nonet XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl +XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl @@ -349,6 +350,10 @@ CLEANFILES+= PLIST.${_curformat} CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \ HTML.manifest ln*.html +.elif ${_cf} == "epub" +CLEANFILES+= ${DOC}.epub mimetype +CLEANDIRS+= META-INF OEBPS + .elif ${_cf} == "html.tar" CLEANFILES+= ${DOC}.html @@ -413,7 +418,7 @@ CLEANFILES+= ${LOCAL_CSS_SHEET} _cf=${_curformat} .for _curcomp in ${INSTALL_COMPRESSED} -.if ${_cf} != "html-split" && ${_cf} != "html" +.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub" _curinst+= install-${_curformat}.${_curcomp} _docs+= ${DOC}.${_curformat}.${_curcomp} CLEANFILES+= ${DOC}.${_curformat}.${_curcomp} @@ -503,6 +508,17 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMA ${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||} .endfor +# EPUB ------------------------------------------------------------- + +${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ + ${CSS_SHEET} + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml + ${ECHO} "application/epub+zip" > mimetype + ${CP} ${CSS_SHEET} OEBPS/ + zip -0Xq ${DOC}.epub mimetype + zip -Xr9D ${DOC}.epub OEBPS META-INF + + # TXT -------------------------------------------------------------------- .if !target(${DOC}.txt) From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 18:59:42 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0493393E; Wed, 30 Jan 2013 18:59:42 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E053CF15; Wed, 30 Jan 2013 18:59:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UIxfgC049404; Wed, 30 Jan 2013 18:59:41 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UIxfvY049403; Wed, 30 Jan 2013 18:59:41 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301859.r0UIxfvY049403@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 18:59:41 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40830 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 18:59:42 -0000 Author: gabor Date: Wed Jan 30 18:59:41 2013 New Revision: 40830 URL: http://svnweb.freebsd.org/changeset/doc/40830 Log: - Add epub stylesheet customization Added: projects/xml-tools/share/xsl/freebsd-epub.xsl - copied, changed from r40730, projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl Copied and modified: projects/xml-tools/share/xsl/freebsd-epub.xsl (from r40730, projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl) ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl Wed Jan 23 13:13:16 2013 (r40730, copy source) +++ projects/xml-tools/share/xsl/freebsd-epub.xsl Wed Jan 30 18:59:41 2013 (r40830) @@ -8,9 +8,11 @@ exclude-result-prefixes="#default"> - + + + From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:01:34 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A7FA2994; Wed, 30 Jan 2013 19:01:34 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 99396F26; Wed, 30 Jan 2013 19:01:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UJ1Y52051371; Wed, 30 Jan 2013 19:01:34 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UJ1YY6051367; Wed, 30 Jan 2013 19:01:34 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201301301901.r0UJ1YY6051367@svn.freebsd.org> From: Benedict Reuschling Date: Wed, 30 Jan 2013 19:01:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:01:34 -0000 Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 URL: http://svnweb.freebsd.org/changeset/doc/40831 Log: Deactivate the build of the PGP Keys section from the appendix. This will not be part of the print edition, but will still be kept in the online version. Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile Wed Jan 30 18:59:41 2013 (r40830) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile Wed Jan 30 19:01:33 2013 (r40831) @@ -276,7 +276,7 @@ SRCS+= mail/chapter.xml SRCS+= mirrors/chapter.xml SRCS+= multimedia/chapter.xml SRCS+= network-servers/chapter.xml -SRCS+= pgpkeys/chapter.xml +#SRCS+= pgpkeys/chapter.xml SRCS+= ports/chapter.xml SRCS+= ppp-and-slip/chapter.xml SRCS+= preface/preface.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Wed Jan 30 18:59:41 2013 (r40830) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Wed Jan 30 19:01:33 2013 (r40831) @@ -572,12 +572,6 @@ &os;. - - , PGP Keys - - Lists the PGP fingerprints of several &os; Developers. - - Conventions used From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:08:54 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 29F28AFB; Wed, 30 Jan 2013 19:08:54 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id B8B1CF58; Wed, 30 Jan 2013 19:08:53 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id AEEA514D2436; Wed, 30 Jan 2013 20:08:52 +0100 (CET) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id TJaAZu-xnE1k; Wed, 30 Jan 2013 20:08:52 +0100 (CET) Received: from [192.168.1.100] (5403A6BE.catv.pool.telekom.hu [84.3.166.190]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 18EC414D2410; Wed, 30 Jan 2013 20:08:51 +0100 (CET) Message-ID: <51096FC6.2000205@FreeBSD.org> Date: Wed, 30 Jan 2013 20:08:54 +0100 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Benedict Reuschling Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> In-Reply-To: <201301301901.r0UJ1YY6051367@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@freebsd.org, doc-committers@freebsd.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:08:54 -0000 Em 30-01-2013 20:01, Benedict Reuschling escreveu: > Author: bcr > Date: Wed Jan 30 19:01:33 2013 > New Revision: 40831 > URL:http://svnweb.freebsd.org/changeset/doc/40831 > > Log: > Deactivate the build of the PGP Keys section from the appendix. > This will not be part of the print edition, but will still be > kept in the online version. Are you sure that this is the best way of doing this? This will make merges more difficult. I don't know if it has been discussed somewhere but I'd prefer a single-source solution. We could add a custom profiling attribute for online or print-only chunks. Gabor From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:13:03 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2D02CC38; Wed, 30 Jan 2013 19:13:03 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1D0BBF75; Wed, 30 Jan 2013 19:13:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UJD3qk055172; Wed, 30 Jan 2013 19:13:03 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UJCbPL054978; Wed, 30 Jan 2013 19:12:37 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301301912.r0UJCbPL054978@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 19:12:37 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40832 - in projects/xml-tools: da_DK.ISO8859-1/articles/ipsec-must de_DE.ISO8859-1/articles/contributing de_DE.ISO8859-1/articles/contributing-ports de_DE.ISO8859-1/articles/explaining... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:13:03 -0000 Author: gabor Date: Wed Jan 30 19:12:36 2013 New Revision: 40832 URL: http://svnweb.freebsd.org/changeset/doc/40832 Log: - Remove standalone="no" statements from XML declarations since it did not always work and is no use anyway Modified: projects/xml-tools/da_DK.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/contributing/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/laptop/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/new-users/article.xml projects/xml-tools/de_DE.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/de_DE.ISO8859-1/books/developers-handbook/book.xml projects/xml-tools/de_DE.ISO8859-1/books/faq/book.xml projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/book.xml projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml projects/xml-tools/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/compiz-fusion/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/contributing/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/explaining-bsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/freebsd-questions/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/greek-language-support/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/laptop/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/linux-users/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/nanobsd/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/new-users/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/problem-reports/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/releng-packages/article.xml projects/xml-tools/el_GR.ISO8859-7/articles/releng/article.xml projects/xml-tools/el_GR.ISO8859-7/books/faq/book.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/book.xml projects/xml-tools/en_US.ISO8859-1/articles/bsdl-gpl/article.xml projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml projects/xml-tools/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml projects/xml-tools/en_US.ISO8859-1/articles/compiz-fusion/article.xml projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributing/article.xml projects/xml-tools/en_US.ISO8859-1/articles/contributors/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cups/article.xml projects/xml-tools/en_US.ISO8859-1/articles/custom-gcc/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cvs-freebsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/article.xml projects/xml-tools/en_US.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/en_US.ISO8859-1/articles/laptop/article.xml projects/xml-tools/en_US.ISO8859-1/articles/ldap-auth/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-emulation/article.xml projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml projects/xml-tools/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pr-guidelines/article.xml projects/xml-tools/en_US.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/en_US.ISO8859-1/articles/rc-scripting/article.xml projects/xml-tools/en_US.ISO8859-1/articles/relaydelay/article.xml projects/xml-tools/en_US.ISO8859-1/articles/releng-packages/article.xml projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml projects/xml-tools/en_US.ISO8859-1/articles/remote-install/article.xml projects/xml-tools/en_US.ISO8859-1/articles/serial-uart/article.xml projects/xml-tools/en_US.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml projects/xml-tools/en_US.ISO8859-1/articles/wp-toolbox/article.xml projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/bibliography/book.xml projects/xml-tools/en_US.ISO8859-1/books/corp-net-guide/book.xml projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml projects/xml-tools/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/contributing/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fdp-es/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/laptop/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/linux-comparison/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml projects/xml-tools/es_ES.ISO8859-1/books/faq/book.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/book.xml projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/committers-guide/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributing/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/contributors/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/fonts/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/ipsec-must/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/laptop/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/mh/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/new-users/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/releng-packages/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/cups/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/article.xml projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/article.xml projects/xml-tools/hu_HU.ISO8859-2/books/faq/book.xml projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/book.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/book.xml projects/xml-tools/it_IT.ISO8859-15/articles/committers-guide/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/explaining-bsd/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/filtering-bridges/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/new-users/article.xml projects/xml-tools/it_IT.ISO8859-15/articles/vm-design/article.xml projects/xml-tools/ja_JP.eucJP/articles/contributing/article.xml projects/xml-tools/ja_JP.eucJP/articles/contributors/article.xml projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml projects/xml-tools/ja_JP.eucJP/articles/fonts/article.xml projects/xml-tools/ja_JP.eucJP/articles/ipsec-must/article.xml projects/xml-tools/ja_JP.eucJP/articles/problem-reports/article.xml projects/xml-tools/ja_JP.eucJP/books/design-44bsd/book.xml projects/xml-tools/ja_JP.eucJP/books/faq/book.xml projects/xml-tools/ja_JP.eucJP/books/fdp-primer/book.xml projects/xml-tools/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml projects/xml-tools/ja_JP.eucJP/books/porters-handbook/book.xml projects/xml-tools/nl_NL.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/contributing/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/nl_NL.ISO8859-1/articles/solid-state/article.xml projects/xml-tools/nl_NL.ISO8859-1/share/xml/bibliography.xml projects/xml-tools/no_NO.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml projects/xml-tools/no_NO.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml projects/xml-tools/pl_PL.ISO8859-2/articles/new-users/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/contributing-ports/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/contributing/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/hubs/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/linux-users/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/new-users/article.xml projects/xml-tools/pt_BR.ISO8859-1/articles/problem-reports/article.xml projects/xml-tools/pt_BR.ISO8859-1/books/faq/book.xml projects/xml-tools/pt_BR.ISO8859-1/books/fdp-primer/book.xml projects/xml-tools/ru_RU.KOI8-R/articles/committers-guide/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/console-server/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/contributing/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cups/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/custom-gcc/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/explaining-bsd/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fonts/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/freebsd-questions/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/geom-class/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/hubs/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/ipsec-must/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/laptop/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/linux-comparison/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/mh/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/new-users/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/portbuild/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pr-guidelines/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/problem-reports/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/relaydelay/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/releng-packages/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/releng/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/solid-state/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/vm-design/article.xml projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/book.xml projects/xml-tools/ru_RU.KOI8-R/books/developers-handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/books/faq/book.xml projects/xml-tools/ru_RU.KOI8-R/books/fdp-primer/book.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/book.xml projects/xml-tools/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/xml-tools/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml projects/xml-tools/zh_CN.GB2312/articles/contributing/article.xml projects/xml-tools/zh_CN.GB2312/articles/cvs-freebsd/article.xml projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml projects/xml-tools/zh_CN.GB2312/articles/nanobsd/article.xml projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml projects/xml-tools/zh_CN.GB2312/articles/remote-install/article.xml projects/xml-tools/zh_CN.GB2312/books/arch-handbook/book.xml projects/xml-tools/zh_CN.GB2312/books/porters-handbook/book.xml projects/xml-tools/zh_TW.Big5/articles/contributing/article.xml projects/xml-tools/zh_TW.Big5/articles/cvs-freebsd/article.xml projects/xml-tools/zh_TW.Big5/articles/freebsd-questions/article.xml projects/xml-tools/zh_TW.Big5/articles/hubs/article.xml projects/xml-tools/zh_TW.Big5/articles/mailing-list-faq/article.xml projects/xml-tools/zh_TW.Big5/articles/nanobsd/article.xml projects/xml-tools/zh_TW.Big5/articles/pr-guidelines/article.xml projects/xml-tools/zh_TW.Big5/articles/problem-reports/article.xml projects/xml-tools/zh_TW.Big5/articles/remote-install/article.xml projects/xml-tools/zh_TW.Big5/books/developers-handbook/book.xml projects/xml-tools/zh_TW.Big5/books/porters-handbook/book.xml Modified: projects/xml-tools/da_DK.ISO8859-1/articles/ipsec-must/article.xml ============================================================================== --- projects/xml-tools/da_DK.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/da_DK.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/contributing/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/laptop/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/linux-comparison/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/new-users/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/articles/solid-state/article.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/articles/solid-state/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/articles/solid-state/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/developers-handbook/book.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/developers-handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/books/developers-handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + %chapters; Modified: projects/xml-tools/de_DE.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/faq/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/books/faq/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/book.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + %chapters; Modified: projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/compiz-fusion/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/compiz-fusion/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/compiz-fusion/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/contributing/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/contributing/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/contributing/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/explaining-bsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/explaining-bsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/freebsd-questions/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/freebsd-questions/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/freebsd-questions/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + ]> Modified: projects/xml-tools/el_GR.ISO8859-7/articles/greek-language-support/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/greek-language-support/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/greek-language-support/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/laptop/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/laptop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/laptop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/linux-users/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/linux-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/linux-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/nanobsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/nanobsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/new-users/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/new-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/new-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/problem-reports/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/problem-reports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/problem-reports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/releng-packages/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/releng-packages/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/releng-packages/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/articles/releng/article.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/articles/releng/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/articles/releng/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Ç ÏñãÜíùóç ¸êäïóçò ôùí ÐáêÝôùí Ëïãéóìéêïý áðü Ôñßôïõò'> Modified: projects/xml-tools/el_GR.ISO8859-7/books/faq/book.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/faq/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/books/faq/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/book.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/bsdl-gpl/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/compiz-fusion/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/compiz-fusion/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/compiz-fusion/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributing-ports/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/contributors/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/cups/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/cups/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/cups/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/custom-gcc/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/custom-gcc/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/custom-gcc/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/cvs-freebsd/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/cvs-freebsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/cvs-freebsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + FreeBSD From Scratch"> Modified: projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/fonts/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + FreeBSD Update Server"> Modified: projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/geom-class/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/hubs/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/laptop/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/ldap-auth/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/ldap-auth/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/ldap-auth/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/linux-comparison/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/linux-emulation/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/linux-emulation/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/linux-emulation/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/mh/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/pr-guidelines/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/pr-guidelines/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/pr-guidelines/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + edit-pr1"> Modified: projects/xml-tools/en_US.ISO8859-1/articles/problem-reports/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/rc-scripting/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/rc-scripting/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/rc-scripting/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/relaydelay/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/relaydelay/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/relaydelay/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/releng-packages/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/releng-packages/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/releng-packages/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + The Release Engineering of Third Party Packages'> Modified: projects/xml-tools/en_US.ISO8859-1/articles/remote-install/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/remote-install/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/remote-install/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/serial-uart/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/serial-uart/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/serial-uart/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/solid-state/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/solid-state/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/solid-state/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/articles/wp-toolbox/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/wp-toolbox/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/articles/wp-toolbox/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/arch-handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/bibliography/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/bibliography/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/bibliography/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/corp-net-guide/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/corp-net-guide/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/corp-net-guide/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + %chapters; Modified: projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + %chapters; Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + + Modified: projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/contributing/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + FreeBSD From Scratch"> Modified: projects/xml-tools/es_ES.ISO8859-1/articles/fdp-es/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/fdp-es/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/fdp-es/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/laptop/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/linux-comparison/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/linux-comparison/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/linux-users/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/problem-reports/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/faq/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/books/faq/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/book.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/committers-guide/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/committers-guide/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/contributing-ports/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/contributing-ports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/contributing/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/contributing/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/contributors/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/contributors/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/contributors/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/fonts/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/fonts/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/fonts/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/ipsec-must/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/ipsec-must/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/laptop/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/laptop/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/linux-users/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/linux-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/mh/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/mh/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/mh/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/new-users/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/new-users/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/problem-reports/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/problem-reports/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/releng-packages/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/releng-packages/article.xml Wed Jan 30 19:01:33 2013 (r40831) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/releng-packages/article.xml Wed Jan 30 19:12:36 2013 (r40832) @@ -1,4 +1,4 @@ - + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:38:51 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F00B44BB; Wed, 30 Jan 2013 19:38:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) by mx1.freebsd.org (Postfix) with ESMTP id CEA3A10A; Wed, 30 Jan 2013 19:38:47 +0000 (UTC) Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp [118.7.212.137]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r0UJcVUq066552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 31 Jan 2013 04:38:41 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0) by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id r0UJcTkL067510; Thu, 31 Jan 2013 04:38:31 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Thu, 31 Jan 2013 04:38:18 +0900 (JST) Message-Id: <20130131.043818.1230294862713909520.hrs@allbsd.org> To: gabor@FreeBSD.org Subject: Re: svn commit: r40828 - projects/xml-tools/share/mk From: Hiroki Sato In-Reply-To: <201301301636.r0UGaxfp005660@svn.freebsd.org> References: <201301301636.r0UGaxfp005660@svn.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Thu_Jan_31_04_38_18_2013_736)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Thu, 31 Jan 2013 04:38:41 +0900 (JST) X-Spam-Status: No, score=-98.1 required=13.0 tests=CONTENT_TYPE_PRESENT, ONLY1HOPDIRECT,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:38:52 -0000 ----Security_Multipart(Thu_Jan_31_04_38_18_2013_736)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Gabor Kovesdan wrote in <201301301636.r0UGaxfp005660@svn.freebsd.org>: ga> Author: gabor ga> Date: Wed Jan 30 16:36:59 2013 ga> New Revision: 40828 ga> URL: http://svnweb.freebsd.org/changeset/doc/40828 ga> ga> Log: ga> - Add support for epub generation ga> ga> Modified: ga> projects/xml-tools/share/mk/doc.docbook.mk ga> ga> Modified: projects/xml-tools/share/mk/doc.docbook.mk ga> ============================================================================== ga> --- projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:19:08 2013 (r40827) ga> +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 16:36:59 2013 (r40828) ga> @@ -152,6 +152,7 @@ COLLATEINDEX= ${PREFIX}/share/sgml/docbo ga> XSLTPROCFLAGS?= --nonet ga> XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl ga> XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl ga> +XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl ga> XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl ga> INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl ga> ga> @@ -349,6 +350,10 @@ CLEANFILES+= PLIST.${_curformat} ga> CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \ ga> HTML.manifest ln*.html ga> ga> +.elif ${_cf} == "epub" ga> +CLEANFILES+= ${DOC}.epub mimetype ga> +CLEANDIRS+= META-INF OEBPS ga> + ga> .elif ${_cf} == "html.tar" ga> CLEANFILES+= ${DOC}.html ga> ga> @@ -413,7 +418,7 @@ CLEANFILES+= ${LOCAL_CSS_SHEET} ga> _cf=${_curformat} ga> .for _curcomp in ${INSTALL_COMPRESSED} ga> ga> -.if ${_cf} != "html-split" && ${_cf} != "html" ga> +.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub" ga> _curinst+= install-${_curformat}.${_curcomp} ga> _docs+= ${DOC}.${_curformat}.${_curcomp} ga> CLEANFILES+= ${DOC}.${_curformat}.${_curcomp} ga> @@ -503,6 +508,17 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMA ga> ${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||} ga> .endfor ga> ga> +# EPUB ------------------------------------------------------------- ga> + ga> +${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ga> + ${CSS_SHEET} ga> + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml ga> + ${ECHO} "application/epub+zip" > mimetype ga> + ${CP} ${CSS_SHEET} OEBPS/ ga> + zip -0Xq ${DOC}.epub mimetype ga> + zip -Xr9D ${DOC}.epub OEBPS META-INF I like to use bsdtar(1) to create a zip archive if possible. -- Hiroki ----Security_Multipart(Thu_Jan_31_04_38_18_2013_736)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAlEJdqoACgkQTyzT2CeTzy1B9QCcCQS7eIflMDfJbJlNvoDfc0S7 Qy4AnjDrwU+v/9CQWqWimuoy139eRWVB =x2N0 -----END PGP SIGNATURE----- ----Security_Multipart(Thu_Jan_31_04_38_18_2013_736)---- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:43:58 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B9F485DE; Wed, 30 Jan 2013 19:43:58 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout3.bln1.prohost.de (mxout3.bln1.prohost.de [213.160.84.49]) by mx1.freebsd.org (Postfix) with ESMTP id 3219D143; Wed, 30 Jan 2013 19:43:57 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC72640.dip.t-dialin.net [79.199.38.64]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id r0UJhgf7004678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Jan 2013 20:43:43 +0100 Message-ID: <510977F0.2040106@FreeBSD.org> Date: Wed, 30 Jan 2013 20:43:44 +0100 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Gabor Kovesdan Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> In-Reply-To: <51096FC6.2000205@FreeBSD.org> X-Enigmail-Version: 1.5 OpenPGP: id=4A819348 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Null-Tag: cd4ddd346d79580cf578751c5bb6057d Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:43:58 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 30.01.13 20:08, schrieb Gabor Kovesdan: > Em 30-01-2013 20:01, Benedict Reuschling escreveu: >> Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 >> URL:http://svnweb.freebsd.org/changeset/doc/40831 >> >> Log: Deactivate the build of the PGP Keys section from the >> appendix. This will not be part of the print edition, but will >> still be kept in the online version. > Are you sure that this is the best way of doing this? This will > make merges more difficult. I don't know if it has been discussed > somewhere but I'd prefer a single-source solution. We could add a > custom profiling attribute for online or print-only chunks. Well, there is the WITH_PGPKEYS variable that just uses the fingerprints for the print version. I could revert the above change, no problem. But what about other chapters? I'm working on removing the 8.x install chapter in that branch since the print edition will only cover 9.x. There are still many links to the old install chapter in many parts of the handbook. I planned to update them all to point to the bsdinstall chapter. However, it might make sense (not just for this chapter) to just keep links to old chapters in the online version that are removed in the print edition. I don't know how difficult it would be to add such a profiling attribute to every such link, but I guess it would be. I'm in favour of a single source solution, especially for merges back to the online version. Right now, we try to put all changes that make sense to both head and the book branch. However, there are going to be changes (like deleting non-9.x content) that will be made to the book branch sooner while keeping it for the online handbook. Of course this makes merging difficult later on. But my view on this is that at one point the print edition will become the new online version of the handbook, so everything that we delete now for the book will also be deleted for the online edition. The PGPkeys chapter can be reactivated easier than other changes. But I think we should discuss this now before both the branch and the online edition drift further apart. I don't have a problem to revert the above change, though if that is the consensus and a solution can be found that is easier to merge. Regards Benedict -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEJd/AACgkQTSZQLkqBk0h5MACg1pCso0sDYuO3EJazwKLkzS5p 9+sAoI97m8T8Sru3zS3/afLMTNVNJIoL =7ZdP -----END PGP SIGNATURE----- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:56:10 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C3AE8C78; Wed, 30 Jan 2013 19:56:10 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 5900E1C0; Wed, 30 Jan 2013 19:56:10 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 81DCC14D250B; Wed, 30 Jan 2013 20:56:08 +0100 (CET) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id VUsCH5NCWojR; Wed, 30 Jan 2013 20:56:07 +0100 (CET) Received: from [192.168.1.100] (5403A6BE.catv.pool.telekom.hu [84.3.166.190]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 8FBB014D2410; Wed, 30 Jan 2013 20:56:07 +0100 (CET) Message-ID: <51097ADA.6050405@FreeBSD.org> Date: Wed, 30 Jan 2013 20:56:10 +0100 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: bcr@FreeBSD.org Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> <510977F0.2040106@FreeBSD.org> In-Reply-To: <510977F0.2040106@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:56:10 -0000 Em 30-01-2013 20:43, Benedict Reuschling escreveu: > Well, there is the WITH_PGPKEYS variable that just uses the > fingerprints for the print version. I could revert the above change, > no problem. > > But what about other chapters? I'm working on removing the 8.x install > chapter in that branch since the print edition will only cover 9.x. > There are still many links to the old install chapter in many parts of > the handbook. I planned to update them all to point to the bsdinstall > chapter. However, it might make sense (not just for this chapter) to > just keep links to old chapters in the online version that are removed > in the print edition. I don't know how difficult it would be to add > such a profiling attribute to every such link, but I guess it would be. > > I'm in favour of a single source solution, especially for merges back > to the online version. Right now, we try to put all changes that make > sense to both head and the book branch. However, there are going to be > changes (like deleting non-9.x content) that will be made to the book > branch sooner while keeping it for the online handbook. Of course this > makes merging difficult later on. But my view on this is that at one > point the print edition will become the new online version of the > handbook, so everything that we delete now for the book will also be > deleted for the online edition. The PGPkeys chapter can be reactivated > easier than other changes. But I think we should discuss this now > before both the branch and the online edition drift further apart. > > I don't have a problem to revert the above change, though if that is > the consensus and a solution can be found that is easier to merge. It would be very easy, practically just putting an attribute to the varlistentry and the pgpkeys sect1, something like edition="online". I think we should think of future print editions and benefit from this tidying that we are doing now to make the infrastructure capable of dealing with this. If we maintain two branches and de- and reactivate things, it can easily lead to wasting manpower and forgetting things like post cleanup and putting things back to their places. I'm working on some serious changes towards real XML toolset in a branch and it is very easy to add a custom profiling attribute like edition. For the meantime to avoid deferring the cleanup work on the content, you could use an existing attribute, like condition="online" or condition="print". Later on we can go back and refine things. Any thoughts from others? Gabor From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 19:58:38 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 88951CD7; Wed, 30 Jan 2013 19:58:38 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) by mx1.freebsd.org (Postfix) with ESMTP id 62A461D0; Wed, 30 Jan 2013 19:58:38 +0000 (UTC) Received: from epsilon.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by anubis.delphij.net (Postfix) with ESMTPSA id D46C123571; Wed, 30 Jan 2013 11:58:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=delphij.net; s=anubis; t=1359575912; bh=ECj32IJxzbDGTCiqat1WydVZfC9szw/wf/vT2AimkGw=; h=Date:From:Reply-To:To:CC:Subject:References:In-Reply-To; b=HhqWWvGnYd9FDWbqe/wA0cWeO7S6RwsD++DUECR3aL/VXh+2K9YHGsN6nZqCYWS5l zKXFpdwzboVa5IYlI1rCbvHtLmjKXWSzDJBaEb8NrtmXFvZY+tiLeoF1x/meP92vWL L7CW/vHYRSENX9YYOpAYqzXQIOWl3Jv50tYk79d8= Message-ID: <51097B66.7080706@delphij.net> Date: Wed, 30 Jan 2013 11:58:30 -0800 From: Xin Li Organization: The FreeBSD Project MIME-Version: 1.0 To: Benedict Reuschling Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> In-Reply-To: <201301301901.r0UJ1YY6051367@svn.freebsd.org> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@freebsd.org, doc-committers@freebsd.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: d@delphij.net List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 19:58:38 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 01/30/13 11:01, Benedict Reuschling wrote: > Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 URL: > http://svnweb.freebsd.org/changeset/doc/40831 > > Log: Deactivate the build of the PGP Keys section from the > appendix. This will not be part of the print edition, but will > still be kept in the online version. Wouldn't that defeat the purpose of having the PGP keys in handbook? Cheers, - -- Xin LI https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJRCXtmAAoJEG80Jeu8UPuziqgH/AxmRA2ieVtkhb4mWKGdDCRh F3z+X3SSDfsHU6gcwuJ2eMJUMDDWGg7yBYGVGF65yVwmpBQp4deGy4ASO28qmY81 HneM3oR7UBeRyYYkoIcFlSDUUalsbPsngI6UxcsJ+TBxuicB2GPXrzLjeMNjU/pq K7DhmHU2BrDDtPY5phLIlbyRD5m4WueR1OMParou4K8HCFSquX31uIwxJWCNX/aR 8Q3Hflqe6AjienY9PpbgTYHom8t/r0DvRzKgi4xMpkQvfkBHhzSBoP2eV4J3pcDp 14Nn+dCA5+huecfhrjolzsN3bKGJ4h+cPy/vCmLzKy0IMLRMX1TbSK8X5zJ+Y30= =4I7Z -----END PGP SIGNATURE----- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 20:11:33 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 26C4934C; Wed, 30 Jan 2013 20:11:33 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EE692277; Wed, 30 Jan 2013 20:11:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UKBW3X073883; Wed, 30 Jan 2013 20:11:32 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UKBVHZ073867; Wed, 30 Jan 2013 20:11:31 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301302011.r0UKBVHZ073867@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 20:11:31 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40834 - in projects/xml-tools: en_US.ISO8859-1/articles/fbsd-from-scratch en_US.ISO8859-1/articles/pam es_ES.ISO8859-1/articles/fbsd-from-scratch fr_FR.ISO8859-1/articles/pam ja_JP.euc... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 20:11:33 -0000 Author: gabor Date: Wed Jan 30 20:11:31 2013 New Revision: 40834 URL: http://svnweb.freebsd.org/changeset/doc/40834 Log: - Use XInclude to include text files instead of since such inclusion is not supported in standard XSLT and xsltproc provides no extensions for that Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -4,7 +4,7 @@ FreeBSD From Scratch"> ]> -
+
FreeBSD From Scratch @@ -381,7 +381,7 @@ Do you wish to delete what is left of /v which you need to modify substantially. The comments give you enough information what to change. - + Download stage_1.conf.default @@ -485,7 +485,7 @@ news inn-stable CONFIGURE_ARGS="-- LOGDIR/category+port is created for each port it actually installs. - + Download stage_2.conf.default. @@ -586,7 +586,7 @@ fi url="stage_1.sh">stage_1.sh script, which you should not need to modify. - + Download stage_1.sh. @@ -596,7 +596,7 @@ fi script. You may want to modify the variables at the beginning. - + Download stage_2.sh. @@ -605,7 +605,7 @@ fi url="stage_3.mk">stage_3.mk to give you an idea how to automate all reconfiguration. - + Download stage_3.mk. Modified: projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -36,7 +36,7 @@ - SUCH DAMAGE. --> -
+
Pluggable Authentication Modules @@ -1234,8 +1234,7 @@ sshd password required pam_permit.so - + @@ -1248,8 +1247,7 @@ sshd password required pam_permit.so - + @@ -1265,8 +1263,7 @@ sshd password required pam_permit.so - + Modified: projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -4,7 +4,7 @@ FreeBSD From Scratch"> ]> -
+
FreeBSD From Scratch @@ -470,7 +470,8 @@ Do you wish to delete what is left of /v dispositivos como corresponda. - + Descargue fase_1.sh. @@ -586,7 +587,8 @@ news inn-stable CONFIGURE_ARGS="--enable compartida no olvide copiarlo al sistema nuevo antes de arrancarlo. - + Descargue fase_2.sh. @@ -624,7 +626,8 @@ news inn-stable CONFIGURE_ARGS="--enable partición compartida bien copiándolo en algún lugar dentro del nuevo sistema. - + Descargue fase_3.mk. Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -36,7 +36,7 @@ - SUCH DAMAGE. --> -
+
Pluggable Authentication Modules @@ -1218,8 +1218,7 @@ sshd password required pam_permit.so - + @@ -1236,8 +1235,7 @@ sshd password required pam_permit.so - + @@ -1256,9 +1254,7 @@ sshd password required pam_permit.so - - + Modified: projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -9,7 +9,7 @@ Original revision: 1.11 --> -
+
FreeBSD ¤ò¥¼¥í¤«¤éÀßÄꤹ¤ë¤Ë¤Ï @@ -430,7 +430,9 @@ Do you wish to delete what is left of /v ¥Ç¥Ð¥¤¥¹Ì¾¤ÎÊѹ¹¤ÏÃí°Õ¿¼¤¯¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£ - + + + ¥À¥¦¥ó¥í¡¼¥É: stage_1.conf.default @@ -536,7 +538,9 @@ news inn-stable CONFIGURE_ARGS="--enable LOGDIR/category+port ¤È¤¤¤¦Ì¾Á°¤Î¥í¥°¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£ - + + + ¥À¥¦¥ó¥í¡¼¥É: stage_2.conf.default. @@ -672,7 +676,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh">stage_1.sh ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ÆâÍƤòÊѹ¹¤¹¤ëɬÍפϤʤ¤¤Ç¤·¤ç¤¦¡£ - + + + ¥À¥¦¥ó¥í¡¼¥É: stage_1.sh. @@ -681,7 +687,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh">stage_2.sh ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ºÇ½é¤ÎÉôʬ¤Ë¤¢¤ëÊÑ¿ô¤òÊѹ¹¤·¤Þ¤·¤ç¤¦¡£ - + + + ¥À¥¦¥ó¥í¡¼¥É: stage_2.sh. @@ -690,7 +698,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk">stage_3.mk ¤Ç¤¹¡£ ÀßÄê¤ò¼«Æ°Åª¤Ë¤ª¤³¤Ê¤¦¤¿¤á¤Î¼ê½ç¤ò¡¢¤³¤³¤ËÆþ¤ì¤Þ¤¹¡£ - + + + ¥À¥¦¥ó¥í¡¼¥É: stage_3.mk. Modified: projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -12,7 +12,7 @@ Original revision: r33355 --> -
+
FreeBSD "Ó ÎÕÌÑ" @@ -407,7 +407,9 @@ Do you wish to delete what is left of /v ÐÏÔÏÍ ÓÕÝÅÓÔ×ÅÎÎÏ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ. ÷ ËÏÍÍÅÎÔÁÒÉÑÈ ÄÁ£ÔÓÑ ÄÏÓÔÁÔÏÞÎÏ ÉÎÆÏÒÍÁÃÉÉ Ï ÔÏÍ, ÞÔÏ ÎÅÏÂÈÏÄÉÍÏ ÉÚÍÅÎÉÔØ. - + + + óËÁÞÁÊÔÅ stage_1.conf.default. @@ -515,7 +517,9 @@ news inn-stable CONFIGURE_ARGS="-- ËÁÖÄÏÇÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÉÍ ÐÏÒÔÁ ÓÏÚÄÁ£ÔÓÑ ÆÁÊÌ ÐÒÏÔÏËÏÌÁ LOGDIR/category+port. - + + + óËÁÞÁÊÔÅ stage_2.conf.default. @@ -617,7 +621,9 @@ fi stage_1.sh, ËÏÔÏÒÙÊ ×Ù ÎÅ ÄÏÌÖÎÙ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ. - + + + óËÁÞÁÊÔÅ stage_1.sh. @@ -626,7 +632,9 @@ fi url="stage_2.sh">stage_2.sh. ÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÉÚÍÅÎÉÔØ ÐÅÒÅÍÅÎÎÙÅ × ÓÁÍÏÍ ÎÁÞÁÌÅ ÆÁÊÌÁ. - + + + óËÁÞÁÊÔÅ stage_2.sh. @@ -635,7 +643,9 @@ fi url="stage_3.mk">stage_3.mk, ËÏÔÏÒÙÊ ÄÁÓÔ ×ÁÍ ÉÄÅÀ Ï ÔÏÍ, ËÁË Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÔØ ×ÓÀ ÐÏ×ÔÏÒÎÕÀ ËÏÎÆÉÇÕÒÁÃÉÀ. - + + + óËÁÞÁÊÔÅ stage_3.mk. Modified: projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -1272,8 +1272,9 @@ sshd password required p endterm="pam-sample-conv.title">, ÈÏÒÏÛÁ × ËÁÞÅÓÔ×Å ÏÔÐÒÁ×ÎÏÊ ÔÏÞËÉ, ÎÏ × ÒÅÁÌØÎÙÈ ÐÒÉÌÏÖÅÎÉÑÈ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÎÅ ÍÏÖÅÔ. - + + + @@ -1286,8 +1287,9 @@ sshd password required p ÆÕÎËÃÉÉ &man.pam.get.authtok.3;, ËÏÔÏÒÁÑ ËÁÒÄÉÎÁÌØÎÏ ÕÐÒÏÝÁÅÔ ÏÒÇÁÎÉÚÁÃÉÀ ××ÏÄÁ ÐÁÒÏÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÍ. - + + + @@ -1303,8 +1305,9 @@ sshd password required p ÃÅÌÑÈ; ÍÙ ÎÁÄÅÅÍÓÑ, ÞÔÏ ÏÎÁ ÄÏÓÔÁÔÏÞÎÏ ÎÁÄ£ÖÎÁ × ËÁÞÅÓÔ×Å ÆÕÎËÃÉÉ ÄÌÑ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÑ Ó ÔÅÒÍÉÎÁÌØÎÙÍÉ ÕÓÔÒÏÊÓÔ×ÁÍÉ. - + + + Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 20:11:31 2013 (r40834) @@ -149,7 +149,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbo COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -XSLTPROCFLAGS?= --nonet +XSLTPROCFLAGS?= --nonet --xinclude XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 20:17:40 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1EAC8516; Wed, 30 Jan 2013 20:17:40 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout3.bln1.prohost.de (mxout3.bln1.prohost.de [213.160.84.49]) by mx1.freebsd.org (Postfix) with ESMTP id 88A8B2E0; Wed, 30 Jan 2013 20:17:39 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC72946.dip.t-dialin.net [79.199.41.70]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id r0UKHK3j031293 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Jan 2013 21:17:24 +0100 Message-ID: <51097FD6.20100@FreeBSD.org> Date: Wed, 30 Jan 2013 21:17:26 +0100 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: d@delphij.net Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51097B66.7080706@delphij.net> In-Reply-To: <51097B66.7080706@delphij.net> X-Enigmail-Version: 1.5 OpenPGP: id=4A819348 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Null-Tag: 8acd892ca06a6451e9652487e969ddcc Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 20:17:40 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 30.01.13 20:58, schrieb Xin Li: > On 01/30/13 11:01, Benedict Reuschling wrote: >> Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 >> URL: http://svnweb.freebsd.org/changeset/doc/40831 > >> Log: Deactivate the build of the PGP Keys section from the >> appendix. This will not be part of the print edition, but will >> still be kept in the online version. > > Wouldn't that defeat the purpose of having the PGP keys in > handbook? > Hmm, the commit message could be interpreted as reverse logic, now that I reread it. What I meant was that the PGP keys don't make sense in a printed book. No one will pull out their print edition to verify an email from a FreeBSD developer. :) In the online version hwoever, it does make sense to have them (although we could debate having them on a separate webpage on www.freebsd.org) in case someone needs to copy/paste/verify keys. Keys are also easier to update online rather than release a new print edition just to update the keys, right? I hope that answers your question. Regards Benedict Reuschling FreeBSD Documentation Committer The FreeBSD Documentation Project FreeBSD German Documentation Project - https://doc.bsdgroup.de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEJf9UACgkQTSZQLkqBk0iVFwCeIymR4+2TfNkakvGLKog5jiuW DkwAoI2MUgI72rzCizC8T6UKA3eINSmt =/1ZM -----END PGP SIGNATURE----- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 20:17:44 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C79C9519; Wed, 30 Jan 2013 20:17:44 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B8D7E2E2; Wed, 30 Jan 2013 20:17:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UKHiF4074815; Wed, 30 Jan 2013 20:17:44 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UKHiQf074810; Wed, 30 Jan 2013 20:17:44 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301302017.r0UKHiQf074810@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 30 Jan 2013 20:17:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40835 - in projects/xml-tools: da_DK.ISO8859-1/share/xml mn_MN.UTF-8/share/xml pl_PL.ISO8859-2/share/xml pt_BR.ISO8859-1/share/xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 20:17:44 -0000 Author: gabor Date: Wed Jan 30 20:17:43 2013 New Revision: 40835 URL: http://svnweb.freebsd.org/changeset/doc/40835 Log: - Fix some copy-paste bugs Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog.xml projects/xml-tools/mn_MN.UTF-8/share/xml/catalog.xml projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog.xml projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog.xml Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog.xml ============================================================================== --- projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog.xml Wed Jan 30 20:11:31 2013 (r40834) +++ projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog.xml Wed Jan 30 20:17:43 2013 (r40835) @@ -2,10 +2,7 @@ - + - + - + - + Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 05127D58; Wed, 30 Jan 2013 20:54:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id AE4EF67E; Wed, 30 Jan 2013 20:54:14 +0000 (UTC) Received: from glenbarber.us (75-146-225-65-Philadelphia.hfc.comcastbusiness.net [75.146.225.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id 131CE23F654; Wed, 30 Jan 2013 15:54:12 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 131CE23F654 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none (insecure policy) Date: Wed, 30 Jan 2013 15:54:09 -0500 From: Glen Barber To: Gabor Kovesdan Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface Message-ID: <20130130205409.GK1402@glenbarber.us> References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ai3I8gwHc37+ASRI" Content-Disposition: inline In-Reply-To: <51096FC6.2000205@FreeBSD.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-doc-projects@freebsd.org, Benedict Reuschling , doc-committers@freebsd.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 20:54:15 -0000 --ai3I8gwHc37+ASRI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 30, 2013 at 08:08:54PM +0100, Gabor Kovesdan wrote: > Em 30-01-2013 20:01, Benedict Reuschling escreveu: > > Author: bcr > > Date: Wed Jan 30 19:01:33 2013 > > New Revision: 40831 > > URL:http://svnweb.freebsd.org/changeset/doc/40831 > > > > Log: > > Deactivate the build of the PGP Keys section from the appendix. > > This will not be part of the print edition, but will still be > > kept in the online version. > Are you sure that this is the best way of doing this? This will make=20 > merges more difficult. I don't know if it has been discussed somewhere=20 > but I'd prefer a single-source solution. We could add a custom profiling= =20 > attribute for online or print-only chunks. >=20 As a more immediate solution, what if we use something like this for changes that should not be merged back to head/ ? MFC after: none Glen --ai3I8gwHc37+ASRI Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJRCYhxAAoJEFJPDDeguUaju7cH/2EpoHzeRO8Clp0k8hLeGSvr orzBoS1RWLaJTVny4lSgH/H+7PuHh1/aTeSTM3RXBtN/VNGv1cM0PXE3WwJpq6Lm 2f6kYnmoJ3XN7/qGuxK/Tx5Lq1evp//rPL8O25NWl+HBWLF+DLeiK2ez5zJcfzq0 n0hfhtDHrSz1gyvCvocFdD44Y5xlr0tj91/1Ahh4rgS3t299uxwUjZW4qQ8e1JHV 0k2zToyyGh9/mA00LAaGTyQpFjC5UZIGvRBIYL1HwINDkt2vNbnn+XYg/aPY0wE2 6bqhrBQYqpNXUHu8Wd5Wek1H2nfdPj0DCR1hVQXclOqyjTOo0BUqTZkIvNLx06A= =t+N+ -----END PGP SIGNATURE----- --ai3I8gwHc37+ASRI-- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 21:31:10 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B72F05E7; Wed, 30 Jan 2013 21:31:10 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout3.bln1.prohost.de (mxout3.bln1.prohost.de [213.160.84.49]) by mx1.freebsd.org (Postfix) with ESMTP id 42053804; Wed, 30 Jan 2013 21:31:09 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC71B0F.dip.t-dialin.net [79.199.27.15]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id r0ULV0pI027972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Jan 2013 22:31:01 +0100 Message-ID: <5109911B.8050503@FreeBSD.org> Date: Wed, 30 Jan 2013 22:31:07 +0100 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Glen Barber Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> <20130130205409.GK1402@glenbarber.us> In-Reply-To: <20130130205409.GK1402@glenbarber.us> X-Enigmail-Version: 1.5 OpenPGP: id=4A819348 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Null-Tag: d430172bedbd2025d69c64f6a4c6df5a Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org, Gabor Kovesdan X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 21:31:10 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 30.01.13 21:54, schrieb Glen Barber: > On Wed, Jan 30, 2013 at 08:08:54PM +0100, Gabor Kovesdan wrote: >> Em 30-01-2013 20:01, Benedict Reuschling escreveu: >>> Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 >>> URL:http://svnweb.freebsd.org/changeset/doc/40831 >>> >>> Log: Deactivate the build of the PGP Keys section from the >>> appendix. This will not be part of the print edition, but will >>> still be kept in the online version. >> Are you sure that this is the best way of doing this? This will >> make merges more difficult. I don't know if it has been discussed >> somewhere but I'd prefer a single-source solution. We could add a >> custom profiling attribute for online or print-only chunks. >> > > As a more immediate solution, what if we use something like this > for changes that should not be merged back to head/ ? > > MFC after: none > Rather MTC ("to" instead of "from" head), from the perspective of the branch that is. ;) We could do that. It requires going through each individual commit made to the branch when merging it back and figure out what to do with it depending on the commit message. It also does not put any pressure on translators. With the attribute solution (which I'm also in favour of) that Gabor proposed (condition="online" vs. condition="print"), these need to be put into translations as well, without having an immediate (visual) benefit for translations. To reduce the actual work of doing changes in the translated versions (except bumping revisions), the commit message approach is cleaner. That is, if we decide to translate the printed version. But when merging them back to the online handbook, translators would have to pick them up and integrate them. However, I'm also seeing that Gabor's solution is a more programatical way (using XSLT) of dealing with the problem, which also has its benefits. I'm undecided at the moment, I guess extra work for either side (translators or people doing the merges) is unavoidable. Benedict -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEJkRsACgkQTSZQLkqBk0jXmgCg0sopbur6kW8/vizZsylJ5yCo EgEAoIddKXhxofSQcaK8bsn2tybpioOY =P2kr -----END PGP SIGNATURE----- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 21:39:40 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 002CE927; Wed, 30 Jan 2013 21:39:39 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id B137A860; Wed, 30 Jan 2013 21:39:39 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id D8CD914D2509; Wed, 30 Jan 2013 22:39:37 +0100 (CET) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 8YKOcIEjYQoE; Wed, 30 Jan 2013 22:39:37 +0100 (CET) Received: from [192.168.1.100] (5403A6BE.catv.pool.telekom.hu [84.3.166.190]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id CCE1514D2410; Wed, 30 Jan 2013 22:39:35 +0100 (CET) Message-ID: <5109931A.3060004@FreeBSD.org> Date: Wed, 30 Jan 2013 22:39:38 +0100 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Hiroki Sato Subject: Re: svn commit: r40828 - projects/xml-tools/share/mk References: <201301301636.r0UGaxfp005660@svn.freebsd.org> <20130131.043818.1230294862713909520.hrs@allbsd.org> In-Reply-To: <20130131.043818.1230294862713909520.hrs@allbsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 21:39:40 -0000 Em 30-01-2013 20:38, Hiroki Sato escreveu: > ga> +${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ > ga> + ${CSS_SHEET} > ga> + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml > ga> + ${ECHO} "application/epub+zip" > mimetype > ga> + ${CP} ${CSS_SHEET} OEBPS/ > ga> + zip -0Xq ${DOC}.epub mimetype > ga> + zip -Xr9D ${DOC}.epub OEBPS META-INF > > I like to use bsdtar(1) to create a zip archive if possible. Sure, I'll polish it later, it is just an experimental support for now. Practically I'd have written ${ZIP} but those variables are defined in an unconventional way in the doc repo. Gabor From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 21:42:29 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E84D993; Wed, 30 Jan 2013 21:42:29 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) by mx1.freebsd.org (Postfix) with ESMTP id 33FF2886; Wed, 30 Jan 2013 21:42:29 +0000 (UTC) Received: from epsilon.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by anubis.delphij.net (Postfix) with ESMTPSA id D8EE423A1B; Wed, 30 Jan 2013 13:42:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=delphij.net; s=anubis; t=1359582148; bh=0Wxjbdyj0KTUzxJJpp534sHfTCJuWoQl7Amo+qPuQRY=; h=Date:From:Reply-To:To:CC:Subject:References:In-Reply-To; b=YUCTdzDtCk1+Xda5dJ7gpiaKSlm1qbC2BfnjEJR5vfWBU6wV/rSkrNUoC/n+aMkK+ eTXlo5gKlNFemSBhJWR7fUFomme1JqfbUDYVNhpvRMGNHVp1ZuRgBC9xJV1Rg2FA3i xXpxqktHR2NsVMx+T0lI3ajZCjQAE8E/1IfXiNcw= Message-ID: <510993C4.8050400@delphij.net> Date: Wed, 30 Jan 2013 13:42:28 -0800 From: Xin Li Organization: The FreeBSD Project MIME-Version: 1.0 To: bcr@FreeBSD.org Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51097B66.7080706@delphij.net> <51097FD6.20100@FreeBSD.org> In-Reply-To: <51097FD6.20100@FreeBSD.org> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org, d@delphij.net X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: d@delphij.net List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 21:42:29 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 01/30/13 12:17, Benedict Reuschling wrote: > Am 30.01.13 20:58, schrieb Xin Li: >> On 01/30/13 11:01, Benedict Reuschling wrote: >>> Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 >>> URL: http://svnweb.freebsd.org/changeset/doc/40831 > >>> Log: Deactivate the build of the PGP Keys section from the >>> appendix. This will not be part of the print edition, but will >>> still be kept in the online version. > >> Wouldn't that defeat the purpose of having the PGP keys in >> handbook? > > > Hmm, the commit message could be interpreted as reverse logic, now > that I reread it. > > What I meant was that the PGP keys don't make sense in a printed > book. No one will pull out their print edition to verify an email > from a FreeBSD developer. :) > > In the online version hwoever, it does make sense to have them > (although we could debate having them on a separate webpage on > www.freebsd.org) in case someone needs to copy/paste/verify keys. > Keys are also easier to update online rather than release a new > print edition just to update the keys, right? > > I hope that answers your question. That is exactly what I am concerned about. The reason why PGP keys should appear in printed book and DVDs is that this establishes a way to start your trust chain with. It's wrong to blindly trust www.freebsd.org to be offering the right keys. At very least, the book should have public key for the "Officers", and probably also the fingerprint part of everyone's public key but with public block part omitted. Cheers, - -- Xin LI https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJRCZPEAAoJEG80Jeu8UPuzz+IIALfB1l+rovXRXRjYuRIIisaH ijmYaBjahaHA75xn4va5JnraIcjrrGXi6oB+MbRBb/+v2aqRzJtxHcjc5Gxf3Yir xwWvOEX1ME1MRvOZHEzpb4WX9kp7y44onjr1PGaXUTQiGUH6zi/ihOpk23kkO7x/ UbKvfKk+2m2D7w/MS7LowHTmZAOsNudmyqJkOnU6kKkHAVsBwtzcU6cUrbIR+hRz hbso2JB2meb2kqe6Eno7O1QiyhYNhoSJ17Vmi+F6HMh3whAoUJW2vpN9bWJkXAGS ldLzAYYof7bDF/9FVmWBB1BqBLLfeK+Tpassl+/FBG4gFT50TuvagR2YMhPr8Mc= =4o33 -----END PGP SIGNATURE----- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 21:56:05 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4F42C143; Wed, 30 Jan 2013 21:56:05 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) by mx1.freebsd.org (Postfix) with ESMTP id A9AD193F; Wed, 30 Jan 2013 21:56:04 +0000 (UTC) Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp [118.7.212.137]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r0ULtdWA083738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 31 Jan 2013 06:55:49 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0) by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id r0ULtcum068868; Thu, 31 Jan 2013 06:55:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Thu, 31 Jan 2013 06:52:03 +0900 (JST) Message-Id: <20130131.065203.1737088678425108725.hrs@allbsd.org> To: bcr@FreeBSD.org, d@delphij.net, delphij@delphij.net Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface From: Hiroki Sato In-Reply-To: <510993C4.8050400@delphij.net> References: <51097B66.7080706@delphij.net> <51097FD6.20100@FreeBSD.org> <510993C4.8050400@delphij.net> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Thu_Jan_31_06_52_03_2013_321)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Thu, 31 Jan 2013 06:55:49 +0900 (JST) X-Spam-Status: No, score=-98.1 required=13.0 tests=CONTENT_TYPE_PRESENT, ONLY1HOPDIRECT,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 21:56:05 -0000 ----Security_Multipart(Thu_Jan_31_06_52_03_2013_321)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Xin Li wrote in <510993C4.8050400@delphij.net>: de> That is exactly what I am concerned about. de> de> The reason why PGP keys should appear in printed book and DVDs is that de> this establishes a way to start your trust chain with. It's wrong to de> blindly trust www.freebsd.org to be offering the right keys. de> de> At very least, the book should have public key for the "Officers", and de> probably also the fingerprint part of everyone's public key but with de> public block part omitted. Agreed. The 2nd Edition included key fingerprint part only, JFYI. I recommend to read share/xml/freebsd-print.dsl more carefully to understand issues when creating a printed edition and avoid reinventing the wheel. -- Hiroki ----Security_Multipart(Thu_Jan_31_06_52_03_2013_321)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAlEJlgMACgkQTyzT2CeTzy2KiACfUgdWHbEms0I1/UmZH00CppTs oTIAoJmKa6KWgGkDVbLsjTt5On1CBETO =3nSP -----END PGP SIGNATURE----- ----Security_Multipart(Thu_Jan_31_06_52_03_2013_321)---- From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 23:21:03 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 173FC275 for ; Wed, 30 Jan 2013 23:21:03 +0000 (UTC) (envelope-from dru.lavigne@att.net) Received: from nm20-vm0.access.bullet.mail.sp2.yahoo.com (nm20-vm0.access.bullet.mail.sp2.yahoo.com [98.139.44.174]) by mx1.freebsd.org (Postfix) with ESMTP id D3549CD7 for ; Wed, 30 Jan 2013 23:21:02 +0000 (UTC) Received: from [98.139.44.98] by nm20.access.bullet.mail.sp2.yahoo.com with NNFMP; 30 Jan 2013 23:21:02 -0000 Received: from [98.139.44.89] by tm3.access.bullet.mail.sp2.yahoo.com with NNFMP; 30 Jan 2013 23:21:02 -0000 Received: from [127.0.0.1] by omp1026.access.mail.sp2.yahoo.com with NNFMP; 30 Jan 2013 23:21:02 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 238234.76794.bm@omp1026.access.mail.sp2.yahoo.com Received: (qmail 71450 invoked by uid 60001); 30 Jan 2013 23:21:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1359588062; bh=+ClemNjQD15xrqPXuBzExIwMt7gLnFsebGVt0UnndZ0=; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:Message-ID:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=cjo7VFFHVsVjfX/hxMriPbHat9p1iftgbRrAksteVtN+QuBTiOG3Gp8KrpCCOw5OgdLWJ3Kjl1H+IN5uzNbD2hLZCjjPQfhxEyxYrJFGsxURvFwN1rVrQXSYC/hHw+hhB0wz6FtmDLbFB45V5kC1mAviTEcuznEuU1uOoIzUp5A= X-YMail-OSG: fttxf6oVM1kFXHhi2FrcShn4orA6e.2iY38mm8H510sb7sF Lfziid4bmFyKFKn6mvDLTBqy8_oeNgMPr0PYbI7FCEld_QNpBcFfZ_zHYpM0 YZgp8XKHanrXvcv4JQFB39g6ofdpAOaS5zKe7hLNlmxj6e2obqXlv68kxtX_ oYynJpZUJQUgqJ.Qp9kWDihjp6KKVo9b38WJO7fx0Ft7xq96N_JpyBdSp0cu n6pSAS1FKxHrdCEqqsqA0wVCM9ZlCYpSkcVtHRCmnSm51w5BtFKHG8NJcgrX qqYC0BHW4vz8dZzgoJ6rjO.j1oWV8HJLGonAjyXoSTdLs_9JPD9bU626fxZh LyH_dQ7vnqdfKjzzcEHu.RVO0018PwhuJzMs7YgIDRrxRd4g9MIDZXbGVj0N fC6OKF3sZBKL1HbGyjUIgTAMHTE8D_EM.BL_nHQDTUd2GvALaA5ByG80bIow 7gpM3Rtc1PHX_WaI6KM_0R3OP9Ct.zbkBpB8qa5UP_NnEfQBQGUASRYFdRy2 C_R6nGA-- Received: from [99.98.83.69] by web184903.mail.gq1.yahoo.com via HTTP; Wed, 30 Jan 2013 15:21:01 PST X-Rocket-MIMEInfo: 001.001, CgotLS0gT24gV2VkLCAxLzMwLzEzLCBYaW4gTGkgPGRlbHBoaWpAZGVscGhpai5uZXQ.IHdyb3RlOgo.IE9uIDAxLzMwLzEzIDEyOjE3LCBCZW5lZGljdCBSZXVzY2hsaW5nIHdyb3RlOgo.ID4gQW0gMzAuMDEuMTMgMjA6NTgsIHNjaHJpZWIgWGluIExpOgo.ID4.IE9uIDAxLzMwLzEzIDExOjAxLCBCZW5lZGljdCBSZXVzY2hsaW5nIHdyb3RlOgo.ID4.PiBBdXRob3I6IGJjciBEYXRlOiBXZWQgSmFuIDMwIDE5OjAxOjMzIDIwMTMgTmV3Cj4gUmV2aXNpb246IDQwODMxIAo.ID4.PiBVUkw6IGh0dHA6Ly9zdm4BMAEBAQE- X-Mailer: YahooMailClassic/15.1.2 YahooMailWebService/0.8.131.499 Message-ID: <1359588061.32525.YahooMailClassic@web184903.mail.gq1.yahoo.com> Date: Wed, 30 Jan 2013 15:21:01 -0800 (PST) From: Dru Lavigne Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface To: bcr@FreeBSD.org, d@delphij.net In-Reply-To: <510993C4.8050400@delphij.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org, d@delphij.net X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 23:21:03 -0000 =0A=0A--- On Wed, 1/30/13, Xin Li wrote:=0A> On 01/30= /13 12:17, Benedict Reuschling wrote:=0A> > Am 30.01.13 20:58, schrieb Xin = Li:=0A> >> On 01/30/13 11:01, Benedict Reuschling wrote:=0A> >>> Author: bc= r Date: Wed Jan 30 19:01:33 2013 New=0A> Revision: 40831 =0A> >>> URL: http= ://svnweb.freebsd.org/changeset/doc/40831=0A> > =0A> >>> Log: Deactivate th= e build of the PGP Keys=0A> section from the =0A> >>> appendix. This will n= ot be part of the print=0A> edition, but will=0A> >>>=A0 still be kept in t= he online version.=0A> > =0A> >> Wouldn't that defeat the purpose of having= the PGP=0A> keys in =0A> >> handbook?=0A> > =0A> > =0A> > Hmm, the commit = message could be interpreted as reverse=0A> logic, now =0A> > that I reread= it.=0A> > =0A> > What I meant was that the PGP keys don't make sense in=0A= > a printed=0A> > book. No one will pull out their print edition to=0A> ver= ify an email=0A> > from a FreeBSD developer. :)=0A> > =0A> > In the online = version hwoever, it does make sense to=0A> have them =0A> > (although we co= uld debate having them on a separate=0A> webpage on =0A> > www.freebsd.org)= in case someone needs to=0A> copy/paste/verify keys.=0A> > Keys are also e= asier to update online rather than=0A> release a new=0A> > print edition ju= st to update the keys, right?=0A> > =0A> > I hope that answers your questio= n.=0A> =0A> That is exactly what I am concerned about.=0A> =0A> The reason = why PGP keys should appear in printed book and=0A> DVDs is that=0A> this es= tablishes a way to start your trust chain with.=A0=0A> It's wrong to=0A> bl= indly trust www.freebsd.org to be offering the right=0A> keys.=0A> =0A> At = very least, the book should have public key for the=0A> "Officers", and=0A>= probably also the fingerprint part of everyone's public key=0A> but with= =0A> public block part omitted.=0A=0A=0AMy concern with including the PGP k= eys in the print edition is the 100+ extra pages it adds to an already larg= e volume set. Only including the Officers and the fingerprints of devs woul= d alleviate much of this.=0A=0AThe preface also needs to be edited to inclu= de instructions on how to verify a key and why doing so is important, rathe= r than assuming that the user already knows this.=0A=0AIn the print edition= , is it sufficient to only provide instructions, the links to the fingerpri= nts and keys, and a caveat that the keys displayed on the website should no= t be blindly trusted but rather verified? Or is this pushing too far?=0A=0A= Cheers,=0A=0ADru From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 00:13:10 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 99F3428B; Thu, 31 Jan 2013 00:13:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id 70B30E73; Thu, 31 Jan 2013 00:13:10 +0000 (UTC) Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id 1F63B23F654; Wed, 30 Jan 2013 19:13:09 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 1F63B23F654 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none (insecure policy) Date: Wed, 30 Jan 2013 19:13:07 -0500 From: Glen Barber To: d@delphij.net Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface Message-ID: <20130131001307.GL1402@glenbarber.us> References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51097B66.7080706@delphij.net> <51097FD6.20100@FreeBSD.org> <510993C4.8050400@delphij.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JvUS8mwutKMHKosv" Content-Disposition: inline In-Reply-To: <510993C4.8050400@delphij.net> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-doc-projects@FreeBSD.org, bcr@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 00:13:10 -0000 --JvUS8mwutKMHKosv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 30, 2013 at 01:42:28PM -0800, Xin Li wrote: > The reason why PGP keys should appear in printed book and DVDs is that > this establishes a way to start your trust chain with. It's wrong to > blindly trust www.freebsd.org to be offering the right keys. >=20 > At very least, the book should have public key for the "Officers", and > probably also the fingerprint part of everyone's public key but with > public block part omitted. >=20 I agree some keys should be included (so@, portmgr-secretary@, core-secretary@). IMHO, printing all keys is wasteful. Also, there is the problem of expired keys. For the "trust" issue, one can always build the pgp keys on a trusted system from the doc/ repository, and use that as the keyring import. Glen --JvUS8mwutKMHKosv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJRCbcTAAoJEFJPDDeguUajw0kH/2wkDPmOJ5be2tgSEkD6WbtY avqaQ9d5090es2hOqeSDo5M/+VDtJ8rPfhr2vDrWvbxYQ9KdxMlsAO5EIn+9zfpd ojjhkqrlqQntLFSys6a9XX1/csd8hZOXaZZTahJjym8yHnOx0lbqcpAotKkNPtJF nrqKdoRkjsRTOHb/tNJX1jal4vkkv10YMIlIgQjhVm5b9BQmxpz2l4t+xbOoG3ek NFJikNEw2Gs2/Y8PKxDWrBRQpGZF5unAbN7ZbzG0USMZtSHY6YuUYet7egjky81T wQuFkD4IzQMwRJf3PCAVINo7FVO1yhEOEBLNPkQ7RAxqBkcijYI16t2/zn23BsI= =1oKM -----END PGP SIGNATURE----- --JvUS8mwutKMHKosv-- From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 09:23:42 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2F30C13A; Thu, 31 Jan 2013 09:23:42 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id CF6FB737; Thu, 31 Jan 2013 09:23:41 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 7A9DF14D242D; Thu, 31 Jan 2013 10:23:39 +0100 (CET) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Yy5XcGY4PliM; Thu, 31 Jan 2013 10:23:35 +0100 (CET) Received: from [192.168.1.100] (5403A6BE.catv.pool.telekom.hu [84.3.166.190]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id D4ADD14D2410; Thu, 31 Jan 2013 10:23:35 +0100 (CET) Message-ID: <510A381B.4040502@FreeBSD.org> Date: Thu, 31 Jan 2013 10:23:39 +0100 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: bcr@FreeBSD.org Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> <20130130205409.GK1402@glenbarber.us> <5109911B.8050503@FreeBSD.org> In-Reply-To: <5109911B.8050503@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-doc-projects@FreeBSD.org, Glen Barber , doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 09:23:42 -0000 Em 30-01-2013 22:31, Benedict Reuschling escreveu: > We could do that. It requires going through each individual commit > made to the branch when merging it back and figure out what to do with > it depending on the commit message. It also does not put any pressure > on translators. With the attribute solution (which I'm also in favour > of) that Gabor proposed (condition="online" vs. condition="print"), > these need to be put into translations as well, without having an > immediate (visual) benefit for translations. To reduce the actual work > of doing changes in the translated versions (except bumping > revisions), the commit message approach is cleaner. That is, if we > decide to translate the printed version. But when merging them back to > the online handbook, translators would have to pick them up and > integrate them. I think that the number of online/print marks would be quitelow so would mean a low overhead for translators. It is not true about the version-specific markup but it is a general feature and not just some support for the printed edition. Gabor From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 09:32:02 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AB4A3206; Thu, 31 Jan 2013 09:32:02 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 94136785; Thu, 31 Jan 2013 09:32:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0V9W27T013959; Thu, 31 Jan 2013 09:32:02 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0V9W2lh013957; Thu, 31 Jan 2013 09:32:02 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301310932.r0V9W2lh013957@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 09:32:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40838 - projects/xml-tools/bn_BD.ISO10646-1/share/xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 09:32:02 -0000 Author: gabor Date: Thu Jan 31 09:32:01 2013 New Revision: 40838 URL: http://svnweb.freebsd.org/changeset/doc/40838 Log: - Fix validation in bn_BN Added: projects/xml-tools/bn_BD.ISO10646-1/share/xml/ projects/xml-tools/bn_BD.ISO10646-1/share/xml/catalog.xml (contents, props changed) projects/xml-tools/bn_BD.ISO10646-1/share/xml/entities.ent (contents, props changed) Added: projects/xml-tools/bn_BD.ISO10646-1/share/xml/catalog.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/bn_BD.ISO10646-1/share/xml/catalog.xml Thu Jan 31 09:32:01 2013 (r40838) @@ -0,0 +1,16 @@ + + + + + + + + + + + Added: projects/xml-tools/bn_BD.ISO10646-1/share/xml/entities.ent ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/bn_BD.ISO10646-1/share/xml/entities.ent Thu Jan 31 09:32:01 2013 (r40838) @@ -0,0 +1 @@ + From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 09:55:10 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AFBCC5D9; Thu, 31 Jan 2013 09:55:10 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9EA0A861; Thu, 31 Jan 2013 09:55:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0V9tAad020154; Thu, 31 Jan 2013 09:55:10 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0V9t7Vq020134; Thu, 31 Jan 2013 09:55:07 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301310955.r0V9t7Vq020134@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 09:55:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40839 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handbook hu_HU.ISO8859-2/books/handboo... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 09:55:10 -0000 Author: gabor Date: Thu Jan 31 09:55:07 2013 New Revision: 40839 URL: http://svnweb.freebsd.org/changeset/doc/40839 Log: - Make sure all source files are ready before validation - Make sure all source files are ready before building - Clean up the workarounds from handbook Makefiles Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -326,16 +326,5 @@ SRCS+= mirrors.lastmod.inc \ mirrors.xml.cvsup.index.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -355,16 +355,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -SRCS+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -287,16 +287,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -320,16 +320,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -288,16 +288,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -361,15 +361,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -358,15 +358,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -256,15 +256,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -264,16 +264,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 09:55:07 2013 (r40839) @@ -454,7 +454,7 @@ GEN_INDEX_SGML_CMD?= @${ECHO} "Index is .MAIN: all -all: ${_docs} +all: ${SRCS} ${_docs} # put languages which have a problem on rendering printable formats # by using TeX to NO_TEX_LANG. @@ -668,7 +668,7 @@ ${DOC}.${_curformat}: # having to convert it to any other formats # -lint validate: +lint validate: ${SRCS} ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC} # ------------------------------------------------------------------------ Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -312,16 +312,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: projects/xml-tools/zh_TW.Big5/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Thu Jan 31 09:32:01 2013 (r40838) +++ projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Thu Jan 31 09:55:07 2013 (r40839) @@ -300,16 +300,4 @@ SRCS+= mirrors.lastmod.inc \ eresources.xml.www.inc \ eresources.xml.www.index.inc -CLEANFILES+= mirrors.lastmod.inc \ - mirrors.xml.ftp.inc \ - mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc \ - mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc \ - eresources.xml.www.index.inc - -lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \ - mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \ - eresources.xml.www.inc eresources.xml.www.index.inc - .include "${DOC_PREFIX}/share/mk/doc.project.mk" From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 10:15:47 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5F9DE777; Thu, 31 Jan 2013 10:15:47 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 49611903; Thu, 31 Jan 2013 10:15:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VAFk8D026556; Thu, 31 Jan 2013 10:15:46 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VAFkaQ026555; Thu, 31 Jan 2013 10:15:46 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301311015.r0VAFkaQ026555@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 10:15:46 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40840 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 10:15:47 -0000 Author: gabor Date: Thu Jan 31 10:15:46 2013 New Revision: 40840 URL: http://svnweb.freebsd.org/changeset/doc/40840 Log: - Add epub to KNOWN_FORMATS Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 09:55:07 2013 (r40839) +++ projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 10:15:46 2013 (r40840) @@ -168,7 +168,7 @@ JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CA XSLTPROCOPTS= ${XSLTPROCFLAGS} KNOWN_FORMATS= html html.tar html-split html-split.tar \ - txt rtf ps pdf tex dvi tar pdb + epub txt rtf ps pdf tex dvi tar pdb CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 10:28:00 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0030994C; Thu, 31 Jan 2013 10:27:59 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CF183968; Thu, 31 Jan 2013 10:27:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VARx7F029682; Thu, 31 Jan 2013 10:27:59 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VARxKL029681; Thu, 31 Jan 2013 10:27:59 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301311027.r0VARxKL029681@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 10:27:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40841 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 10:28:00 -0000 Author: gabor Date: Thu Jan 31 10:27:59 2013 New Revision: 40841 URL: http://svnweb.freebsd.org/changeset/doc/40841 Log: - Add experimental support for FOP-based PDF and PS rendering Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 10:15:46 2013 (r40840) +++ projects/xml-tools/share/mk/doc.docbook.mk Thu Jan 31 10:27:59 2013 (r40841) @@ -113,6 +113,9 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml # List of supported SP_ENCODINGs SP_ENCODING_LIST?= ISO-8859-2 KOI8-R +# Either jade or fop +PDFENGINE?= jade + .if defined(SPELLCHECK) DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl .endif @@ -136,6 +139,9 @@ JADE_ENV+= SP_ENCODING=${SP_ENCODING} .endif JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} +FOP?= ${PREFIX}/bin/fop +FOPOPTS?= + DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl @@ -370,14 +376,15 @@ CLEANFILES+= ${DOC}.rtf-nopng CLEANFILES+= ${DOC}.aux ${DOC}.log .elif ${_cf} == "ps" -CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex ${DOC}.tex-tmp +CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \ + ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor .elif ${_cf} == "pdf" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \ - ${DOC}.tex + ${DOC}.tex ${DOC}.fo .for _curimage in ${IMAGES_PDF:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor @@ -564,6 +571,7 @@ ${DOC}.rtf: # PS/PDF ----------------------------------------------------------------- +.if ${PDFENGINE} == "jade" .if !defined(NO_TEX) # # This sucks, but there's no way round it. The PS and PDF formats need @@ -643,6 +651,19 @@ ${DOC}.tex-pdf: .endif .endif +.elif ${PDFENGINE} == "fop" +${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} + ${GEN_INDEX_SGML_CMD} + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.xml > ${.TARGET} + +${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} + ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET} + +${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} + ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET} + +.endif + ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET} ${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \ -C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T} From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 10:30:41 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B2FE0B78; Thu, 31 Jan 2013 10:30:41 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9C6129B3; Thu, 31 Jan 2013 10:30:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VAUfPb030297; Thu, 31 Jan 2013 10:30:41 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VAUfMX030296; Thu, 31 Jan 2013 10:30:41 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301311030.r0VAUfMX030296@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 10:30:41 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40842 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 10:30:41 -0000 Author: gabor Date: Thu Jan 31 10:30:41 2013 New Revision: 40842 URL: http://svnweb.freebsd.org/changeset/doc/40842 Log: - Suppress pubdate output since it usually leads to duplicated $FreeBSD$ keywords in the output Modified: projects/xml-tools/share/xsl/freebsd-common.xsl Modified: projects/xml-tools/share/xsl/freebsd-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-common.xsl Thu Jan 31 10:27:59 2013 (r40841) +++ projects/xml-tools/share/xsl/freebsd-common.xsl Thu Jan 31 10:30:41 2013 (r40842) @@ -12,6 +12,8 @@ + + From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 11:02:24 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2FF0019F; Thu, 31 Jan 2013 11:02:24 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F3025B3F; Thu, 31 Jan 2013 11:02:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VB2Nv3040733; Thu, 31 Jan 2013 11:02:23 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VB2N0A040731; Thu, 31 Jan 2013 11:02:23 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201301311102.r0VB2N0A040731@svn.freebsd.org> From: Benedict Reuschling Date: Thu, 31 Jan 2013 11:02:23 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40843 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 11:02:24 -0000 Author: bcr Date: Thu Jan 31 11:02:23 2013 New Revision: 40843 URL: http://svnweb.freebsd.org/changeset/doc/40843 Log: Revert my change of deactivating the pgpkeys chapter. Several people pointed out the need for at least a small subset of keys/fingerprints in the print edition. Also, this has been dealt with in the past using conditionals rather than just deleting/commenting out parts of the handbook just for the printed version. Pointed out by: gabor, delphij, hrs Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile Thu Jan 31 10:30:41 2013 (r40842) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile Thu Jan 31 11:02:23 2013 (r40843) @@ -276,7 +276,7 @@ SRCS+= mail/chapter.xml SRCS+= mirrors/chapter.xml SRCS+= multimedia/chapter.xml SRCS+= network-servers/chapter.xml -#SRCS+= pgpkeys/chapter.xml +SRCS+= pgpkeys/chapter.xml SRCS+= ports/chapter.xml SRCS+= ppp-and-slip/chapter.xml SRCS+= preface/preface.xml Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Thu Jan 31 10:30:41 2013 (r40842) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml Thu Jan 31 11:02:23 2013 (r40843) @@ -572,6 +572,12 @@ &os;. + + , PGP Keys + + Lists the PGP fingerprints of several &os; Developers. + + Conventions used From owner-svn-doc-projects@FreeBSD.ORG Thu Jan 31 22:48:55 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 347A8C2C; Thu, 31 Jan 2013 22:48:55 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 10136907; Thu, 31 Jan 2013 22:48:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VMmsJR058062; Thu, 31 Jan 2013 22:48:54 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VMms9H058060; Thu, 31 Jan 2013 22:48:54 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201301312248.r0VMms9H058060@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 31 Jan 2013 22:48:54 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40847 - in projects/xml-tools: pt_BR.ISO8859-1/share/xml share/xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 22:48:55 -0000 Author: gabor Date: Thu Jan 31 22:48:54 2013 New Revision: 40847 URL: http://svnweb.freebsd.org/changeset/doc/40847 Log: - Minor entity cleanup Deleted: projects/xml-tools/share/xml/entities.ent Modified: projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog projects/xml-tools/share/xml/catalog Modified: projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog ============================================================================== --- projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog Thu Jan 31 14:56:26 2013 (r40846) +++ projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog Thu Jan 31 22:48:54 2013 (r40847) @@ -13,7 +13,7 @@ -- $FreeBSD$ -- -PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" +PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "entities.ent" PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" Modified: projects/xml-tools/share/xml/catalog ============================================================================== --- projects/xml-tools/share/xml/catalog Thu Jan 31 14:56:26 2013 (r40846) +++ projects/xml-tools/share/xml/catalog Thu Jan 31 22:48:54 2013 (r40847) @@ -38,9 +38,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Com PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN" "freebsd-common.dsl" -PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" - "entities.ent" - PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN" "authors.ent" From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 09:03:04 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 957839E5; Fri, 1 Feb 2013 09:03:04 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 867C3655; Fri, 1 Feb 2013 09:03:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r119343Q043774; Fri, 1 Feb 2013 09:03:04 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r119315a043753; Fri, 1 Feb 2013 09:03:01 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302010903.r119315a043753@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 09:03:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40848 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/x... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 09:03:04 -0000 Author: gabor Date: Fri Feb 1 09:03:01 2013 New Revision: 40848 URL: http://svnweb.freebsd.org/changeset/doc/40848 Log: - Move language-independent entities directly to the DTD Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/entities.ent projects/xml-tools/de_DE.ISO8859-1/share/xml/entities.ent projects/xml-tools/el_GR.ISO8859-7/share/xml/entities.ent projects/xml-tools/en_US.ISO8859-1/share/xml/entities.ent projects/xml-tools/es_ES.ISO8859-1/share/xml/entities.ent projects/xml-tools/fr_FR.ISO8859-1/share/xml/entities.ent projects/xml-tools/hu_HU.ISO8859-2/share/xml/entities.ent projects/xml-tools/it_IT.ISO8859-15/share/xml/entities.ent projects/xml-tools/ja_JP.eucJP/share/xml/entities.ent projects/xml-tools/mn_MN.UTF-8/share/xml/entities.ent projects/xml-tools/nl_NL.ISO8859-1/share/xml/entities.ent projects/xml-tools/pl_PL.ISO8859-2/share/xml/entities.ent projects/xml-tools/pt_BR.ISO8859-1/share/xml/entities.ent projects/xml-tools/ru_RU.KOI8-R/share/xml/entities.ent projects/xml-tools/share/xml/freebsd45.dtd projects/xml-tools/sr_YU.ISO8859-2/share/xml/entities.ent projects/xml-tools/tr_TR.ISO8859-9/share/xml/entities.ent projects/xml-tools/zh_CN.GB2312/share/xml/entities.ent projects/xml-tools/zh_TW.Big5/share/xml/entities.ent Modified: projects/xml-tools/da_DK.ISO8859-1/share/xml/entities.ent ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/xml-tools/de_DE.ISO8859-1/share/xml/entities.ent ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/de_DE.ISO8859-1/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -4,18 +4,12 @@ basiert auf: 1.1 --> - -%man; %freebsd; %translators; - -%authors; %teams; Modified: projects/xml-tools/el_GR.ISO8859-7/share/xml/entities.ent ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/el_GR.ISO8859-7/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -28,9 +28,6 @@ %newsgroups; - -%man; %glossary; @@ -45,9 +42,6 @@ %freebsd; - -%authors; %teams; Modified: projects/xml-tools/en_US.ISO8859-1/share/xml/entities.ent ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/en_US.ISO8859-1/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -3,18 +3,12 @@ %l10n; - -%man; %freebsd; %glossary; - -%authors; %teams; Modified: projects/xml-tools/es_ES.ISO8859-1/share/xml/entities.ent ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/es_ES.ISO8859-1/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -5,15 +5,9 @@ %l10n; - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/fr_FR.ISO8859-1/share/xml/entities.ent ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/fr_FR.ISO8859-1/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -17,15 +17,9 @@ %newsgroups; - -%man; %freebsd; - -%authors; %glossary; Modified: projects/xml-tools/hu_HU.ISO8859-2/share/xml/entities.ent ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/hu_HU.ISO8859-2/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -8,15 +8,9 @@ %l10n; - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/it_IT.ISO8859-15/share/xml/entities.ent ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/it_IT.ISO8859-15/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -7,15 +7,9 @@ %l10n; - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/ja_JP.eucJP/share/xml/entities.ent ============================================================================== --- projects/xml-tools/ja_JP.eucJP/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/ja_JP.eucJP/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -3,18 +3,12 @@ %l10n; - -%man; %freebsd; %authors-ja; - -%authors; %teams-ja; Modified: projects/xml-tools/mn_MN.UTF-8/share/xml/entities.ent ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/mn_MN.UTF-8/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -6,15 +6,9 @@ $FreeBSD$ --> - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/nl_NL.ISO8859-1/share/xml/entities.ent ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/nl_NL.ISO8859-1/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -6,15 +6,9 @@ %SRCID% 39534 --> - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/pl_PL.ISO8859-2/share/xml/entities.ent ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/pl_PL.ISO8859-2/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -8,15 +8,9 @@ %l10n; - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/pt_BR.ISO8859-1/share/xml/entities.ent ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/xml-tools/ru_RU.KOI8-R/share/xml/entities.ent ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/ru_RU.KOI8-R/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -7,15 +7,9 @@ Original revision: 1.1 (doc/share/xml) --> - -%man; %freebsd; - -%authors; %teams; Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 09:03:01 2013 (r40848) @@ -3,6 +3,8 @@ + + @@ -13,8 +15,16 @@ "/usr/local/share/xml/docbook/4.5/docbookx.dtd"> %orig-docbook; + +%authors; + + +%man; + + "entities.ent"> %orig-entities; Modified: projects/xml-tools/sr_YU.ISO8859-2/share/xml/entities.ent ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/xml-tools/tr_TR.ISO8859-9/share/xml/entities.ent ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/xml-tools/zh_CN.GB2312/share/xml/entities.ent ============================================================================== --- projects/xml-tools/zh_CN.GB2312/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/zh_CN.GB2312/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -3,9 +3,6 @@ %l10n; - -%man; %freebsd; @@ -15,9 +12,6 @@ %authors.in.author.tag.cn; - -%authors; %teams; Modified: projects/xml-tools/zh_TW.Big5/share/xml/entities.ent ============================================================================== --- projects/xml-tools/zh_TW.Big5/share/xml/entities.ent Thu Jan 31 22:48:54 2013 (r40847) +++ projects/xml-tools/zh_TW.Big5/share/xml/entities.ent Fri Feb 1 09:03:01 2013 (r40848) @@ -3,18 +3,12 @@ %l10n; - -%man; %freebsd; %authors.cn; - -%authors; %teams; From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 09:18:31 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B9C36C37; Fri, 1 Feb 2013 09:18:31 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 89C696DA; Fri, 1 Feb 2013 09:18:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r119IVHp047800; Fri, 1 Feb 2013 09:18:31 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r119IVxA047799; Fri, 1 Feb 2013 09:18:31 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302010918.r119IVxA047799@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 09:18:31 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40849 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 09:18:31 -0000 Author: gabor Date: Fri Feb 1 09:18:30 2013 New Revision: 40849 URL: http://svnweb.freebsd.org/changeset/doc/40849 Log: - Parse the documents with XML tools before passing them to Jade and turn off Jade validation. This will let us keep using Jade for printed output rendering and dropping old SGML constructs at the same time. Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 09:03:01 2013 (r40848) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 09:18:30 2013 (r40849) @@ -170,7 +170,7 @@ CATALOGS+= -c ${c} .endif .endfor SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} -JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS} +JADEOPTS= -w no-valid ${JADEFLAGS} ${SGMLFLAGS} XSLTPROCOPTS= ${XSLTPROCFLAGS} KNOWN_FORMATS= html html.tar html-split html-split.tar \ @@ -377,14 +377,14 @@ CLEANFILES+= ${DOC}.aux ${DOC}.log .elif ${_cf} == "ps" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \ - ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo + ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo ${DOC}.parsed.xml .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor .elif ${_cf} == "pdf" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \ - ${DOC}.tex ${DOC}.fo + ${DOC}.tex ${DOC}.fo ${DOC}.parsed.xml .for _curimage in ${IMAGES_PDF:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor @@ -572,6 +572,10 @@ ${DOC}.rtf: # PS/PDF ----------------------------------------------------------------- .if ${PDFENGINE} == "jade" + +${DOC}.parsed.xml: ${SRCS} + ${XMLLINT} --catalogs --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} + .if !defined(NO_TEX) # # This sucks, but there's no way round it. The PS and PDF formats need @@ -581,22 +585,23 @@ ${DOC}.rtf: # ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ - ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} + ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ + ${DOC}.parsed.xml ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ - ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${MASTERDOC} + ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml ${DOC}.tex-ps: ${DOC}.tex ${LN} -f ${.ALLSRC} ${.TARGET} .if !target(${DOC}.tex-pdf) ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \ - ${LOCAL_IMAGES_TXT} + ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml ${GEN_INDEX_SGML_CMD} ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ - ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${MASTERDOC} >> ${.TARGET} + ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET} .endif .if !target(${DOC}.dvi) From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 09:48:26 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4E37B194; Fri, 1 Feb 2013 09:48:26 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 30C827F0; Fri, 1 Feb 2013 09:48:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r119mQI6056348; Fri, 1 Feb 2013 09:48:26 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r119mPjx056346; Fri, 1 Feb 2013 09:48:25 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302010948.r119mPjx056346@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 09:48:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40850 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/x... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 09:48:26 -0000 Author: gabor Date: Fri Feb 1 09:48:25 2013 New Revision: 40850 URL: http://svnweb.freebsd.org/changeset/doc/40850 Log: - Use exclusively the XML catalogs and drop the old SGML format Deleted: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog projects/xml-tools/en_US.ISO8859-1/share/xml/catalog projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog projects/xml-tools/ja_JP.eucJP/share/xml/catalog projects/xml-tools/mn_MN.UTF-8/share/xml/catalog projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog projects/xml-tools/tr_TR.ISO8859-9/share/xml/catalog projects/xml-tools/zh_CN.GB2312/share/xml/catalog projects/xml-tools/zh_TW.Big5/share/xml/catalog Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/mk/doc.xml.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 09:18:30 2013 (r40849) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 09:48:25 2013 (r40850) @@ -146,8 +146,6 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/defaul DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl -FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog -LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports @@ -574,7 +572,7 @@ ${DOC}.rtf: .if ${PDFENGINE} == "jade" ${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --catalogs --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} + ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} .if !defined(NO_TEX) # @@ -695,7 +693,7 @@ ${DOC}.${_curformat}: # lint validate: ${SRCS} - ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC} + ${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC} # ------------------------------------------------------------------------ # Modified: projects/xml-tools/share/mk/doc.xml.mk ============================================================================== --- projects/xml-tools/share/mk/doc.xml.mk Fri Feb 1 09:18:30 2013 (r40849) +++ projects/xml-tools/share/mk/doc.xml.mk Fri Feb 1 09:48:25 2013 (r40850) @@ -272,7 +272,6 @@ XML_NOTICES= ${DOC_PREFIX}/share/xml/no # The ${TARGET.} file will not be listed in $DATA if defined. # NO_DATA.DEFAULT is the setting for all s. # -XSLTPROC_ENV+= SGML_CATALOG_FILES= XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}" XSLTPROCOPTS= ${XSLTPROCFLAGS} From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 11:04:51 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 62E798BF; Fri, 1 Feb 2013 11:04:51 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 45B04CE2; Fri, 1 Feb 2013 11:04:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11B4o1O080216; Fri, 1 Feb 2013 11:04:50 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11B4oUp080215; Fri, 1 Feb 2013 11:04:50 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011104.r11B4oUp080215@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 11:04:50 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40851 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 11:04:51 -0000 Author: gabor Date: Fri Feb 1 11:04:50 2013 New Revision: 40851 URL: http://svnweb.freebsd.org/changeset/doc/40851 Log: - Always parse the documentation first and use the parsed XML - s/PDFENGINE/RENDERENGINE/ and add support for generating .rtf with FOP Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 09:48:25 2013 (r40850) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 11:04:50 2013 (r40851) @@ -114,7 +114,7 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml SP_ENCODING_LIST?= ISO-8859-2 KOI8-R # Either jade or fop -PDFENGINE?= jade +RENDERENGINE?= jade .if defined(SPELLCHECK) DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl @@ -336,6 +336,8 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET: LOCAL_CSS_SHEET= ${CSS_SHEET:T} .endif +CLEANFILES+= ${DOC}.parsed.xml + .for _curformat in ${FORMATS} _cf=${_curformat} @@ -375,14 +377,14 @@ CLEANFILES+= ${DOC}.aux ${DOC}.log .elif ${_cf} == "ps" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \ - ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo ${DOC}.parsed.xml + ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor .elif ${_cf} == "pdf" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \ - ${DOC}.tex ${DOC}.fo ${DOC}.parsed.xml + ${DOC}.tex ${DOC}.fo .for _curimage in ${IMAGES_PDF:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor @@ -485,17 +487,22 @@ NO_RTF= yes .endif .endfor +# Parsed XML ------------------------------------------------------- + +${DOC}.parsed.xml: ${SRCS} + ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} + # XHTML ------------------------------------------------------------- -index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ +index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.xml + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml -${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ +${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_CSS_SHEET} ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.xml > ${.TARGET} + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \ ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET} @@ -515,9 +522,9 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMA # EPUB ------------------------------------------------------------- -${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ +${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${CSS_SHEET} - ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml ${ECHO} "application/epub+zip" > mimetype ${CP} ${CSS_SHEET} OEBPS/ zip -0Xq ${DOC}.epub mimetype @@ -555,11 +562,12 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb .if !target(${DOC}.rtf) .if !defined(NO_RTF) -${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ +${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG} ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ - ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} ${MASTERDOC} + ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \ + ${DOC}.parsed.xml ${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET} .else ${DOC}.rtf: @@ -569,11 +577,7 @@ ${DOC}.rtf: # PS/PDF ----------------------------------------------------------------- -.if ${PDFENGINE} == "jade" - -${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} - +.if ${RENDERENGINE} == "jade" .if !defined(NO_TEX) # # This sucks, but there's no way round it. The PS and PDF formats need @@ -654,17 +658,20 @@ ${DOC}.tex-pdf: .endif .endif -.elif ${PDFENGINE} == "fop" +.elif ${RENDERENGINE} == "fop" ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${GEN_INDEX_SGML_CMD} - ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.xml > ${.TARGET} + ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET} ${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET} - + +${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} + ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET} + .endif ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET} @@ -708,15 +715,15 @@ lint validate: ${SRCS} # -${HTML_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT} +${HTML_INDEX}: ${DOC}.parsed.xml ${LOCAL_IMAGES_TXT} ${INIT_INDEX_SGML_CMD} ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null + ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null ${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT} ${INIT_INDEX_SGML_CMD} ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null + ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null .if !target(${PRINT_INDEX}) ${PRINT_INDEX}: ${HTML_INDEX} From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 13:03:25 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3672EF2A; Fri, 1 Feb 2013 13:03:25 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0697F378; Fri, 1 Feb 2013 13:03:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11D3O0N016029; Fri, 1 Feb 2013 13:03:24 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11D3OAA016027; Fri, 1 Feb 2013 13:03:24 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011303.r11D3OAA016027@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 13:03:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40852 - in projects/xml-tools/share: mk xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 13:03:25 -0000 Author: gabor Date: Fri Feb 1 13:03:24 2013 New Revision: 40852 URL: http://svnweb.freebsd.org/changeset/doc/40852 Log: - Properly validate and process XInclude Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/freebsd45.dtd Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 11:04:50 2013 (r40851) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 13:03:24 2013 (r40852) @@ -490,7 +490,7 @@ NO_RTF= yes # Parsed XML ------------------------------------------------------- ${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} + ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET} # XHTML ------------------------------------------------------------- Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 11:04:50 2013 (r40851) +++ projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 13:03:24 2013 (r40852) @@ -11,6 +11,32 @@ + + + + + + + + + + + + + %orig-docbook; From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 13:21:14 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 80579634; Fri, 1 Feb 2013 13:21:14 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C1D46D8; Fri, 1 Feb 2013 13:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11DLEI1022041; Fri, 1 Feb 2013 13:21:14 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11DLEsH022040; Fri, 1 Feb 2013 13:21:14 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011321.r11DLEsH022040@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 13:21:14 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40853 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 13:21:14 -0000 Author: gabor Date: Fri Feb 1 13:21:13 2013 New Revision: 40853 URL: http://svnweb.freebsd.org/changeset/doc/40853 Log: - There is no need for XInclude processing at the point when xsltproc is called Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 13:03:24 2013 (r40852) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 13:21:13 2013 (r40853) @@ -153,7 +153,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbo COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -XSLTPROCFLAGS?= --nonet --xinclude +XSLTPROCFLAGS?= --nonet XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 17:35:26 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 79D15545; Fri, 1 Feb 2013 17:35:26 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C3E9338; Fri, 1 Feb 2013 17:35:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11HZP3C001219; Fri, 1 Feb 2013 17:35:25 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11HZPSX001218; Fri, 1 Feb 2013 17:35:25 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011735.r11HZPSX001218@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 17:35:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40857 - projects/xml-tools/share/xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 17:35:26 -0000 Author: gabor Date: Fri Feb 1 17:35:25 2013 New Revision: 40857 URL: http://svnweb.freebsd.org/changeset/doc/40857 Log: - Actually allow xi:include in DocBook markup Modified: projects/xml-tools/share/xml/freebsd45.dtd Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 17:03:41 2013 (r40856) +++ projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 17:35:25 2013 (r40857) @@ -5,7 +5,7 @@ - + From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 17:36:03 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9CDA6588; Fri, 1 Feb 2013 17:36:03 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6011433B; Fri, 1 Feb 2013 17:36:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11Ha3Pu001340; Fri, 1 Feb 2013 17:36:03 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11Ha3L6001335; Fri, 1 Feb 2013 17:36:03 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011736.r11Ha3L6001335@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 17:36:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40858 - projects/xml-tools/en_US.ISO8859-1/books/pmake X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 17:36:03 -0000 Author: gabor Date: Fri Feb 1 17:36:02 2013 New Revision: 40858 URL: http://svnweb.freebsd.org/changeset/doc/40858 Log: - Make included legalnotice entity well nested and add DTD declaration for validation to pass Modified: projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml Modified: projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml Fri Feb 1 17:35:25 2013 (r40857) +++ projects/xml-tools/en_US.ISO8859-1/books/pmake/book.xml Fri Feb 1 17:36:02 2013 (r40858) @@ -14,6 +14,24 @@ de Boor + + 1988 + 1989 + Adam de Boor + + + + 1989 + Berkeley Softworks + + + + 1988 + 1989 + 1993 + The Regents of the University of California. + + &legalnotice; $FreeBSD$ Modified: projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml Fri Feb 1 17:35:25 2013 (r40857) +++ projects/xml-tools/en_US.ISO8859-1/books/pmake/legalnotice.xml Fri Feb 1 17:36:02 2013 (r40858) @@ -1,26 +1,10 @@ + - - 1988 - 1989 - Adam de Boor - - - - 1989 - Berkeley Softworks - - - - 1988 - 1989 - 1993 - The Regents of the University of California. - - All rights reserved. From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 17:37:54 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 121E55EC; Fri, 1 Feb 2013 17:37:54 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 03B2B354; Fri, 1 Feb 2013 17:37:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11HbrYs001592; Fri, 1 Feb 2013 17:37:53 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11HbrJG001591; Fri, 1 Feb 2013 17:37:53 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011737.r11HbrJG001591@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 17:37:53 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40859 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 17:37:54 -0000 Author: gabor Date: Fri Feb 1 17:37:53 2013 New Revision: 40859 URL: http://svnweb.freebsd.org/changeset/doc/40859 Log: - Clean up leftovers after make lint Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 17:36:02 2013 (r40858) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 17:37:53 2013 (r40859) @@ -701,6 +701,7 @@ ${DOC}.${_curformat}: lint validate: ${SRCS} ${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC} + @${RM} -rf ${CLEANFILES} ${CLEANDIRS} # ------------------------------------------------------------------------ # From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 18:45:42 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F05B7B46; Fri, 1 Feb 2013 18:45:42 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B419B89B; Fri, 1 Feb 2013 18:45:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11IjgLW022399; Fri, 1 Feb 2013 18:45:42 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11Ijgqe022398; Fri, 1 Feb 2013 18:45:42 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011845.r11Ijgqe022398@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 18:45:42 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40860 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 18:45:43 -0000 Author: gabor Date: Fri Feb 1 18:45:41 2013 New Revision: 40860 URL: http://svnweb.freebsd.org/changeset/doc/40860 Log: - Remove some SGML leftovers Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 17:37:53 2013 (r40859) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 18:45:41 2013 (r40860) @@ -125,18 +125,11 @@ XMLDECL?= /usr/local/share/sgml/docbook/ .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) JADE?= ${PREFIX}/bin/jade -JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog -SX?= ${PREFIX}/bin/sx .else JADE?= ${PREFIX}/bin/openjade -JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog JADEFLAGS+= -V openjade -SX?= ${PREFIX}/bin/osx .endif -.if defined(SP_ENCODING) -JADE_ENV+= SP_ENCODING=${SP_ENCODING} -.endif JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} FOP?= ${PREFIX}/bin/fop @@ -146,14 +139,8 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/defaul DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl -ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog -DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog - COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -XSLTPROCFLAGS?= --nonet XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl @@ -162,14 +149,8 @@ INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/m IMAGES_LIB?= -.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML} -.if exists(${c}) -CATALOGS+= -c ${c} -.endif -.endfor -SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} -JADEOPTS= -w no-valid ${JADEFLAGS} ${SGMLFLAGS} -XSLTPROCOPTS= ${XSLTPROCFLAGS} +JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} +XSLTPROCOPTS?= --nonet KNOWN_FORMATS= html html.tar html-split html-split.tar \ epub txt rtf ps pdf tex dvi tar pdb From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 18:51:57 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 902A9CA3; Fri, 1 Feb 2013 18:51:57 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 742878F3; Fri, 1 Feb 2013 18:51:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11IpvXA024832; Fri, 1 Feb 2013 18:51:57 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11Ipqgj024798; Fri, 1 Feb 2013 18:51:52 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011851.r11Ipqgj024798@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 18:51:52 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40861 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handbook hu_HU.ISO8859-2/articles/comp... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 18:51:57 -0000 Author: gabor Date: Fri Feb 1 18:51:52 2013 New Revision: 40861 URL: http://svnweb.freebsd.org/changeset/doc/40861 Log: - Remove HTML Tidy leftovers Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/cups/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/Makefile projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/faq/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile projects/xml-tools/share/mk/doc.project.mk projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -297,7 +297,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -325,7 +325,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -257,7 +257,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -7,8 +7,6 @@ # %SRCID% 1.1 # -NO_TIDY = yes - MAINTAINER = doc@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/cups/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/cups/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/cups/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -7,8 +7,6 @@ # %SRCID% 1.2 # -NO_TIDY= yes - MAINTAINER= doc@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -6,12 +6,6 @@ # %SRCID% 1.6 # -# -# Tidy messes up iso-8859-2 characters -# - -NO_TIDY= yes - MAINTAINER= gabor@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -7,8 +7,6 @@ # %SRCID% 1.1 # -NO_TIDY= yes - MAINTAINER= doc@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/laptop/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -6,12 +6,6 @@ # %SRCID% 1.4 # -# -# Tidy messes up iso-8859-2 characters -# - -NO_TIDY= yes - MAINTAINER= doc@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/linux-comparison/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -6,12 +6,6 @@ # %SRCID% 1.1 # -# -# Tidy messes up iso-8859-2 characters -# - -NO_TIDY= yes - MAINTAINER= gabor@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/articles/linux-users/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -7,12 +7,6 @@ # %SRCID% 1.1 # -# -# Tidy messes up iso-8859-2 characters -# - -NO_TIDY = yes - MAINTAINER = doc@FreeBSD.org DOC?= article Modified: projects/xml-tools/hu_HU.ISO8859-2/books/faq/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/faq/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/books/faq/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -8,8 +8,6 @@ MAINTAINER=doc@FreeBSD.org -NO_TIDY = yes - DOC?= book FORMATS?= html-split html Modified: projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -7,8 +7,6 @@ # Build the FreeBSD Documentation Project Primer. # -NO_TIDY=yes - MAINTAINER=doc@FreeBSD.org DOC?= book Modified: projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -38,12 +38,6 @@ .PATH: ${.CURDIR}/../../share/xml/glossary -# -# Tidy messes up iso-8859-2 characters -# - -NO_TIDY= yes - MAINTAINER= doc@FreeBSD.org DOC?= book @@ -290,7 +284,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -258,7 +258,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -330,7 +330,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -226,7 +226,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -234,7 +234,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/share/mk/doc.project.mk ============================================================================== --- projects/xml-tools/share/mk/doc.project.mk Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/share/mk/doc.project.mk Fri Feb 1 18:51:52 2013 (r40861) @@ -92,7 +92,6 @@ PERL?= perl REALPATH?= /bin/realpath SETENV?= /usr/bin/env XSLTPROC?= ${PREFIX}/bin/xsltproc -TIDY?= ${PREFIX}/bin/tidy XMLLINT?= ${PREFIX}/bin/xmllint # # In teTeX 3.0 and later, pdfetex(1) is used as the default TeX Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -282,7 +282,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ Modified: projects/xml-tools/zh_TW.Big5/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Fri Feb 1 18:45:41 2013 (r40860) +++ projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Fri Feb 1 18:51:52 2013 (r40861) @@ -270,7 +270,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \ DEPENDSET.DEFAULT= transtable mirror XSLT.DEFAULT= ${XSL_MIRRORS} XML.DEFAULT= ${XML_MIRRORS} -NO_TIDY.DEFAULT= yes PARAMS.lastmod+= --param 'target' "'lastmod'" PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \ From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 19:50:35 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 97724CDD; Fri, 1 Feb 2013 19:50:35 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7B700B63; Fri, 1 Feb 2013 19:50:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11JoYPa042586; Fri, 1 Feb 2013 19:50:34 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11JoYOB042585; Fri, 1 Feb 2013 19:50:34 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011950.r11JoYOB042585@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 19:50:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40862 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 19:50:35 -0000 Author: gabor Date: Fri Feb 1 19:50:33 2013 New Revision: 40862 URL: http://svnweb.freebsd.org/changeset/doc/40862 Log: - Build index in the DocBook XSL way Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 18:51:52 2013 (r40861) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 19:50:33 2013 (r40862) @@ -139,13 +139,10 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/defaul DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl -COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl - XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl -INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl IMAGES_LIB?= @@ -158,10 +155,6 @@ KNOWN_FORMATS= html html.tar html-split CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def -HTMLOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLFLAGS} - -HTMLTXTOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS} - PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS} .if defined(BOOK_OUTPUT) @@ -268,6 +261,13 @@ ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP} # NO_SUBDIR= YES +# +# Index generation +# + +.if defined(GEN_INDEX) +XSLTPROCOPTS+= --param generate.index "1" +.endif # ------------------------------------------------------------------------ # @@ -421,25 +421,6 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}. .endfor .endif -# -# Index generation -# - -.if defined(GEN_INDEX) && defined(HAS_INDEX) -JADEFLAGS+= -i chap.index -HTML_SPLIT_INDEX?= html-split.index -HTML_INDEX?= html.index -PRINT_INDEX?= print.index -INDEX_SGML?= index.xml - -CLEANFILES+= ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX} - -INIT_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML} -GEN_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index} -.else -GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate." -.endif - .MAIN: all all: ${SRCS} ${_docs} @@ -477,12 +458,10 @@ ${DOC}.parsed.xml: ${SRCS} index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml ${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \ @@ -545,7 +524,6 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb .if !defined(NO_RTF) ${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG} - ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \ ${DOC}.parsed.xml @@ -570,7 +548,6 @@ ${DOC}.rtf: ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${DOC}.parsed.xml - ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml @@ -580,7 +557,6 @@ ${DOC}.tex-ps: ${DOC}.tex .if !target(${DOC}.tex-pdf) ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml - ${GEN_INDEX_SGML_CMD} ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ @@ -641,7 +617,6 @@ ${DOC}.tex-pdf: .elif ${RENDERENGINE} == "fop" ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} @@ -686,35 +661,6 @@ lint validate: ${SRCS} # ------------------------------------------------------------------------ # -# Index targets -# - -# -# Generate a different .index file based on the format name -# -# If we're not generating an index (the default) then we need to create -# an empty index.xml file so that we can reference index.xml in book.sgml -# - - -${HTML_INDEX}: ${DOC}.parsed.xml ${LOCAL_IMAGES_TXT} - ${INIT_INDEX_SGML_CMD} - ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null - -${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT} - ${INIT_INDEX_SGML_CMD} - ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null - -.if !target(${PRINT_INDEX}) -${PRINT_INDEX}: ${HTML_INDEX} - ${CP} -p ${HTML_INDEX} ${.TARGET} -.endif - - -# ------------------------------------------------------------------------ -# # Compress targets # @@ -821,12 +767,6 @@ spellcheck-${_curformat}: spellcheck: ${FORMATS:C/^/spellcheck-/} -indexreport: -.for _entry in ${SRCS:M*.xml} - @echo "indexreport ${_entry}" - @${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry} -.endfor - # # Build a list of install-format targets to be installed. These will be # dependencies for the "realinstall" target. From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 19:51:59 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7DA35DB8; Fri, 1 Feb 2013 19:51:59 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 71A29B71; Fri, 1 Feb 2013 19:51:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11JpxCF042811; Fri, 1 Feb 2013 19:51:59 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11Jpx2A042809; Fri, 1 Feb 2013 19:51:59 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011951.r11Jpx2A042809@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 19:51:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40863 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 19:51:59 -0000 Author: gabor Date: Fri Feb 1 19:51:58 2013 New Revision: 40863 URL: http://svnweb.freebsd.org/changeset/doc/40863 Log: - Remove some rarely used and badly supported features Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 19:50:33 2013 (r40862) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 19:51:58 2013 (r40863) @@ -57,45 +57,6 @@ # spellchecker. For example, PGP keys and filenames # will be omitted from this output. # -# Print-output options : -# -# NICE_HEADERS If defined, customized chapter headers will be created -# that you may find more aesthetically pleasing. Note -# that this option only effects print output formats for -# English language books. -# -# MIN_SECT_LABELS If defined, do not display the section number for 4th -# and 5th level section titles. This would change -# "N.N.N.N Section title" into "Section Title" while -# higher level sections are still printed with numbers. -# -# TRACE={1,2} Trace TeX's memory usage. Set this to 1 for minimal -# tracing or 2 for maximum tracing. TeX memory -# statistics will be written out to .log. -# For more information see the TeXbook, p301. -# -# TWO_SIDE If defined, two sided output will be created. This -# means that new chapters will only start on odd -# numbered (aka right side, aka recto) pages and the -# headers and footers will be aligned appropriately -# for double sided paper. Blank pages may be added as -# needed. -# -# JUSTIFY If defined, text will be right justified so that the -# right edge is smooth. Words may be hyphenated using -# the default TeX hyphenation rules for this purpose. -# -# BOOK_OUTPUT A collection of options are set suitable for printing -# a book. This option may be an order of magnitude more -# CPU intensive than the default build. -# -# RLE Use Run-Length Encoding for EPS files, this will -# result in significantly smaller PostScript files, -# but may take longer for a printer to process. -# -# GREYSCALE_IMAGES Convert the screenshots to greyscale before -# embedding them into the PostScript output. -# # Package building options: # # BZIP2_PACKAGE Use bzip2(1) utility to compress package tarball @@ -157,38 +118,9 @@ PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/p PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS} -.if defined(BOOK_OUTPUT) -NICE_HEADERS=1 -MIN_SECT_LABELS=1 -TWO_SIDE=1 -JUSTIFY=1 -#WITH_FOOTNOTES=1 -#GEN_INDEX=1 -.endif -.if defined(JUSTIFY) -TEX_CMDSEQ+= \RequirePackage{url} -PRINTOPTS+= -ioutput.print.justify -.endif -.if defined(TWO_SIDE) -PRINTOPTS+= -V %two-side% -ioutput.print.twoside -TEX_CMDSEQ+= \def\PageTwoSide{1} -.endif -.if defined(NICE_HEADERS) -PRINTOPTS+= -ioutput.print.niceheaders -.endif -.if defined(MIN_SECT_LABELS) -PRINTOPTS+= -V minimal-section-labels -.endif -.if defined(TRACE) -TEX_CMDSEQ+= \tracingstats=${TRACE} -.endif -.if defined(RLE) -PNMTOPSFLAGS+= -rle -.endif .if defined(WWWFREEBSDORG) HTMLFLAGS+= -V %html-header-script% .endif - .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) HTMLFLAGS+= -V %generate-legalnotice-link% .endif From owner-svn-doc-projects@FreeBSD.ORG Sat Feb 2 09:24:32 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7929B395; Sat, 2 Feb 2013 09:24:32 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5425A7AF; Sat, 2 Feb 2013 09:24:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r129OVQn085950; Sat, 2 Feb 2013 09:24:31 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r129OVfa085948; Sat, 2 Feb 2013 09:24:31 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302020924.r129OVfa085948@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 2 Feb 2013 09:24:31 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40869 - in projects/xml-tools: en_US.ISO8859-1/books/handbook share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 09:24:32 -0000 Author: gabor Date: Sat Feb 2 09:24:31 2013 New Revision: 40869 URL: http://svnweb.freebsd.org/changeset/doc/40869 Log: - Deactivate indexes by default, they are turned on by setting GEN_INDEX - Add index to handbook Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/chapters.ent projects/xml-tools/share/xsl/freebsd-common.xsl Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/chapters.ent ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/chapters.ent Sat Feb 2 09:05:04 2013 (r40868) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/chapters.ent Sat Feb 2 09:24:31 2013 (r40869) @@ -66,7 +66,6 @@ - - + Modified: projects/xml-tools/share/xsl/freebsd-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-common.xsl Sat Feb 2 09:05:04 2013 (r40868) +++ projects/xml-tools/share/xsl/freebsd-common.xsl Sat Feb 2 09:24:31 2013 (r40869) @@ -18,4 +18,5 @@ + From owner-svn-doc-projects@FreeBSD.ORG Sat Feb 2 14:52:17 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3766BC90; Sat, 2 Feb 2013 14:52:17 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 299646CD; Sat, 2 Feb 2013 14:52:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12EqGBR084738; Sat, 2 Feb 2013 14:52:16 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12EqFEF084732; Sat, 2 Feb 2013 14:52:15 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302021452.r12EqFEF084732@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 2 Feb 2013 14:52:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40871 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 14:52:17 -0000 Author: gabor Date: Sat Feb 2 14:52:15 2013 New Revision: 40871 URL: http://svnweb.freebsd.org/changeset/doc/40871 Log: - Remove doc.html.mk, which is not used any more - Factor out command macros for better readability and consistency and less duplication - Make some macros more consistent with the rest Added: projects/xml-tools/share/mk/doc.commands.mk (contents, props changed) Deleted: projects/xml-tools/share/mk/doc.html.mk Modified: projects/xml-tools/share/mk/doc.common.mk projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/mk/doc.images.mk projects/xml-tools/share/mk/doc.project.mk projects/xml-tools/share/mk/web.site.mk Added: projects/xml-tools/share/mk/doc.commands.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/xml-tools/share/mk/doc.commands.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -0,0 +1,149 @@ +# +# $FreeBSD$ +# + +CP?= /bin/cp +CAT?= /bin/cat +ECHO_CMD?= echo +LN?= /bin/ln +MKDIR?= /bin/mkdir +RM?= /bin/rm +MV?= /bin/mv +HTML2TXT?= ${PREFIX}/bin/w3m +HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} +ISPELL?= ispell +ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS} +.if exists(/usr/bin/perl) +PERL?= /usr/bin/perl +.elif exists(/usr/local/bin/perl) +PERL?= /usr/local/bin/perl +.else +PERL?= perl +.endif +REALPATH?= /bin/realpath +SETENV?= /usr/bin/env +XSLTPROC?= ${PREFIX}/bin/xsltproc +XMLLINT?= ${PREFIX}/bin/xmllint + +BUNZIP2?= /usr/bin/bunzip2 +FETCH?= /usr/bin/fetch +FIND?= /usr/bin/find +LN?= /bin/ln +SH?= /bin/sh +SORT?= /usr/bin/sort +TRUE?= /usr/bin/true + +AWK?= /usr/bin/awk +GREP?= /usr/bin/grep +SED?= /usr/bin/sed + +PKG_CREATE?= /usr/sbin/pkg_create +TAR?= /usr/bin/tar +TOUCH?= /usr/bin/touch +XARGS?= /usr/bin/xargs + +BZIP2?= bzip2 +BZIPOPTS?= -qf9 +GZIP?= gzip +GZIPOPTS?= -qf9 +ZIP?= ${PREFIX}/bin/zip +ZIPOPTS?= -j9 + +.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) +JADE?= ${PREFIX}/bin/jade +.else +JADE?= ${PREFIX}/bin/openjade +JADEFLAGS+= -V openjade +.endif + +FOP?= ${PREFIX}/bin/fop +FOPOPTS?= + +GROFF?= groff +HTML2PDB?= ${PREFIX}/bin/iSiloBSD +HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} +DVIPS?= ${PREFIX}/bin/dvips +.if defined(PAPERSIZE) +DVIPSOPTS?= -t ${PAPERSIZE:L} +.endif +DVIPSOPTS+= ${DVIPSFLAGS} + +# +# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX +# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore +# due to incompatibility of the format file. Since the teTeX 3.0 +# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf," +# it is checked here to determine which TeX engine should be used. +.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf) +TEX_CMD?= ${PREFIX}/bin/etex +PDFTEX_CMD?= ${PREFIX}/bin/pdfetex +.else +TEX_CMD?= ${PREFIX}/bin/tex +PDFTEX_CMD?= ${PREFIX}/bin/pdftex +.endif +LATEX_CMD?= ${PREFIX}/bin/latex +JADETEX_CMD?= ${TEX_CMD} "&jadetex" +JADETEX_PREPROCESS?= /bin/cat +PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex" +PDFJADETEX_PREPROCESS?= /bin/cat +PS2PDF?= ${PREFIX}/bin/ps2pdf +FOP_CMD?= ${PREFIX}/share/fop/fop.sh +XEP_CMD?= sh ${HOME}/XEP/xep.sh +JAVA_CMD?= ${PREFIX}/bin/javavm +SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar + +# +# Currently, we have to use the FixRTF utility available as textproc/fixrtf +# to apply several RTF fixups: +# +# 1. Embed PNGs into RTF. (Option: -p) +# 2. Embed FreeBSD-specific information into RTF, such as organization name, +# building time. But unfortunately, so far only Microsoft Word can read +# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read +# this kind of information from RTF created by Microsoft Word and +# OpenOffice. (Option: -i) +# 3. Do some locale-specific fixing. (Option: -e ) +# +# This is a transitional solution before Jade/OpenJade provides these features. +# +FIXRTF?= ${PREFIX}/bin/fixrtf +FIXRTFOPTS?= -i -p +.if defined(SP_ENCODING) +FIXRTFOPTS+= -e ${SP_ENCODING} +.endif + +SCR2PNG?= ${PREFIX}/bin/scr2png +SCR2PNGOPTS?= ${SCR2PNGFLAGS} +SCR2TXT?= ${PREFIX}/bin/scr2txt +SCR2TXTOPTS?= -l ${SCR2TXTFLAGS} +EPS2PNM?= ${PREFIX}/bin/gs +EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \ + -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \ + -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=- +# +# epsgeom is a perl script for 1) extracting geometry information +# from a .eps file and 2) arrange it for ghostscript's pnm driver. +# +EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom +EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES} +PNMTOPNG?= ${PREFIX}/bin/pnmtopng +PNMTOPNGOPTS?= ${PNGTOPNGFLAGS} +PNGTOPNM?= ${PREFIX}/bin/pngtopnm +PNGTOPNMOPTS?= ${PNGTOPNMFLAGS} +PPMTOPGM?= ${PREFIX}/bin/ppmtopgm +PPMTOPGMOPTS?= ${PPMTOPGMFLAGS} +PNMTOPS?= ${PREFIX}/bin/pnmtops +PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS} +EPSTOPDF?= ${PREFIX}/bin/epstopdf +EPSTOPDFOPTS?= ${EPSTOPDFFLAGS} +# +PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man +# +PS2EPS?= ${PREFIX}/bin/gs +PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \ + -sPAPERSIZE=letter -r72 -sDEVICE=bit \ + -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps +PS2BBOX?= ${PREFIX}/bin/gs +PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \ + -sPAPERSIZE=letter -r72 -sDEVICE=bbox \ + -sOutputFile=/dev/null ${PS2BBOXFLAGS} Modified: projects/xml-tools/share/mk/doc.common.mk ============================================================================== --- projects/xml-tools/share/mk/doc.common.mk Sat Feb 2 13:00:07 2013 (r40870) +++ projects/xml-tools/share/mk/doc.common.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -5,14 +5,6 @@ # documents commonly used in doc/ and www/ tree. # -AWK?= /usr/bin/awk -GREP?= /usr/bin/grep -REALPATH?= /bin/realpath -SED?= /usr/bin/sed -# a hack to keep tidy from converting tabs to spaces -# replace them with before calling tidy -REINPLACE_TABS_CMD?= ${SED} -i "" -e 's/ /\&\#09;/g' - # ------------------------------------------------------------------------ # # Work out the language and encoding used for this document. Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Sat Feb 2 13:00:07 2013 (r40870) +++ projects/xml-tools/share/mk/doc.docbook.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -81,21 +81,8 @@ RENDERENGINE?= jade DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl .endif -XMLLINT?= /usr/local/bin/xmllint XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl -.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) -JADE?= ${PREFIX}/bin/jade -.else -JADE?= ${PREFIX}/bin/openjade -JADEFLAGS+= -V openjade -.endif - -JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} - -FOP?= ${PREFIX}/bin/fop -FOPOPTS?= - DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl @@ -142,51 +129,6 @@ HTMLFLAGS+= -V %show-all-trademark-symbo PRINTFLAGS+= -V %show-all-trademark-symbols% .endif -PERL?= /usr/bin/perl -PKG_CREATE?= /usr/sbin/pkg_create -SORT?= /usr/bin/sort -TAR?= /usr/bin/tar -TOUCH?= /usr/bin/touch -XARGS?= /usr/bin/xargs - -GROFF?= groff -HTML2TXT?= ${PREFIX}/bin/links -HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS} -HTML2PDB?= ${PREFIX}/bin/iSiloBSD -HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} -DVIPS?= ${PREFIX}/bin/dvips -.if defined(PAPERSIZE) -DVIPSOPTS?= -t ${PAPERSIZE:L} -.endif -DVIPSOPTS+= ${DVIPSFLAGS} - -# -# Currently, we have to use the FixRTF utility available as textproc/fixrtf -# to apply several RTF fixups: -# -# 1. Embed PNGs into RTF. (Option: -p) -# 2. Embed FreeBSD-specific information into RTF, such as organization name, -# building time. But unfortunately, so far only Microsoft Word can read -# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read -# this kind of information from RTF created by Microsoft Word and -# OpenOffice. (Option: -i) -# 3. Do some locale-specific fixing. (Option: -e ) -# -# This is a transitional solution before Jade/OpenJade provides these features. -# -FIXRTF?= ${PREFIX}/bin/fixrtf -FIXRTFOPTS?= -i -p -.if defined(SP_ENCODING) -FIXRTFOPTS+= -e ${SP_ENCODING} -.endif - -GZIP?= -9 -GZIP_CMD?= gzip -qf ${GZIP} -BZIP2?= -9 -BZIP2_CMD?= bzip2 -qf ${BZIP2} -ZIP?= -9 -ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP} - # # Instruction for bsd.subdir.mk to not to process SUBDIR directive. # It is not necessary since doc.docbook.mk do it too. @@ -456,7 +398,7 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb .if !defined(NO_RTF) ${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG} - ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ + ${JADE} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \ ${DOC}.parsed.xml ${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET} @@ -480,7 +422,7 @@ ${DOC}.rtf: ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${DOC}.parsed.xml - ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ + ${JADE} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml ${DOC}.tex-ps: ${DOC}.tex @@ -491,7 +433,7 @@ ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${ ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} - ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ + ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET} .endif @@ -612,13 +554,13 @@ KNOWN_COMPRESS= gz bz2 zip # _PROG_COMPRESS_gz: .USE - ${GZIP_CMD} < ${.ALLSRC} > ${.TARGET} + ${GZIP} ${GZIPOPTS} < ${.ALLSRC} > ${.TARGET} _PROG_COMPRESS_bz2: .USE - ${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET} + ${BZIP2} ${BZIP2OPTS} < ${.ALLSRC} > ${.TARGET} _PROG_COMPRESS_zip: .USE - ${ZIP_CMD} ${.TARGET} ${.ALLSRC} + ${ZIP} ${ZIPOPTS} ${.TARGET} ${.ALLSRC} # # Build a list of targets for each compression scheme and output format. Modified: projects/xml-tools/share/mk/doc.images.mk ============================================================================== --- projects/xml-tools/share/mk/doc.images.mk Sat Feb 2 13:00:07 2013 (r40870) +++ projects/xml-tools/share/mk/doc.images.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -109,42 +109,6 @@ EPS2PNM_RES?= 100 # shared image directory. IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG} -SCR2PNG?= ${PREFIX}/bin/scr2png -SCR2PNGOPTS?= ${SCR2PNGFLAGS} -SCR2TXT?= ${PREFIX}/bin/scr2txt -SCR2TXTOPTS?= -l ${SCR2TXTFLAGS} -SED?= /usr/bin/sed -EPS2PNM?= ${PREFIX}/bin/gs -EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \ - -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \ - -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=- -# -# epsgeom is a perl script for 1) extracting geometry information -# from a .eps file and 2) arrange it for ghostscript's pnm driver. -# -EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom -EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES} -PNMTOPNG?= ${PREFIX}/bin/pnmtopng -PNMTOPNGOPTS?= ${PNGTOPNGFLAGS} -PNGTOPNM?= ${PREFIX}/bin/pngtopnm -PNGTOPNMOPTS?= ${PNGTOPNMFLAGS} -PPMTOPGM?= ${PREFIX}/bin/ppmtopgm -PPMTOPGMOPTS?= ${PPMTOPGMFLAGS} -PNMTOPS?= ${PREFIX}/bin/pnmtops -PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS} -EPSTOPDF?= ${PREFIX}/bin/epstopdf -EPSTOPDFOPTS?= ${EPSTOPDFFLAGS} -# -PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man -# -PS2EPS?= ${PREFIX}/bin/gs -PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \ - -sPAPERSIZE=letter -r72 -sDEVICE=bit \ - -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps -PS2BBOX?= ${PREFIX}/bin/gs -PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \ - -sPAPERSIZE=letter -r72 -sDEVICE=bbox \ - -sOutputFile=/dev/null ${PS2BBOXFLAGS} # # Use suffix rules to convert .scr files to other formats .SUFFIXES: .scr .pic .png .ps .eps .txt Modified: projects/xml-tools/share/mk/doc.project.mk ============================================================================== --- projects/xml-tools/share/mk/doc.project.mk Sat Feb 2 13:00:07 2013 (r40870) +++ projects/xml-tools/share/mk/doc.project.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -66,57 +66,13 @@ MAINTAINER?= doc@FreeBSD.org # formats ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb +.include "doc.commands.mk" + # User-modifiable LOCALBASE?= /usr/local PREFIX?= ${LOCALBASE} PRI_LANG?= en_US.ISO8859-1 -CP?= /bin/cp -CAT?= /bin/cat -ECHO_CMD?= echo -LN?= /bin/ln -MKDIR?= /bin/mkdir -RM?= /bin/rm -MV?= /bin/mv -HTML2TXT?= ${PREFIX}/bin/links -HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS} -ISPELL?= ispell -ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS} -.if exists(/usr/bin/perl) -PERL?= /usr/bin/perl -.elif exists(/usr/local/bin/perl) -PERL?= /usr/local/bin/perl -.else -PERL?= perl -.endif -REALPATH?= /bin/realpath -SETENV?= /usr/bin/env -XSLTPROC?= ${PREFIX}/bin/xsltproc -XMLLINT?= ${PREFIX}/bin/xmllint -# -# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX -# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore -# due to incompatibility of the format file. Since the teTeX 3.0 -# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf," -# it is checked here to determine which TeX engine should be used. -.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf) -TEX_CMD?= ${PREFIX}/bin/etex -PDFTEX_CMD?= ${PREFIX}/bin/pdfetex -.else -TEX_CMD?= ${PREFIX}/bin/tex -PDFTEX_CMD?= ${PREFIX}/bin/pdftex -.endif -LATEX_CMD?= ${PREFIX}/bin/latex -JADETEX_CMD?= ${TEX_CMD} "&jadetex" -JADETEX_PREPROCESS?= /bin/cat -PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex" -PDFJADETEX_PREPROCESS?= /bin/cat -PS2PDF?= ${PREFIX}/bin/ps2pdf -FOP_CMD?= ${PREFIX}/share/fop/fop.sh -XEP_CMD?= sh ${HOME}/XEP/xep.sh -JAVA_CMD?= ${PREFIX}/bin/javavm -SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar - # Image processing (contains code used by the doc..mk files, so must # be listed first). .include "doc.images.mk" @@ -144,9 +100,6 @@ DOC_LOCAL_MK= ${DOC_PREFIX}/${LANGCODE}/ .if ${DOCFORMAT} == "slides" .include "doc.slides.mk" .endif -.if ${DOCFORMAT} == "html" -.include "doc.html.mk" -.endif .endif # Subdirectory glue. Modified: projects/xml-tools/share/mk/web.site.mk ============================================================================== --- projects/xml-tools/share/mk/web.site.mk Sat Feb 2 13:00:07 2013 (r40870) +++ projects/xml-tools/share/mk/web.site.mk Sat Feb 2 14:52:15 2013 (r40871) @@ -38,52 +38,12 @@ CGIGRP?= www .endif CGIMODE?= 775 -BUNZIP2?= /usr/bin/bunzip2 -CP?= /bin/cp -CVS?= /usr/bin/cvs -ECHO_CMD?= echo -FETCH?= /usr/bin/fetch -FIND?= /usr/bin/find -SETENV?= /usr/bin/env -LN?= /bin/ln -MKDIR?= /bin/mkdir -MV?= /bin/mv -PERL?= /usr/bin/perl5 -.if !exists(${PERL}) && exists(/usr/local/bin/perl5) -PERL= /usr/local/bin/perl5 -.endif -RM?= /bin/rm -SED?= /usr/bin/sed -SH?= /bin/sh -SORT?= /usr/bin/sort -TOUCH?= /usr/bin/touch -TRUE?= /usr/bin/true - LOCALBASE?= /usr/local PREFIX?= ${LOCALBASE} -.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE) -SGMLNORM?= ${PREFIX}/bin/sgmlnorm -.else -SGMLNORM?= ${PREFIX}/bin/osgmlnorm -.endif -SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR} - -XSLTPROC?= ${PREFIX}/bin/xsltproc XSLTPROCOPTS?= ${XSLTPROCFLAGS} - -XMLLINT?= ${PREFIX}/bin/xmllint XMLLINTOPTS?= ${XMLLINTFLAGS} -HTML2TXT?= ${PREFIX}/bin/w3m -HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} -ISPELL?= ispell -ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS} - -.if defined(WWWFREEBSDORG) -SGMLNORMOPTS+= -i html.header.script.google -.endif - WEBCHECK?= ${PREFIX}/bin/webcheck WEBCHECKOPTS?= -ab ${WEBCHECKFLAGS} WEBCHECKDIR?= /webcheck