From fedora-docs-commits at redhat.com Thu Dec 1 21:11:09 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 1 Dec 2005 16:11:09 -0500 Subject: docs-common/css fedora-plain.css,NONE,1.1 Message-ID: <200512012111.jB1LB9uh024259@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24116/docs-common/css Added Files: fedora-plain.css Log Message: Added ${HTMLCSS} and ${HTMLCSSEXTRA} macros to "docs-common/Makefile.common" to allow dynamic specification of which CSS stylesheet to attach to the gnerated HTML rendering. --- NEW FILE fedora-plain.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ /* This "body" section is included for reference. Diff with fedora-draft.css body { background-attachment scroll; background-color: #FEFEFF; background-image: url('watermark.png'); background-position: top center; background-repeat: repeat; } */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #D0D0B0; background-color: #FAF9E0; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #22437f; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } a:link { color: #900; } a:visited { color: #48468f; } a:hover { color: #f20; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } p.title { text-align: center; } From fedora-docs-commits at redhat.com Thu Dec 1 21:11:14 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 1 Dec 2005 16:11:14 -0500 Subject: docs-common/xsl html-common-relnotes.xsl, 1.2, 1.3 html-common.xsl, 1.10, 1.11 Message-ID: <200512012111.jB1LBEcd024277@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/xsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24116/docs-common/xsl Modified Files: html-common-relnotes.xsl html-common.xsl Log Message: Added ${HTMLCSS} and ${HTMLCSSEXTRA} macros to "docs-common/Makefile.common" to allow dynamic specification of which CSS stylesheet to attach to the gnerated HTML rendering. Index: html-common-relnotes.xsl =================================================================== RCS file: /cvs/docs/docs-common/xsl/html-common-relnotes.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- html-common-relnotes.xsl 29 Nov 2005 21:42:39 -0000 1.2 +++ html-common-relnotes.xsl 1 Dec 2005 21:11:07 -0000 1.3 @@ -30,7 +30,7 @@ --> - + text/css Index: html-common.xsl =================================================================== RCS file: /cvs/docs/docs-common/xsl/html-common.xsl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- html-common.xsl 29 Nov 2005 21:42:39 -0000 1.10 +++ html-common.xsl 1 Dec 2005 21:11:07 -0000 1.11 @@ -25,7 +25,7 @@ - + text/css From fedora-docs-commits at redhat.com Thu Dec 1 21:10:48 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 1 Dec 2005 16:10:48 -0500 Subject: example-tutorial Makefile,1.19,1.20 Message-ID: <200512012111.jB1LBJqF024280@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24116/example-tutorial Modified Files: Makefile Log Message: Added ${HTMLCSS} and ${HTMLCSSEXTRA} macros to "docs-common/Makefile.common" to allow dynamic specification of which CSS stylesheet to attach to the gnerated HTML rendering. Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 27 Nov 2005 17:57:23 -0000 1.19 +++ Makefile 1 Dec 2005 21:10:41 -0000 1.20 @@ -18,7 +18,7 @@ DOCBASE = example-tutorial # DOCTITLE-en = Example Tutorial -XMLEXTRAFILES-en= +XMLEXTRAFILES-en=article-info-en.xml # DOCTITLE-de = Beispiel Tutorial XMLEXTRAFILES-de= @@ -38,13 +38,11 @@ ###################################################### # -# Note xmlformat eliminates need to munge pretty XSL -# -#article-info-en.xml:: rpm-info.xml -# xsltproc --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@ -# -#clean:: -# ${RM} bookinfo.xml +article-info-en.xml:: rpm-info.xml + xsltproc --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@ + +clean:: + ${RM} bookinfo.xml ###################################################### ###################################################### From fedora-docs-commits at redhat.com Thu Dec 1 21:10:58 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 1 Dec 2005 16:10:58 -0500 Subject: docs-common Makefile.common,1.15,1.16 Message-ID: <200512012111.jB1LBVfJ024283@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24116/docs-common Modified Files: Makefile.common Log Message: Added ${HTMLCSS} and ${HTMLCSSEXTRA} macros to "docs-common/Makefile.common" to allow dynamic specification of which CSS stylesheet to attach to the gnerated HTML rendering. Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.common 29 Nov 2005 21:42:28 -0000 1.15 +++ Makefile.common 1 Dec 2005 21:10:46 -0000 1.16 @@ -32,7 +32,7 @@ # Supply default values for the boilerplate files _unless_ the user has # provided their own values. ifeq (${FDPDIR},) -FDPDIR = .. +FDPDIR = .. endif ifeq (${XSLPDF},) XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl @@ -43,6 +43,12 @@ ifeq (${XSLHTMLNOCHUNKS},) XSLHTMLNOCHUNKS = ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl endif +ifeq (${HTMLCSS},) +HTMLCSS = ${FDPDIR}/docs-common/css/fedora-draft.css +endif +ifeq (${HTMLCSSEXTRA},) +HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark.png +endif ######################################################################### # Define a macro to locate xmlto(1) so we can choose a specific version # by "make XMLTO=/path/to/xmlto", if we so desire. @@ -64,7 +70,8 @@ # LANG=en.UTF-8 ${XMLTO} html -x $(XSLHTML) -o mydoc-en mydoc-en.xml # mkdir -p mydoc-en/stylesheet-images # cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/ -# cp ${FDPDIR}/docs-common/css/fedora*.css mydoc-en/ +# cp ${HTMLCSS} mydoc-en/fedora.css +# cp ${HTMLCSSEXTRA} mydoc-en/ # cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/ # mkdir -p mydoc-en/figs # cp -p figs/*-${LANG}.* mydoc-en/figs @@ -77,8 +84,8 @@ LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images - cp ${FDPDIR}/docs-common/css/fedora*.css $$(DOCBASE)-$(1)/ - cp ${FDPDIR}/docs-common/images/watermark.png $${DOCBASE}-$(1)/ + cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css + cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/ [ ! -d figs ] || ( \ mkdir -p ${DOCBASE}-$(1)/figs; \ find figs -type f -iname '*.*' -print | \ @@ -99,8 +106,8 @@ ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml mkdir -p stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/ - cp ${FDPDIR}/docs-common/css/fedora*.css . - cp ${FDPDIR}/docs-common/images/watermark.png . + cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css + cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/ endef # html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html) @@ -139,7 +146,7 @@ ${RM} -r ${DOCBASE}-$(1).html stylesheet-images ${RM} -r ${DOCBASE}-$(1).pdf ${RM} -r ${DOCBASE}-$(1).tar.gz - ${RM} fedora*.css watermark.png + ${RM} fedora.css watermark.png endef # distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean) From fedora-docs-commits at redhat.com Thu Dec 1 21:13:31 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 1 Dec 2005 16:13:31 -0500 Subject: docs-common/css fedora.css,1.9,NONE Message-ID: <200512012113.jB1LDVks024355@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330 Removed Files: fedora.css Log Message: Superceeded by "fedora-draft.css" and "fedora-plain.css" and deleted! --- fedora.css DELETED --- From fedora-docs-commits at redhat.com Thu Dec 1 23:47:34 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Thu, 1 Dec 2005 18:47:34 -0500 Subject: install-guide/figs fboot-cds.eps,1.2,NONE fboot-cds.png,1.2,NONE Message-ID: <200512012347.jB1NlYxL028034@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28001/figs Removed Files: fboot-cds.eps fboot-cds.png Log Message: - Removed text and image files for "Additional CDs" screen - Added note that "Package Selection" is obsolete will need to be rewritten after test2 --- fboot-cds.eps DELETED --- From fedora-docs-commits at redhat.com Thu Dec 1 23:47:28 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Thu, 1 Dec 2005 18:47:28 -0500 Subject: install-guide fedora-install-guide-firstboot-en.xml, 1.12, 1.13 fedora-install-guide-packageselection-en.xml, 1.13, 1.14 Message-ID: <200512012347.jB1NlxIt028038@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28001 Modified Files: fedora-install-guide-firstboot-en.xml fedora-install-guide-packageselection-en.xml Log Message: - Removed text and image files for "Additional CDs" screen - Added note that "Package Selection" is obsolete will need to be rewritten after test2 Index: fedora-install-guide-firstboot-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-en.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fedora-install-guide-firstboot-en.xml 9 Jun 2005 00:18:23 -0000 1.12 +++ fedora-install-guide-firstboot-en.xml 1 Dec 2005 23:47:21 -0000 1.13 @@ -2,14 +2,12 @@ First Boot - The Setup Agent launches the first time - that you start a new &FC; system. Use Setup - Agent to configure the system for use before you log + that you start a new &FC; system. Use Setup + Agent to configure the system for use before you log in. -
Welcome Screen @@ -26,22 +24,19 @@
- Select Next to start the Setup - Agent. + Agent. - GUI Required + Setup Agent requires a graphical - interface. If none is available, configure these options manually + interface. If none is available, configure these options manually after you log in. - -
License Agreement @@ -49,49 +44,44 @@ This screen displays the overall licensing terms for &FC;. Each software package in &FC; is covered by its own license which has been approved by the - OSI (Open Source Initiative) - Open Source Initiative (OSI). For more information - about the OSI, refer to OSI (Open Source Initiative) + Open Source Initiative (OSI). For more information + about the OSI, refer to + http://www.opensource.org/. -
License Agreement Screen - - - - - - - - + + + + + + + + License agreement screen. - +
- To proceed, select Yes, I agree to the License - Agreement and then select - Next. + Agreement and then select Next. -
- -
Date and Time If your system does not have Internet access or a network time server, manually set the date and time for your system on this - screen. Otherwise, use - NTP (Network Time Protocol) + screen. Otherwise, use + NTP (Network Time Protocol) NTP (Network Time Protocol) - servers to maintain the accuracy of the clock. NTP provides time - synchronization service to computers on the same network. The + servers to maintain the accuracy of the clock. NTP provides time + synchronization service to computers on the same network. The Internet contains many computers that offer public NTP services. @@ -99,70 +89,60 @@ The initial display enables you to set the date and time of your system manually. -
Date and Time Screen - - - - - - - - + + + + + + + + Date and time screen. - +
- Select the Network Time Protocol tab to configure your system to use NTP servers instead. - Setting the Clock - To change these settings later, from the main menu, choose - - Desktop - System Settings - Date & Time - . + To change these settings later, from the main menu, choose + Desktop System + Settings Date & Time + . - - To configure your system to use network time servers, select the - Enable Network Time Protocol option. This + Enable Network Time Protocol option. This option disables the settings on the Date and - Time tab and enables the other settings on this - screen. + Time tab and enables the other settings on this screen. -
Date and Time Screen - - - - - - - - + + + + + + + + Date and time screen. - +
- By default, &FC; is configured to use three separate groups, or - pools, of time servers. Time server pools + pools, of time servers. Time server pools create redundancy, so if one time server is unavailable, your system will synchronize with another server. @@ -170,19 +150,19 @@ To use an additional time server, either select it from the Server drop-down box, or type the DNS name in - the box, and select Add. To remove a server + the box, and select Add. To remove a server or server pool from the list, select the name and click - Delete. The drop-down box already has two + Delete. The drop-down box already has two listings as examples, which are servers provided by &RH;. If the hardware clock in your computer is highly inaccurate, you - may turn off your local time source entirely. To turn off the + may turn off your local time source entirely. To turn off the local time source, select Show advanced - options and then deselect the Use Local - Time Source option. If you turn off your local time - source, the NTP servers take priority over the internal clock. + options and then deselect the Use Local Time + Source option. If you turn off your local time source, + the NTP servers take priority over the internal clock. @@ -190,141 +170,124 @@ advanced option, &FC; will attempt to automatically locate time servers on the network. -
- -
Display The Setup Agent automatically attempts - to identify the graphics card and monitor for your computer. It + to identify the graphics card and monitor for your computer. It uses this information to calculate the correct Resolution and Color - Depth settings. + Depth settings. -
Display Screen - - - - - - - - + + + + + + + + Display screen. - +
- If you need to change the monitor, select Configure to display a list of manufacturers. Select the manufacturer of your monitor on the list, and hit the + key or select the triangle next to the name to - view supported models. Choose the correct model from the list and - select OK. If none of the listed models + view supported models. Choose the correct model from the list and + select OK. If none of the listed models match your monitor, select the closest match from either the Generic CRT Display list or the Generic LCD Display list. -
Monitor Dialog - - - - - - - - + + + + + + + + Monitor dialog. - +
- To change a display setting, select Resolution or Color - Depth, and select a new value from the drop-down - list. The Setup Agent only shows the - settings that are valid for your hardware. + Depth, and select a new value from the drop-down list. + The Setup Agent only shows the settings + that are valid for your hardware. - Resetting the display - To reconfigure your system after the installation has completed, - from the main menu, choose - Desktop - System Settings - Display - . + To reconfigure your system after the installation has completed, + from the main menu, choose + Desktop System + Settings Display + . -
- -
System User - Create a user account for yourself with this screen. Always use + Create a user account for yourself with this screen. Always use this account to log in to your &FC; system, rather than using the root account. -
System User Screen - - - - - - - - + + + + + + + + System user screen. - +
- Enter a user name and your full name, and then enter your chosen - password. Type your password once more in the Confirm - Password box to ensure that it is correct. Refer to + password. Type your password once more in the Confirm + Password box to ensure that it is correct. Refer to for guidelines on selecting a secure password. - Creating extra user accounts - To add additional user accounts to your system after the - installation is complete, from the main menu, choose - - Desktop - System Settings - Users & Groups - . + To add additional user accounts to your system after the + installation is complete, from the main menu, choose + Desktop System + Settings Users & + Groups . - To configure &FC; to use network services for authentication or user information, select Use Network - Login.... @@ -333,132 +296,77 @@ After you configure login services, select Next to proceed. -
- -
Sound Card The Setup Agent automatically attempts - to identify the sound card in your computer. + to identify the sound card in your computer. -
Sound Card Screen - - - - - - - - + + + + + + + + Sound card screen. - +
- Click Play Test Sound to check the sound - card configuration. If the configuration is correct, &FC; plays - a sound sequence. If your sound card is identified, but you do - not hear the sound, check your speakers and try again. + card configuration. If the configuration is correct, &FC; plays a + sound sequence. If your sound card is identified, but you do not + hear the sound, check your speakers and try again. You may manually configure a &FC; system to use unsupported sound - cards after the installation process is complete. Manual sound - hardware configuration is beyond the scope of this - document. + cards after the installation process is complete. Manual sound + hardware configuration is beyond the scope of this document. - Changing the Sound Card - &FC; will automatically attempt to detect a new sound card if - you add one to your system. If you need to launch the detection - process manually, from the main menu, choose - Desktop - System Settings - Soundcard Detection - . + &FC; will automatically attempt to detect a new sound card if + you add one to your system. If you need to launch the detection + process manually, from the main menu, choose + Desktop System + Settings Soundcard + Detection . - -
- - -
- Additional CDs - - - This screen allows you to load prepared discs for installing - third-party software. However, you cannot use it to install - additional packages from the &FC; discs. - - - - Adding Software - - To add software packages from the &FC; discs, use the - Package Manager utility after you log - in. From the main menu, select - Desktop - System Settings - Add/Remove Applications - . - - - -
- Additional CDs Screen - - - - - - - - - - Additional CDs screen. - - - -
- Click Next to proceed to the final screen. -
Finish Setup Screen - - - - - - - - + + + + + + + + Finish setup screen. - +
- Click Next to proceed to the login screen. Your &FC; system is now ready for use. -
- %FEDORA-ENTITIES-EN; ]>
Comprendere e personalizzare la policy &SEL; &APACHE; (Documento Beta) 2004 &FORMAL-RHI; Walters Colin &LEGALNOTICE;
Perch?? proteggere &APACHE; con &SEL;? Documento beta Questo ?? un documento beta. I contenuti tecnici contenuti qui sono stati controllati, ma potrebbero non funzionare come ti aspetti sul tuo sistema. Le idee contenute qui sono accurate, ma per come sono scritte, potrebbero soffrire di mancanza di chiarezza. Se scopri un errore o vorresti comunque fare un commento, per favore riempi questo rapporto di errore , che ha la maggior parte dei campi precompilati. &APACHEFULL; (httpd) ?? uno dei pi?? complessi demoni distribuiti con &FC; o &RHEL;. Supporta molte specie di librerie condivise di estensioni, linguaggi di programmazione proprietari, e ha uno dei pi?? potenti e complessi formati di file di configurazione. Supporta l'esecuzione dei CGI scripts da potenziali utenti non verificati, cos?? come concede loro controllo sull'accesso mediante (.htaccess), ed molto altro. Quando esaminerai il sorgente della policy di sicurezza di &SEL; per &APACHE; per la prima volta, noterai che anch'essa sembra molto complessa. Certamente ?? la pi?? complessa e configurabile di tutte le policies &SEL;. La verit?? ?? che ?? un software come Apache ad essere complesso - &SEL; sta solo rivelando questa complessit??. Comunque, &SEL; ?? una tecnologia flessibile. Puoi usarla per sia per ottenere obbiettivi di sicurezza di ampio respiro come trattenere un Apache compromesso dal danneggiare il resto del sistema, sia obbiettivi pi?? finemente granulati come prevenire ad uno script CGI wiki compromesso dal corrompere un blog installato dalla stessa persona che lo possiede. Questa guida guarda alla policy &APACHE; &SEL; distribuita con &FC; &LOCALVER;, e dimostra come usare &SEL; per proteggere &APACHE; in vari scenari.
Cominciamo Questa guida ?? specifica per &FC; &LOCALVER; or &RHEL; &LOCALRHELVER; Mentre gran parte della teoria in questa guida ?? applicabile ad altri sistemi, i dettagli predefiniti della policy di &SEL;, la configurazione di &APACHE;, e la conformazione del file system della tua distribuzione, possono differire. In particolare, questa guida ?? indirizzata alla policy targeted, anche se in seguito si discuter?? comunque della policy strict. Il primo passo ?? installare il pacchetto httpd, e probabilmente i pacchetti httpd-suexec e httpd-manual. Il pacchetto selinux-policy-targeted dovrebbe essere gi?? parte dell'installazione predefinita. Se vuoi fare una qualsiasi personalizzazione della policy, dovrai installare anche il pacchetto selinux-policy-targeted-sources. Per impostazione predefinita la sicurezza &SEL; ?? attiva in modalit?? enforcing per &APACHE;. Per verificarlo, esegui system-config-securitylevel, e guarda nel tabulatore &SEL;. Clicca sull'albero delle Transazioni ed assicurati che Disabilita la protezione &SEL; per il demone httpd non sia segnata. Come ulteriore controllo, usa il comando ps axZ | grep httpd. Lo dovresti vedere in esecuzione sotto il security context root_u:system_r:httpd_t. La parte pi?? importante ?? la terza componente, il type httpd_t. Nota che molti altri processi sul tuo sistema sono in esecuzione sotto il tipo unconfined_t. Essendo eseguito in un contesto di sicurezza separato con il tipo httpd_t, &APACHE; ?? confinato da &SEL;.
Una semplice configurazione Assumiamo che tu abbia un semplicissimo, singolo sito web con i files .html in /var/www/html, nessuno script CGI, hosting virtuale, o amministratori Web multipli. Questi argomenti avanzati saranno coperti nella . L'obbiettivo di sicurezza ?? quello di essere sicuri che &APACHE; stia leggendo solamente il contenuto Web statico, e non faccia altro come scrivere sui conenuti, connettersi ai sockets dei database, leggere le home directories degli utenti, etc. Per scelta predefinita, la policy &SEL; di Fedora permette ad &APACHE; di eseguire gli scripts CGI e leggere direttamente dalle home directory degli utenti i contenuti. Per disabilitare queste opzioni per questa sezione, eseguite system-config-securitylevel, cliccate il tabulatore &SEL;, e sotto Servizio HTTPD, eliminate il contrassegno a fianco delle voci Permetti il supporto HTTPD cgi e Permetti ad HTTPD di leggere le home directory. In alternativa, puoi eseguire questi comandi da un terminale: setsebool httpd_enable_cgi false setsebool httpd_enable_homedirs false SELinux e le booleane sono discusse in . In , ?? stato menzionato che il processo &APACHE; ?? stato rietichettato httpd_t perci?? ha le restrizioni &SEL; applicate. In &SEL;, ogni oggetto del sistema, tipo i normali files, le porte di rete, processi, i descrittori dei file, etc., hanno un contesto di sicurezza associata ad essi. Ecco i contesti dei files contenuti nel semplice sito web: ls -aZ /var/www/ drwxr-xr-x root root system_u:object_r:httpd_sys_content_t . drwxr-xr-x root root system_u:object_r:var_t .. drwxr-xr-x root root system_u:object_r:httpd_sys_script_exec_t cgi-bin drwxr-xr-x root root system_u:object_r:httpd_sys_content_t error drwxr-xr-x root root system_u:object_r:httpd_sys_content_t html drwxr-xr-x root root system_u:object_r:httpd_sys_content_t icons ls -aZ /var/www/error drwxr-xr-x root root system_u:object_r:httpd_sys_content_t . drwxr-xr-x root root system_u:object_r:httpd_sys_content_t .. [...] drwxr-xr-x root root system_u:object_r:httpd_sys_content_t include -rw-r--r-- root root system_u:object_r:httpd_sys_content_t noindex.html -rw-r--r-- root root system_u:object_r:httpd_sys_content_t README Nuovamente, la parte importante ?? la terza componente del contesto, il tipo httpd_sys_content_t. La policy di sicurezza permette ad httpd_t (&APACHE;) di leggere files e directories con questo tipo, insieme ad altri files cruciali come gli etc_t. A questo punto, verifica che puntando il tuo Web browser su , puoi vedere la consueta pagina predefinita di &FC; o &RHEL;. Poi, prova a creare un nuovo file tipo hello.html in /var/www/html, e verifica di poterlo vedere dal tuo Web browser: echo "Hello world" > /var/www/html/hello.html ls -aZ /var/www/html/hello.html -rw-r--r-- root root system_u:object_r:httpd_sys_content_t hello.html Nota che quando crei un nuovo file in /var/www/html, per impostazione predefinita esso avr?? ereditato il tipo httpd_sys_content_t dalla directory genitore. In questo modo &APACHE; (eseguito come httpd_t) pu?? leggere il nuovo file. Quando hai usato system-config-securitylevel per impostare una bolena &SEL; che ha disattivato la capacit?? di &APACHE; di leggere le home directories, ci?? ha assicurato che il dominio httpd_t non abbia i permessi di leggere lo user_home_dir_t. Questo ?? il tipo assegnato alla home directory di un utente. Poich?? &APACHE; non pu?? accedere alla toplevel directory, non pu?? quindi accedere a qualsiasi file contenuto all'interno, anche se include contenuti Web. ls -aZ /home/walters drwx------ walters walters root:object_r:user_home_dir_t . drwxr-xr-x root root system_u:object_r:home_root_t .. -rw-r--r-- walters walters user_u:object_r:user_home_t anaconda-ks.cfg -rwxr-xr-x walters walters user_u:object_r:user_home_t anaconda.log ... Un problema in cui puoi incorrere ?? la differenza fra i comandi mv e cp. Supponi di avere alcuni nuovi contenuti (about.html) da aggiungere al tuo sito. Dopo averlo creato nella tua home directory, successivamente fai qualcosa tipo: sudo mv /home/walters/about.html /var/www/html. Il problema qui ?? che il comando mv per impostazione predefinita preserva le informazioni di contesto associate con il file, mentre cp, poich?? crea un nuovo file, eredita quelle della directory genitore. Per esempio, questo ?? il risultato dell'mv mensionato sopra: ls -aZ /var/www/html/ drwxr-xr-x root root system_u:object_r:httpd_sys_content_t . drwxr-xr-x root root system_u:object_r:httpd_sys_content_t .. -rw-r--r-- root root system_u:object_r:httpd_sys_content_t index.html -rw-r--r-- walters walters system_u:object_r:user_home_t about.html Se stai eseguendo &APACHE; e provi ad aprire about.html nel Web browser, otterrai un errore "Forbidden". Se quindi guarderai in /var/log/messages, vedrai un messaggio simile a questo: Oct 19 17:54:59 hostname kernel: audit(1098222899.827:0): avc: \ denied { getattr } for pid=19029 exe=/usr/sbin/httpd \ path=/var/www/html/about.html dev=dm-0 ino=373900 \ scontext=root:system_r:httpd_t tcontext=user_u:object_r:user_home_t \ tclass=file Questo messaggio ti dice che httpd_t non pu?? accedere ad un file con il tipo user_home_t. Lo user_home_t ??, come gi?? visto nel listato di /home/walters/, usato per un gran numero di files all'interno della home directory. La policy di sicurezza predefinita non consentir?? mai ad httpd_t un qualsiasi accesso al tipo user_home_t. To relabel the file and allow &APACHE; to read it, you can use the chcon utility: chcon -t httpd_sys_content_t /var/www/html/about.html. Verify the context on the file is correct: ls -aZ /var/www/html/ drwxr-xr-x root root system_u:object_r:httpd_sys_content_t . drwxr-xr-x root root system_u:object_r:httpd_sys_content_t .. -rw-r--r-- root root system_u:object_r:httpd_sys_content_t index.html -rw-r--r-- walters walters system_u:object_r:httpd_sys_content_t about.html The chcon utility is similar in style to the UNIX command chmod. For example, if you wanted to recursively change the types of a directory and all the files it contains, you could use this command: chcon -R -h -t httpd_sys_content_t /path/to/directory. The switch means to operate recursively, and the option means to not follow symlinks (which is almost always what you want). <command>chcon</command> vs. <command>restorecon</command> There is another command available for changing file labels, called restorecon. This command is useful if you want to revert back to the default labels on files. For example, you can run restorecon -v -R /var/www/ to reset all the file labels in the /var/www/ directory. Internally, restorecon reads the /etc/selinux/targeted/contexts/files/file_contexts file, which has a set of regular expressions mapping file paths to security contexts.
Adding Per-User Content This section discusses per-user ~/public_html directories. You need to do three things: Edit /etc/httpd/conf/httpd.conf. Comment out the line UserDir disable and change the UserDir option to public_html. Execute service httpd reload. Start system-config-securitylevel. In the &SEL; tab, open the Apache menu under Modify SELinux Policy. Switch the Boolean Allow httpd to read home directories back on. Alternatively, use setsebool httpd_enable_homedirs true from a terminal. The rest of this process is from the perspective of a user wanting to maintain your own website. Remember normal Linux permissions Make sure that you have your home directory set up with the normal Linux permissions for this: in particular, you may need to run chmod a+x ~. In your home directory, execute mkdir public_html. Examine the security context of the new directory: ls -adZ public_html drwxrwxr-x walters walters user_u:object_r:user_home_t public_html/ Note that it has the type user_home_t, because &SEL; has a rule that says new files created in a user's home directory (user_home_dir_t), get assigned the type user_home_t by default. A process running as httpd_t (i.e., &APACHE;) can't read a file with this type. To change the file's type and allow &APACHE; to read the file, execute: chcon -t httpd_sys_content_t public_html Targeted versus strict In the strict policy, normal users have to use the type httpd_user_content_t; the _sys_ means it is reserved for the system administrator by default. Using separate types like this allows stronger separation between the system and the user. Now, create some content in your new public_html (perhaps index.html). Test that you can browse to , and see the expected data. Try relabeling the file back: chcon -t user_home_t index.html. When you reload the page, the Web server will not have permission to read it any more. One key idea is that there are actually two independent layers of security involved. There is the normal Unix permissions (which you modify with chmod), and the &SEL; file labels, which you modify with chcon. Simply making a file world-readable with the Unix command chmod a+r filename will not, with &SEL;, in general allow any process to read the file. Each process must be explicitly authorized in the &SEL; policy for access to a particular file type.
Discussion of Overall Security Having gained an understanding of some basic &SEL; concepts, it is useful to step back and see what you have achieved so far, and examine some of the philosophy behind &SEL;. Running &APACHE; as httpd_t does ensure that even if the part of &APACHE; that is running as root is compromised or misconfigured, it is isolated from the rest of the system, and cannot delete or deface your website. This mention of misconfiguration is useful to elaborate on. At a fundamental level, a hostile attacker trying to break into &APACHE; is not very different from a webmaster misconfiguring it. Given &APACHE;'s extremely complex configuration file, all it takes is a one-line mistake such as the following to cause serious problems on your system: PidFile /etc/passwd And there are plenty of other easier to make mistakes in your Apache configuration. &SEL; lets you separate your security policy (&APACHE; should never have direct access to /etc/passwd) from the rest of all the complexity in /etc/httpd/conf/httpd.conf. Having specific labels for your Web content and &APACHE; also ensures a compromised or misconfigured name server (named_t) cannot read the website at all (which is useful if some parts of the website are password-protected by &APACHE;, for example). For a much more thorough discussion of the philosophy behind &SEL;, refer to The Inevitability Of Failure (http://www.nsa.gov/selinux/papers/inevit-abs.cfm.)
Virtual Hosting, CGI scripts and suEXEC Most installations of &APACHE; have some sort of dynamic content; in particular, CGI scripts are very common. This section examines a much more complicated use case for &SEL;: A website that has a number of users, each of whom owns a virtual host, out of which they are allowed to run CGI content. In this situation, we have a number of security goals: Protect the system from the users Protect the users from each other Protect the user's home directory from their own CGI scripts One common method for approaching the first two goals on a non-&SEL; setup is to use an &APACHE; module called suEXEC. You can read more about suEXEC at http://httpd.apache.org/docs-2.0/suexec.html. Using suEXEC protection, user CGI scripts run under their own uid. This ensures that user CGI scripts cannot interfere with the system &APACHE; daemon (since it runs under its own uid), nor with each other (since each user has their own uid). However, when CGI scripts are run via suEXEC using standard Linux security, a compromised, misconfigured, or simply buggy user CGI script has complete access to any other file the user owns, such as their home directory. It also has access to any process running under the same uid, and so forth. Given the security track record of Web software, protecting the user's personal data from CGI programs they may install is very desirable. The &SEL; policy specifies that when a user CGI script is executed by suEXEC, a domain transition occurs to change the script's security label to the httpd_sys_script_t type. This means the user's CGI scripts run in their own confined domain (but still the same uid). In the default &FC; setup, the httpd_sys_script_t domain can read and write to files and directories that have the httpd_sys_content_t type. But they still cannot access files with type user_home_t, in other words the user's home directory. To illustrate this, here are example user names, file names, and websites involved. In this example, the virtual hosting provider has each user store their website in /var/www/sitename, and the content is all owned by the user. CGI scripts are allowed, and they can be installed anywhere in the user's site; the filename just has to end in .cgi. Here is an overview of the filesystem layout: ls -Z /var/www/ drwxr-xr-x root root system_u:object_r:httpd_sys_content_t . drwxr-xr-x root root system_u:object_r:var_t .. drwxr-xr-x bob bob system_u:object_r:httpd_sys_content_t widgets.com drwxr-xr-x jane jane system_u:object_r:httpd_sys_content_t yoyodyne.org drwxr-xr-x sam sam system_u:object_r:httpd_sys_content_t sammy.net Here is a sample of how the &APACHE; configuration for the example.com domain might look. Note particularly that &APACHE; has been configured to run CGI scripts as the user bob. NameVirtualHost 10.23.54.2:80 <VirtualHost 10.23.54.2:80> ServerAdmin webmaster at example.com DocumentRoot /var/www/example.com/ ServerName web.example.com ServerAlias example.com www.example.com ErrorLog logs/example.com-error_log CustomLog logs/example.com-access_log common SuexecUserGroup bob bob <Directory /var/www/example.com/> Options +ExecCGI +Indexes AddHandler cgi-script .cgi </Directory> </VirtualHost> By using the normal &APACHE; suEXEC mechanism, together with &SEL;, you have achieved the major security goals set out at the beginning of this section. However, this is still only a fraction of &SEL;'s power.
Using Other Types To Lock Down CGI Scripts In the section you saw that a user's CGI script running in the httpd_sys_script_t domain can read and write all Web content. In many scenarios, this is undesirable. For example, the Pyblosxom blog software (http://roughingit.subtlehints.net/pyblosxom/) reads in a number of plain text blog entry files, and renders them to HTML on the fly to the client. For this, it only needs read access to the blog entry files. Ideally, if Pyblosxom was compromised or had a bug, it would not have the ability to modify or delete your Web log entries. &SEL; allows you to achieve this by defining more types. You grant httpd_sys_script_t the access to those types that you desire. The default &APACHE; policy defines a number of other types by default. User-controllable types defined by the &SEL; policy httpd_sys_script_ro_t A CGI script may only read files and directories with this type. httpd_sys_script_ra_t Like the previous type, except a CGI script may also append more data (useful for log files, etc). httpd_sys_script_rw_t Content that a CGI script may change in any way, including deletion. httpd_sys_content_t See below. httpd_sys_script_exec_t The type for CGI executables. httpd_t cannot execute other types such as httpd_sys_script_rw_t. The &FC; &LOCALVER; release introduces a new policy boolean called httpd_unified. If this boolean is enabled, it means that httpd_sys_content_t (the type used for everything up until this point) is treated as the union of all the other types above. If this boolean is disabled, it means that (for example) in order for a CGI script to be executed by httpd_t, it must be labeled with the httpd_sys_script_exec_t type. And it also means that in order for a CGI script to write data, the target file must be labeled with httpd_sys_script_rw_t, as above. The httpd_unified boolean was introduced so that one could, for the most part, use a typical &APACHE; installation without a good grasp on file labeling and security contexts. However, disabling this boolean grants far greater security, and is highly recommended. Now, examine how Bob might set up a Pyblosxom installation: # cd /var/www/example.com # ls -aZ blog drwxr-xr-x bob bob user_u:object_r:httpd_sys_content_t . drwxr-xr-x bob bob user_u:object_r:httpd_sys_content_t .. -rwxr-xr-x bob bob user_u:object_r:httpd_sys_script_exec_t index.cgi drwxr-xr-x bob bob user_u:object_r:httpd_sys_script_ro_t pyblosxom # cd pyblosxom # ls -aZ drwxr-xr-x bob bob user_u:object_r:httpd_sys_script_ro_t . drwxr-xr-x bob bob user_u:object_r:httpd_sys_content_t .. -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t comment-form.rss -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t comment-story.rss -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t comment.rss -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t config.py -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t date_head.html -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t firstpost.txt ... Note that the index.cgi executable is marked as httpd_sys_script_exec_t, and the rest of the data is marked as httpd_sys_script_ro_t. This protects all the blog data from a compromised, misconfigured, or buggy Pyblosxom. One other important thing to note about these types is that by default, httpd_t cannot access any of them except for httpd_sys_content_t. In other words, by default &APACHE; cannot directly access content intended for your CGI scripts. Consider the case of a small intranet, accessed via a CGI script, which has some public content, and some password-protected content. It stores its data in a large database file. In this case, you would label the database file as httpd_sys_script_rw_t so that the intranet CGI could write to it. But if you allow httpd_t access to httpd_sys_script_rw_t, then if &APACHE; was compromised or simply misconfigured, it could gain access to the database directly, bypassing the access control that the CGI script was doing for the password-protected content.
Debugging Problems and Customizing the Policy When first deploying &SEL; and &APACHE;, if your &APACHE; configuration varies far from the &FC; or &RHEL; defaults, you will likely encounter issues related to the &SEL; policy. This section discusses analyzing policy denials, and doing simple customizations of the policy.
Simple Customization The first major tool for policy customization is system-config-securitylevel. It has a number of policy booleans: Boolean options for &APACHE; httpd_enable_cgi (Allow httpd cgi support) Whether or not to allow CGI scripts to run at all. httpd_enable_homedirs (Allow httpd to read home directories) Whether or not to allow &APACHE; to access top-level home directories. This does not allow for reading of the content of home directories (user_home_t). httpd_ssi_exec (Allow httpd to run SSI executables in the same domain as system CGI scripts) If enabled, this boolean causes &APACHE; to transition to the httpd_sys_script_t when executing a shell. httpd_unified (Unify httpd handling of all content files) This boolean controls whether httpd_sys_content_t is treated as the union of all the other types such as httpd_sys_script_exec_t. See In addition, you can disable &SEL; enforcement for &APACHE; entirely with system-config-securitylevel. First, click the &SEL; tab. Click on the Transition tree. Check Disable &SEL; protection for &APACHE; Execute /etc/init.d/httpd restart
Policy Debugging It is very important to monitor /var/log/messages for any denials due to the &SEL; policy. Suppose that you see the following denial: Oct 19 17:54:59 hostname kernel: audit(1098050626.859:0): avc: denied { write } \ for pid=27422 exe=/usr/bin/python2.3 name=pyblosxom dev=dm-0 ino=4374593 \ scontext=system_u:system_r:httpd_sys_script_t \ tcontext=user_u:object_r:httpd_sys_script_ro_t tclass=dir The { write } is telling you that the denial involves writing to an object. The tclass=dir says that the object in question is a directory. The two most crucial parts are the scontext and tcontext, which contain the types of the subject (httpd_sys_script_t) and the object (httpd_sys_script_ro_t). Notice there is other auxilliary information as well; since the object is a file, there is its name (pyblosxom) and inode number (4374593). In other words, the Python CGI script is trying to write to a directory that is marked read-only. There are many reasons this could happen; perhaps the script was misconfigured or buggy, for example. But in this particular case, it turns out that the Python interpreter normally tries to generate .pyc files for each .py file it encounters. If the directory is marked as httpd_sys_script_ro_t, then it will not be able to create new files in it, and you will see the denial. This is a very common problem with Python CGI scripts.
Simple Changes to Policy Sources The issue with Python mentioned in is not an issue with &SEL;, since it is Python that is trying to write to a directory of supposedly read-only objects. To deal with these spurious errors that don't affect the functionality of the CGI script, you can direct &SEL; to ignore them. &SEL; supports a dontaudit directive in the policy sources, but you must rebuild a policy from the source. To install the policy sources, use up2date or yum to install the selinux-policy-targeted-sources package. To get the rule syntax you need, you can use a audit2allow, which will generate the SELinux policy to allow a set of logged denials. For example, you could invoke audit2allow -i /var/log/messages -l. This generates allow rules for every denial since a policy was last loaded. The output for the denial in would look like this: audit2allow -i /var/log/messages -l allow httpd_sys_script_t httpd_sys_script_ro_t:dir { write }; However, in this case you don't want to actually allow this operation, you simply want to avoid audit messages from it. &SEL; supports a directive called dontaudit instead of allow. Now your generated policy is dontaudit httpd_sys_script_t httpd_sys_script_ro_t:dir { write };. To add this to the system policy, follow these steps: cd /etc/selinux/strict/src/policy Use your favorite editor to create the file domains/misc/local.te, and add the rule above to it (or echo "dontaudit httpd_sys_script_t httpd_sys_script_ro_t:dir { write };" > domains/misc/local.te). make reload. Analyze <command>audit2allow</command> output carefully You should not simply place all of the output from audit2allow in your domains/misc/local.te. It is very easy to compromise the security of your system that way; for example, using allow instead of dontaudit above would have rendered the security from the httpd_sys_script_ro_t type useless. For more information about policy debugging and customization in general, refer to the Red Hat &SEL; Policy Guide, available online at http://www.redhat.com/docs.
Differences Between Strict and Targeted Policy The fundamental difference with the strict policy is that it restricts every process, including user logins, instead of just a few selected daemons. This has important ramifications for &APACHE;, because ordinary users are often involved in providing and controlling Web content. In the default strict policy, there are two user login types, user_t and staff_t. The strict Apache policy defines an additional set of types for each user login type, replacing _sys_ with _user_ and _staff_. For example, this gives httpd_user_script_ro_t and httpd_staff_script_exec_t. This provides for a stronger, mandatory separation between users, administrators, and the system. An ordinary user is prevented from reading system Web content directly, and a compromised or misconfigured system CGI script is prevented from reading a user's content.
Further Approaches for Stronger Security For some, the default &APACHE; policy may actually not be expressive enough. This section discusses extending and fundamentally rewriting the &APACHE; policy for even stronger security. It is assumed that you are familiar with the concepts discussed earlier. This section will generally only outline solutions, instead of going into step-by-step detail.
Individual Domains for Particular CGI Scripts Using the default policy, a compromise of one CGI script means a compromise of all of them. This is because they all run in the same domain (httpd_sys_script_t) with access to the same other types (e.g. httpd_sys_script_rw_t). Put a different way, types are security equivalence classes. Most of the type definitions and permissions regarding CGI scripts are in /etc/selinux/policyname/src/policy/macros/program/apache_macros.te. Open that file up in your favorite editor. This entire file is definining an m4 macro called apache_domain. Understanding <command>m4</command> in one paragraph The define(`apache_domain',` begins the macro definition. Inside the definition, the $1 represents the parameter passed to the macro. If you then look in /etc/selinux/policyname/src/policy/domains/program/apache.te, you'll see the following invocation: apache_domain(sys) This single line then generates a large set of types and rules, substituting sys for every $1. Suppose that you have two CGI programs you want to protect: a blog installation, and a wiki installation. Because these domains will be largely similar, you will create a macro. Open up the file you are using for local policy, /etc/selinux/policyname/src/policy/domains/misc/local.te. In order to separate the blog and the wiki, you need to create separate types (domains) for them, allow httpd_t the ability to transition to those domains, and create new derived types to label their data. This is very similar to what most of apache_domain already does, but unfortunately that macro does too much for your simple needs. However, you can use that macro as a guide for creating your macro. Start with the macro skeleton: define(`apache_script_domain',` # macro content goes here ') dnl end of apache_script_domain Define types for the CGI script executables (similar to httpd_sys_script_exec_t), and domains for the script processes (similar to httpd_sys_script_t). You also need to authorize the system_r role for the type. type httpd_sys_$1_exec_t, file_type, sysadmfile; type httpd_sys_$1_t, domain, privmail; role system_r types httpd_sys_$1_t; Allow &APACHE; to execute the script, and cause it to transition to the script domain. You also want it to be able to signal your CGI script. domain_auto_trans(httpd_t, httpd_sys_$1_exec_t, httpd_sys_$1_t) allow httpd_t httpd_sys_$1_t:process { signal sigkill sigstop }; Define new types for content. The following demonstrates a read-only type and a read-write type, but you can easily define different, more refined types. After defining them, grant your CGI domain the access to them that you want. type httpd_sys_$1_ro_t, file_type, sysadmfile; type httpd_sys_$1_rw_t, file_type, sysadmfile; r_dir_file(httpd_sys_$1_t, httpd_sys_$1_ro_t) create_dir_file(httpd_sys_$1_t, httpd_sys_$1_rw_t) User domains in strict policy On a strict policy system, you also need to allow the user domain to manage files with your new types. See apache_domain. Now at this point, you need to give your new domain permissions. There are a lot of permissions defined in apache_domain. You can copy the core of those. # Copied from apache_macros, more is needed allow httpd_sys_$1_t httpd_t:fd use; allow httpd_sys_$1_t httpd_t:process sigchld; uses_shlib(httpd_sys_$1_t) can_network(httpd_sys_$1_t) can_ypbind(httpd_sys_$1_t) allow httpd_sys_$1_t { usr_t lib_t }:file { getattr read ioctl }; allow httpd_sys_$1_t usr_t:lnk_file { getattr read }; allow httpd_sys_$1_t self:process { fork signal_perms }; ... There are actually more permissions likely to be necessary; they have been omitted for brevity. You can now use your new macro to create the actual types: apache_script_domain(wiki) apache_script_domain(blog) Looking at your macro definition, you can mentally substitute wiki and blog for $1 and see what has happened. You can easily define quite a bit of policy, having built the macro. Execute a make reload in the source directory. Debug any problems that occur. Finally, you need to label your data. Use the chcon command to do this. For example, the wiki CGI executable should be labeled as httpd_sys_wiki_exec_t, its read-only data as httpd_sys_wiki_ro_t, and its database as httpd_sys_wiki_rw_t, etc. Similarly for the blog.
Multiple HTTP Subdomains In the virtual hosting setup outlined in , a compromise or misconfiguration of the main &APACHE; (httpd_t) means all sites are affected. It would be nice if you could actually have multiple &APACHE; servers, each running in their own domain; for example, httpd_site_t. This subsection simply discusses the problems and outlines possible solutions. Looking at the current policy, it is fairly obvious that in order to accomplish this goal, you will need to essentially rewrite it from scratch. The entire policy is predicated on a single httpd_t. The main idea would be to change it into a macro, along the lines of what you did with apache_script_domain in . In fact, if you also want to have individual domains on CGI scripts, you will end up with types of the form: httpd_vhost_sys_script_t. For example, httpd_examplecom_sys_wiki_t would be a wiki CGI for example.com. Assuming that you have a macro apache_server_domain which defines all of the desired types and rules. If you are fortunate enough that you have an IP address per domain, one approach is simply to copy the /usr/sbin/httpd binary multiple times, but label each one differently: ls -aZ /usr/sbin/httpd.* -rwxr-xr-x root root system_u:object_r:httpd_examplecom_exec_t /usr/sbin/httpd.examplecom -rwxr-xr-x root root system_u:object_r:httpd_barorg_exec_t /usr/sbin/httpd.barorg Next, have your init scripts give each one a separate configuration, for example /usr/sbin/httpd.foocom -f foocom.com. If you have to serve multiple virtual sites from one IP address, one approach might be to modify the &APACHE; source code so that once it has read the desired domain from a requesting client, it passes off the request to a child which is running in the domain for that site.
Defining a Webmaster Role This guide has posited that, from a security point of view, a misconfigured &APACHE; is no different from a compromised one. &SEL; deliberately separates the security policy from the configuration of every daemon on the system. One neat consequence of this is that it allows you to actually create a webmaster role that is allowed to modify the &APACHE; configuration file /etc/httpd/conf/httpd.conf, restart the daemon, etc. But no matter how the webmaster changes the configuration, httpd is still restricted by the security policy. In order to do this, you would need to use the strict policy. The overall approach is to create a new account with a uid of 0, but only allowed to log in with the webmaster_r role, which is only authorized for the webmaster_t type. You could create webmaster_t with full_user_role(webmaster), and then proceeed to add a few permissions, such as: create_dir_file(webmaster_t, httpd_config_t) Since you are giving uid 0 (root) access to the webmaster, in this setup you are entirely relying on the &SEL; policy. There is more to do here (making init scripts work will be slightly tricky), but this outlines the general idea. The remainder is left as an exercise for you.
From fedora-docs-commits at redhat.com Sun Dec 4 21:35:16 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Sun, 4 Dec 2005 16:35:16 -0500 Subject: install-guide Makefile, 1.12, 1.13 fedora-install-guide-en.xml, 1.24, 1.25 fedora-install-guide-firewallconfig-ja_JP.xml, 1.2, 1.3 fedora-install-guide-firewallconfig-zh_CN.xml, 1.1, 1.2 fedora-install-guide-firstboot-en.xml, 1.13, 1.14 fedora-install-guide-firstboot-ja_JP.xml, 1.2, 1.3 fedora-install-guide-firstboot-zh_CN.xml, 1.1, 1.2 fedora-install-guide-packageselection-en.xml, 1.14, 1.15 fedora-install-guide-packageselection-ja_JP.xml, 1.2, 1.3 fedora-install-guide-packageselection-zh_CN.xml, 1.1, 1.2 fedora-install-guide-firewallconfig-en.xml, 1.9, NONE Message-ID: <200512042135.jB4LZGkw030821@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30787 Modified Files: Makefile fedora-install-guide-en.xml fedora-install-guide-firewallconfig-ja_JP.xml fedora-install-guide-firewallconfig-zh_CN.xml fedora-install-guide-firstboot-en.xml fedora-install-guide-firstboot-ja_JP.xml fedora-install-guide-firstboot-zh_CN.xml fedora-install-guide-packageselection-en.xml fedora-install-guide-packageselection-ja_JP.xml fedora-install-guide-packageselection-zh_CN.xml Removed Files: fedora-install-guide-firewallconfig-en.xml Log Message: - Updated menu names - Moved Firewall and SELinux sections to firstboot - Removed fedora-install-guide-firewallconfig-en.xml Index: Makefile =================================================================== RCS file: /cvs/docs/install-guide/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 19 Nov 2005 18:24:19 -0000 1.12 +++ Makefile 4 Dec 2005 21:35:07 -0000 1.13 @@ -14,7 +14,7 @@ DOCBASE = fedora-install-guide define XMLEXTRAFILES_template -XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firewallconfig-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-installtypes-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml +XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-installtypes-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml endef $(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG}))) Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fedora-install-guide-en.xml 26 Nov 2005 16:59:27 -0000 1.24 +++ fedora-install-guide-en.xml 4 Dec 2005 21:35:07 -0000 1.25 @@ -6,8 +6,8 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -27,7 +27,6 @@ - @@ -136,6 +135,17 @@ + + 1.0.3 + 2005-12-04 + StuartEllis + + + Reorganized to match anaconda screens. + + + + @@ -157,8 +167,6 @@ &NETWORKCONFIG; - &FIREWALLCONFIG; - &TIMEZONE; &ROOTPASSWORD; Index: fedora-install-guide-firewallconfig-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firewallconfig-ja_JP.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-firewallconfig-ja_JP.xml 6 Nov 2005 04:51:54 -0000 1.2 +++ fedora-install-guide-firewallconfig-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 @@ -52,7 +52,7 @@ ??????????????????????????????????????????????????????????????????????????? - Desktop + System System SettingsSecurity Level and Firewall ????????????????????? @@ -97,7 +97,7 @@ &SEL; ???????????????????????????????????????&FED; ???????????????????????????????????????????????????????????????????????? &SEL; ?????????????????????????????????????????????????????? - Desktop + System System Settings Security Level and Firewall ????????????????????? @@ -111,7 +111,7 @@ &SEL; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????????????????????????????? - Desktop + System System Settings Security Level and Firewall ????????????????????? Index: fedora-install-guide-firewallconfig-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firewallconfig-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-firewallconfig-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-firewallconfig-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 @@ -25,7 +25,7 @@ ????????????????????????????????????????????????????????? No firewall??? ????????????????????? - ??????????????????????????????????????????????????????????????? DesktopSystem SettingsSecurity Level and Firewall + ??????????????????????????????????????????????????????????????? SystemSystem SettingsSecurity Level and Firewall
@@ -58,13 +58,13 @@ Disabled - ?????????????????????????????????&FED; ???????????????????????????????????????????????????????????? &SEL;??????????????????????????? DesktopSystem SettingsSecurity Level and Firewall??? + ?????????????????????????????????&FED; ???????????????????????????????????????????????????????????? &SEL;??????????????????????????? SystemSystem SettingsSecurity Level and Firewall??? ?????? &SEL; ?????? - &SEL; ?????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????? DesktopSystem SettingsSecurity Level and Firewall??? + &SEL; ?????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????? SystemSystem SettingsSecurity Level and Firewall???
Index: fedora-install-guide-firstboot-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-en.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fedora-install-guide-firstboot-en.xml 1 Dec 2005 23:47:21 -0000 1.13 +++ fedora-install-guide-firstboot-en.xml 4 Dec 2005 21:35:07 -0000 1.14 @@ -37,7 +37,7 @@ after you log in. -
+
License Agreement @@ -71,6 +71,131 @@ Agreement and then select Next.
+ +
+ Firewall + + + The + firewall + firewall built into &FC; + checks every incoming and outgoing network connection on your + machine against a set of rules. These rules specify which types of + connections are permitted and which are denied. + + + + By default the firewall is enabled, with a simple set of rules + that allow connections to be made from your system to others, but + block incoming connections from other systems. You may make + changes on this screen to allow access to specific network + services on your &FED; system. + + + + To enable access to services listed on this screen, click the + check box next to the service name. After installation is + complete, you can enable access to other services as well. + + + + Avoid disabling the firewall. If you believe it is necessary to + do so, select No firewall. + + + + Changing the Firewall Settings + + To change these settings later, from the main menu, choose + + System + AdministrationSecurity + Level and Firewall. + + +
+ +
+ &SEL; + + + The + &SEL; + &SEL; (Security Enhanced + Linux) framework is part of &FC;. &SEL; limits the actions of both + users and programs by enforcing security policies throughout the + operating system. Without &SEL;, software bugs or configuration + changes may render a system more vulnerable. The restrictions + imposed by &SEL; policies provide extra security against + unauthorized access. + + + + Inflexible &SEL; policies might inhibit many normal activities on + a &FED; system. For this reason, &FC; uses targeted policies, + which only affect specific network services. These services + cannot perform actions that are not part of their normal + functions. The targeted policies reduce or eliminate any + inconvenience &SEL; might cause users. Set the &SEL; mode to one + of the following: + + + + + Active + + + Select this mode to use the targeted &SEL; policy on your + &FED; system. This is the default mode for &FED; + installations. + + + + + Permissive + + + In this mode, the system is configured with + &SEL;, but a breach of security policies only causes an + error message to appear. No activities are actually + prohibited when &SEL; is installed in this mode. You may + change the &SEL; mode to Active at any + time after booting. + + + + + Disabled + + + If you choose this mode for &SEL;, &FED; does not configure + the access control system at all. To make &SEL; active + later, from the main menu, select + + System + Administration + Security Level and Firewall + . + + + + + + + Changing the &SEL; policy + + &SEL; is unique in that it cannot be bypassed, even by the + system administrators. To change the behavior of &SEL; after + installation, from the main menu, choose + System + Administration + Security Level and Firewall + . + + + +
+
Date and Time @@ -113,8 +238,7 @@ Setting the Clock To change these settings later, from the main menu, choose - Desktop System - Settings Date & Time + System Administration Date & Time . @@ -236,8 +360,7 @@ To reconfigure your system after the installation has completed, from the main menu, choose - Desktop System - Settings Display + System Administration Display . @@ -278,8 +401,7 @@ To add additional user accounts to your system after the installation is complete, from the main menu, choose - Desktop System - Settings Users & + System Administration Users & Groups . @@ -338,8 +460,7 @@ &FC; will automatically attempt to detect a new sound card if you add one to your system. If you need to launch the detection process manually, from the main menu, choose - Desktop System - Settings Soundcard + System Administration Soundcard Detection . Index: fedora-install-guide-firstboot-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-ja_JP.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-firstboot-ja_JP.xml 6 Nov 2005 04:51:54 -0000 1.2 +++ fedora-install-guide-firstboot-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 @@ -104,7 +104,7 @@ ?????????????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Date & Time ????????????????????? @@ -205,7 +205,7 @@ ?????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Display ????????????????????? @@ -247,7 +247,7 @@ ???????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Users & Groups ????????????????????? @@ -304,7 +304,7 @@ ???????????????????????????????????? &FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Soundcard Detection ????????????????????? @@ -325,7 +325,7 @@ ????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Add/Remove Applications ????????????????????? Index: fedora-install-guide-firstboot-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-firstboot-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-firstboot-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 @@ -63,7 +63,7 @@ ?????? Network Time Protocol ??????????????????????????? NTP ????????? ???????????? - ????????????????????????????????????????????????????????? DesktopSystem SettingsDate & Time??? + ????????????????????????????????????????????????????????? SystemSystem SettingsDate & Time??? ????????????????????????????????????????????????????????? Enable Network Time Protocol ????????????????????????????????? Date and Time ?????????????????????????????????????????????
@@ -121,7 +121,7 @@ ???????????????????????????????????? Resolution ?????? Color Depth????????????????????????????????????????????????Setup Agent ??????????????????????????????????????????????????? ?????????????????? - ??????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsDisplay??? + ??????????????????????????????????????????????????????????????????????????? SystemSystem SettingsDisplay???
@@ -144,7 +144,7 @@ ?????????????????????????????????????????????????????????????????????????????? Confirm Password ????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? ??????????????????????????? - ??????????????????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsUsers & Groups??? + ??????????????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsUsers & Groups??? ????????? &FC; ??????????????????????????????????????????????????????????????? Use Network Login...??? ?????????????????????????????????????????? Next ????????? @@ -171,7 +171,7 @@ ???????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????? ???????????? - ??????????????????????????????????????????&FC; ??????????????????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsSoundcard Detection??? + ??????????????????????????????????????????&FC; ??????????????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsSoundcard Detection???
@@ -179,7 +179,7 @@ ???????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????????????????? ???????????? - ????????? &FC; ???????????????????????????????????????????????? Package Manager ??????????????????????????????????????? DesktopSystem SettingsAdd/Remove Applications??? + ????????? &FC; ???????????????????????????????????????????????? Package Manager ??????????????????????????????????????? SystemSystem SettingsAdd/Remove Applications???
?????? CD ?????? Index: fedora-install-guide-packageselection-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-en.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fedora-install-guide-packageselection-en.xml 1 Dec 2005 23:47:21 -0000 1.14 +++ fedora-install-guide-packageselection-en.xml 4 Dec 2005 21:35:07 -0000 1.15 @@ -28,7 +28,7 @@ permanent. After you boot your system, use the Package Management tool to make different software selections for your system. To run this tool, - from the main menu, select Desktop + from the main menu, select System System Settings Add/Remove Applications . Index: fedora-install-guide-packageselection-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-ja_JP.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-packageselection-ja_JP.xml 6 Nov 2005 04:51:54 -0000 1.2 +++ fedora-install-guide-packageselection-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 @@ -12,7 +12,7 @@ ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????? - Desktop + System System Settings Add/Remove Applications ????????????????????? Index: fedora-install-guide-packageselection-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-packageselection-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-packageselection-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 @@ -4,7 +4,7 @@ &FED; ??????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Custom ???????????????&FED; ??????????????? Package Group Selection??? ???????????? - ??????????????????????????????????????????????????????????????????????????????????????????????????? Package Management ?????????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsAdd/Remove Applications??? + ??????????????????????????????????????????????????????????????????????????????????????????????????? Package Management ?????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsAdd/Remove Applications???
????????????????????? --- fedora-install-guide-firewallconfig-en.xml DELETED --- From fedora-docs-commits at redhat.com Sun Dec 4 23:15:37 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Sun, 4 Dec 2005 18:15:37 -0500 Subject: install-guide/figs install-types.eps, 1.2, NONE install-types.png, 1.2, NONE Message-ID: <200512042315.jB4NFbvV002025@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1964/figs Removed Files: install-types.eps install-types.png Log Message: - Removed "Installation Types" section - Updated menu name --- install-types.eps DELETED --- From fedora-docs-commits at redhat.com Sun Dec 4 23:15:31 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Sun, 4 Dec 2005 18:15:31 -0500 Subject: install-guide Makefile, 1.13, 1.14 fedora-install-guide-en.xml, 1.25, 1.26 fedora-install-guide-firewallconfig-ja_JP.xml, 1.3, 1.4 fedora-install-guide-firewallconfig-zh_CN.xml, 1.2, 1.3 fedora-install-guide-firstboot-ja_JP.xml, 1.3, 1.4 fedora-install-guide-firstboot-zh_CN.xml, 1.2, 1.3 fedora-install-guide-packageselection-en.xml, 1.15, 1.16 fedora-install-guide-packageselection-ja_JP.xml, 1.3, 1.4 fedora-install-guide-packageselection-zh_CN.xml, 1.2, 1.3 fedora-install-guide-installtypes-en.xml, 1.7, NONE Message-ID: <200512042316.jB4NG2YB002030@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1964 Modified Files: Makefile fedora-install-guide-en.xml fedora-install-guide-firewallconfig-ja_JP.xml fedora-install-guide-firewallconfig-zh_CN.xml fedora-install-guide-firstboot-ja_JP.xml fedora-install-guide-firstboot-zh_CN.xml fedora-install-guide-packageselection-en.xml fedora-install-guide-packageselection-ja_JP.xml fedora-install-guide-packageselection-zh_CN.xml Removed Files: fedora-install-guide-installtypes-en.xml Log Message: - Removed "Installation Types" section - Updated menu name Index: Makefile =================================================================== RCS file: /cvs/docs/install-guide/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile 4 Dec 2005 21:35:07 -0000 1.13 +++ Makefile 4 Dec 2005 23:15:24 -0000 1.14 @@ -14,7 +14,7 @@ DOCBASE = fedora-install-guide define XMLEXTRAFILES_template -XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-installtypes-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml +XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml endef $(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG}))) Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fedora-install-guide-en.xml 4 Dec 2005 21:35:07 -0000 1.25 +++ fedora-install-guide-en.xml 4 Dec 2005 23:15:24 -0000 1.26 @@ -23,7 +23,6 @@ - @@ -159,8 +158,6 @@ &UPGRADING; - &INSTALLTYPES; - &DISKPARTITIONING; &BOOTLOADER; Index: fedora-install-guide-firewallconfig-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firewallconfig-ja_JP.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-firewallconfig-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 +++ fedora-install-guide-firewallconfig-ja_JP.xml 4 Dec 2005 23:15:24 -0000 1.4 @@ -53,7 +53,7 @@ ??????????????????????????????????????????????????????????????????????????? System - System SettingsSecurity + AdministrationSecurity Level and Firewall ????????????????????? @@ -98,7 +98,7 @@ &SEL; ???????????????????????????????????????&FED; ???????????????????????????????????????????????????????????????????????? &SEL; ?????????????????????????????????????????????????????? System - System Settings + Administration Security Level and Firewall ????????????????????? @@ -112,7 +112,7 @@ &SEL; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????????????????????????????? System - System Settings + Administration Security Level and Firewall ????????????????????? Index: fedora-install-guide-firewallconfig-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firewallconfig-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-firewallconfig-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 +++ fedora-install-guide-firewallconfig-zh_CN.xml 4 Dec 2005 23:15:24 -0000 1.3 @@ -25,7 +25,7 @@ ????????????????????????????????????????????????????????? No firewall??? ????????????????????? - ??????????????????????????????????????????????????????????????? SystemSystem SettingsSecurity Level and Firewall + ??????????????????????????????????????????????????????????????? SystemAdministrationSecurity Level and Firewall
@@ -58,13 +58,13 @@ Disabled - ?????????????????????????????????&FED; ???????????????????????????????????????????????????????????? &SEL;??????????????????????????? SystemSystem SettingsSecurity Level and Firewall??? + ?????????????????????????????????&FED; ???????????????????????????????????????????????????????????? &SEL;??????????????????????????? SystemAdministrationSecurity Level and Firewall??? ?????? &SEL; ?????? - &SEL; ?????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????? SystemSystem SettingsSecurity Level and Firewall??? + &SEL; ?????????????????????????????????????????????????????????????????????????????????????????? &SEL; ???????????????????????????????????? SystemAdministrationSecurity Level and Firewall???
Index: fedora-install-guide-firstboot-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-ja_JP.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-firstboot-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 +++ fedora-install-guide-firstboot-ja_JP.xml 4 Dec 2005 23:15:24 -0000 1.4 @@ -105,7 +105,7 @@ ?????????????????????????????????????????????????????????????????????????????? System - System Settings + Administration Date & Time ????????????????????? @@ -206,7 +206,7 @@ ???????????????????????????????????????????????????????????????????????????????????????????????????????????? System - System Settings + Administration Display ????????????????????? @@ -248,7 +248,7 @@ ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? System - System Settings + Administration Users & Groups ????????????????????? @@ -305,7 +305,7 @@ &FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? System - System Settings + Administration Soundcard Detection ????????????????????? @@ -326,7 +326,7 @@ &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????? System - System Settings + Administration Add/Remove Applications ????????????????????? Index: fedora-install-guide-firstboot-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-firstboot-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 +++ fedora-install-guide-firstboot-zh_CN.xml 4 Dec 2005 23:15:24 -0000 1.3 @@ -63,7 +63,7 @@ ?????? Network Time Protocol ??????????????????????????? NTP ????????? ???????????? - ????????????????????????????????????????????????????????? SystemSystem SettingsDate & Time??? + ????????????????????????????????????????????????????????? SystemAdministrationDate & Time??? ????????????????????????????????????????????????????????? Enable Network Time Protocol ????????????????????????????????? Date and Time ?????????????????????????????????????????????
@@ -121,7 +121,7 @@ ???????????????????????????????????? Resolution ?????? Color Depth????????????????????????????????????????????????Setup Agent ??????????????????????????????????????????????????? ?????????????????? - ??????????????????????????????????????????????????????????????????????????? SystemSystem SettingsDisplay??? + ??????????????????????????????????????????????????????????????????????????? SystemAdministrationDisplay???
@@ -144,7 +144,7 @@ ?????????????????????????????????????????????????????????????????????????????? Confirm Password ????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? ??????????????????????????? - ??????????????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsUsers & Groups??? + ??????????????????????????????????????????????????????????????????????????????????????? SystemAdministrationUsers & Groups??? ????????? &FC; ??????????????????????????????????????????????????????????????? Use Network Login...??? ?????????????????????????????????????????? Next ????????? @@ -171,7 +171,7 @@ ???????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????? ???????????? - ??????????????????????????????????????????&FC; ??????????????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsSoundcard Detection??? + ??????????????????????????????????????????&FC; ??????????????????????????????????????????????????????????????????????????????????????? SystemAdministrationSoundcard Detection???
@@ -179,7 +179,7 @@ ???????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????????????????? ???????????? - ????????? &FC; ???????????????????????????????????????????????? Package Manager ??????????????????????????????????????? SystemSystem SettingsAdd/Remove Applications??? + ????????? &FC; ???????????????????????????????????????????????? Package Manager ??????????????????????????????????????? SystemAdministrationAdd/Remove Applications???
?????? CD ?????? Index: fedora-install-guide-packageselection-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-en.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fedora-install-guide-packageselection-en.xml 4 Dec 2005 21:35:07 -0000 1.15 +++ fedora-install-guide-packageselection-en.xml 4 Dec 2005 23:15:24 -0000 1.16 @@ -29,7 +29,7 @@ Package Management tool to make different software selections for your system. To run this tool, from the main menu, select System - System Settings Add/Remove + Administration Add/Remove Applications . Index: fedora-install-guide-packageselection-ja_JP.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-ja_JP.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-packageselection-ja_JP.xml 4 Dec 2005 21:35:07 -0000 1.3 +++ fedora-install-guide-packageselection-ja_JP.xml 4 Dec 2005 23:15:24 -0000 1.4 @@ -13,7 +13,7 @@ ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????? System - System Settings + Administration Add/Remove Applications ????????????????????? Index: fedora-install-guide-packageselection-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-packageselection-zh_CN.xml 4 Dec 2005 21:35:07 -0000 1.2 +++ fedora-install-guide-packageselection-zh_CN.xml 4 Dec 2005 23:15:24 -0000 1.3 @@ -4,7 +4,7 @@ &FED; ??????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Custom ???????????????&FED; ??????????????? Package Group Selection??? ???????????? - ??????????????????????????????????????????????????????????????????????????????????????????????????? Package Management ?????????????????????????????????????????????????????????????????????????????? SystemSystem SettingsAdd/Remove Applications??? + ??????????????????????????????????????????????????????????????????????????????????????????????????? Package Management ?????????????????????????????????????????????????????????????????????????????? SystemAdministrationAdd/Remove Applications???
????????????????????? --- fedora-install-guide-installtypes-en.xml DELETED --- From fedora-docs-commits at redhat.com Tue Dec 6 01:25:32 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Mon, 5 Dec 2005 20:25:32 -0500 Subject: install-guide fedora-install-guide-firstboot-en.xml, 1.14, 1.15 fedora-install-guide-nextsteps-en.xml, 1.7, 1.8 Message-ID: <200512060125.jB61PWgJ020131@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20112 Modified Files: fedora-install-guide-firstboot-en.xml fedora-install-guide-nextsteps-en.xml Log Message: - Added admonition to update the system after installation completes - Added section on updating Fedora Core - Added a section on annnoucements mailing list and package updates RSS Index: fedora-install-guide-firstboot-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-en.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fedora-install-guide-firstboot-en.xml 4 Dec 2005 21:35:07 -0000 1.14 +++ fedora-install-guide-firstboot-en.xml 6 Dec 2005 01:25:25 -0000 1.15 @@ -29,7 +29,7 @@ Agent. - GUI Required + Graphical Interface Required Setup Agent requires a graphical @@ -71,13 +71,12 @@ Agreement and then select Next.
-
Firewall The - firewall + firewall firewall built into &FC; checks every incoming and outgoing network connection on your machine against a set of rules. These rules specify which types of @@ -87,45 +86,42 @@ By default the firewall is enabled, with a simple set of rules that allow connections to be made from your system to others, but - block incoming connections from other systems. You may make + block incoming connections from other systems. You may make changes on this screen to allow access to specific network services on your &FED; system. To enable access to services listed on this screen, click the - check box next to the service name. After installation is + check box next to the service name. After installation is complete, you can enable access to other services as well. - Avoid disabling the firewall. If you believe it is necessary to - do so, select No firewall. + Avoid disabling the firewall. If you believe it is necessary to do + so, select No firewall. - Changing the Firewall Settings - To change these settings later, from the main menu, choose - - System - AdministrationSecurity - Level and Firewall. - + To change these settings later, from the main menu, choose + System + AdministrationSecurity + Level and Firewall. +
-
&SEL; The - &SEL; + &SEL; &SEL; (Security Enhanced Linux) framework is part of &FC;. &SEL; limits the actions of both users and programs by enforcing security policies throughout the operating system. Without &SEL;, software bugs or configuration - changes may render a system more vulnerable. The restrictions + changes may render a system more vulnerable. The restrictions imposed by &SEL; policies provide extra security against unauthorized access. @@ -133,69 +129,64 @@ Inflexible &SEL; policies might inhibit many normal activities on a &FED; system. For this reason, &FC; uses targeted policies, - which only affect specific network services. These services - cannot perform actions that are not part of their normal - functions. The targeted policies reduce or eliminate any - inconvenience &SEL; might cause users. Set the &SEL; mode to one - of the following: + which only affect specific network services. These services cannot + perform actions that are not part of their normal functions. The + targeted policies reduce or eliminate any inconvenience &SEL; + might cause users. Set the &SEL; mode to one of the following: - Active - - - Select this mode to use the targeted &SEL; policy on your - &FED; system. This is the default mode for &FED; - installations. - - + Active + + + Select this mode to use the targeted &SEL; policy on your + &FED; system. This is the default mode for &FED; + installations. + + + - Permissive - - - In this mode, the system is configured with - &SEL;, but a breach of security policies only causes an - error message to appear. No activities are actually - prohibited when &SEL; is installed in this mode. You may - change the &SEL; mode to Active at any - time after booting. - - + Permissive + + + In this mode, the system is configured with &SEL;, but a + breach of security policies only causes an error message to + appear. No activities are actually prohibited when &SEL; is + installed in this mode. You may change the &SEL; mode to + Active at any time after booting. + + + - Disabled - - - If you choose this mode for &SEL;, &FED; does not configure - the access control system at all. To make &SEL; active - later, from the main menu, select - - System - Administration - Security Level and Firewall - . - - + Disabled + + + If you choose this mode for &SEL;, &FED; does not configure + the access control system at all. To make &SEL; active + later, from the main menu, select + System + Administration + Security Level and Firewall + . + + - Changing the &SEL; policy - &SEL; is unique in that it cannot be bypassed, even by the - system administrators. To change the behavior of &SEL; after - installation, from the main menu, choose - System - Administration - Security Level and Firewall - . + &SEL; is unique in that it cannot be bypassed, even by the + system administrators. To change the behavior of &SEL; after + installation, from the main menu, choose + System + Administration Security + Level and Firewall . -
-
Date and Time @@ -238,8 +229,9 @@ Setting the Clock To change these settings later, from the main menu, choose - System Administration Date & Time - . + System + Administration Date & + Time . @@ -360,8 +352,9 @@ To reconfigure your system after the installation has completed, from the main menu, choose - System Administration Display - . + System + Administration + Display .
@@ -401,7 +394,8 @@ To add additional user accounts to your system after the installation is complete, from the main menu, choose - System Administration Users & + System + Administration Users & Groups . @@ -450,6 +444,11 @@ + Explain the option to Use only the hardware device + + + + You may manually configure a &FC; system to use unsupported sound cards after the installation process is complete. Manual sound hardware configuration is beyond the scope of this document. @@ -460,7 +459,8 @@ &FC; will automatically attempt to detect a new sound card if you add one to your system. If you need to launch the detection process manually, from the main menu, choose - System Administration Soundcard + System + Administration Soundcard Detection . @@ -487,6 +487,17 @@ Click Next to proceed to the login screen. Your &FC; system is now ready for use. + + + Update Your System + + + To ensure the security of your system, run a package update + after the installation completes. + explains how to update your + &FED; system. + +
Index: fedora-install-guide-nextsteps-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-nextsteps-en.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fedora-install-guide-nextsteps-en.xml 9 Jun 2005 21:04:39 -0000 1.7 +++ fedora-install-guide-nextsteps-en.xml 6 Dec 2005 01:25:25 -0000 1.8 @@ -2,34 +2,165 @@ Your Next Steps - &FC; provides you with a complete operating system with a vast range of capabilities, supported by a large community. +
+ Updating Your &FED; System + + The &FP; releases updated software packages for &FC; throughout + the support period of each version. Updated packages add new + features, improve reliability, resolve bugs, or remove security + vulnerabilities. To ensure the security of your system, carry out + an update when the installation process completes. You should then + update regularly, and as soon as possible after a security + announcement. Refer to for + information on the &FED; announcements services. + + + + To update your system with the latest packages, use the + Package Updater: + + + + + Choose System + Administration Package + Updater . + + + + + When prompted, enter the + root password. + + + + + Review the list of updated packages. If your system uses a + slow network connection the Package + Updater may require several seconds to download + the information for all of the updated packages. + + + + + Click Apply Updates to begin the update + process. + + + + + Restart any active programs or network services listed in the + update window. If the updates include a + kernel package, restart your system as + soon as possible to load the new kernel. + + + + + Check this procedure on test2 + -
- Documentation on the Web + + To update packages from the command-line, use the + yum utility. Type this command to begin a full + update of your system with yum: + + +su -c 'yum update' + + + Enter the root password + when prompted. + + + Refer to for + more information on yum. + + + Automating Updates - Documentation for &FC; is available from the &FP; - Website: - - + If your &FED; system has a permanent network connection, you may + choose to enable daily system updates. To enable automatic + updates, follow the instructions on the webpage + . + + +
+
+ Subscribing to &FED; Announcements and News + + + To receive information about package updates, subscribe to either + the announcements mailing list, or the RSS feeds. + + + + + + &FP; announcements mailing list + + + + + + + + + + + &FP; RSS feeds + + + + + + + + + + + The annnouncements mailing list also provides you with news on the + &FP;, and the &FED; community. + + + + Security Announcements + - [SECURITY] in the title identify + package updates that remove security vulnerabilities. + + +
+
+ Finding Documentation on the Web + + + Documentation for &FC; is available from the &FP; Website: + + + + http://fedora.redhat.com/docs/ - + - - The Linux Documentation Project (LDP) produces books and tutorials: - + + The Linux Documentation Project (LDP) produces books and + tutorials: + - - + http://www.tldp.org/ - + For many parts of &FC;, you may find the &RHEL; documentation @@ -41,63 +172,54 @@ url="http://www.redhat.com/docs/manuals/enterprise/">http://www.redhat.com/docs/manuals/enterprise/ - - Many other organizations and individuals also provide tutorials - and HOWTOs for &FED; on their Websites. You can locate - information on any topic by using Google: - + + Many other organizations and individuals also provide tutorials + and HOWTOs for &FED; on their Websites. You can locate information + on any topic by using Google: + - - + http://www.google.com/linux/ - - -
- - + +
- Community Support - - - Members of the &FED; community provides support through mailing - lists, web forums and Linux User Groups (LUGs) across the world. - - - - The Website for the official forums is: - + Getting Community Support - - http://forums.fedoraforum.org/ - - -
+ + Members of the &FED; community provides support through mailing + lists, web forums and Linux User Groups (LUGs) across the world. + + + The Website for the official forums is: + + + http://forums.fedoraforum.org/ + +
- Joining The &FED; Community + Joining The &FED; Community - - The &FP; is driven by the individuals that contribute to it. Community - members provide support and documentation to other users, help to improve the - software included in &FC; by testing, and develop new software - alongside the programmers employed by &RH;. The results of this - work are available to all. - + + The &FP; is driven by the individuals that contribute to it. + Community members provide support and documentation to other + users, help to improve the software included in &FC; by testing, + and develop new software alongside the programmers employed by + &RH;. The results of this work are available to all. + - - To make a difference, start here: - + + To make a difference, start here: + - - + http://fedora.redhat.com/participate/ - - -
- - + + - + @@ -144,7 +144,15 @@ - + + 1.0.4 + 2005-12-06 + StuartEllis + + + Added material on updating the new installation. + + From fedora-docs-commits at redhat.com Tue Dec 6 20:54:54 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Tue, 6 Dec 2005 15:54:54 -0500 Subject: install-guide fedora-install-guide-en.xml, 1.27, 1.28 fedora-install-guide-intro-en.xml, 1.19, 1.20 Message-ID: <200512062054.jB6Kssf7023916@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23891 Modified Files: fedora-install-guide-en.xml fedora-install-guide-intro-en.xml Log Message: - Added comment on "Server" installation section - Fixed missing tag in revision history Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fedora-install-guide-en.xml 6 Dec 2005 01:29:17 -0000 1.27 +++ fedora-install-guide-en.xml 6 Dec 2005 20:54:47 -0000 1.28 @@ -153,6 +153,7 @@ Added material on updating the new installation. + Index: fedora-install-guide-intro-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fedora-install-guide-intro-en.xml 26 Nov 2005 16:59:27 -0000 1.19 +++ fedora-install-guide-intro-en.xml 6 Dec 2005 20:54:47 -0000 1.20 @@ -143,6 +143,8 @@ Is it just me, or is this section really out of place? [PWF] + The original text reminded the reader to get the hostname and IP settings for a server before installing. Other types of installation are usually better with the default DHCP. [SE] +
Installing &FC; as a Server From fedora-docs-commits at redhat.com Wed Dec 7 17:21:20 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Wed, 7 Dec 2005 12:21:20 -0500 Subject: selinux-faq Makefile,1.4,1.5 Message-ID: <200512071721.jB7HLKoY030001@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/selinux-faq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29984/selinux-faq Modified Files: Makefile Log Message: Updated LANGUAGES to cover new italian translation Index: Makefile =================================================================== RCS file: /cvs/docs/selinux-faq/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 16 Nov 2005 01:59:05 -0000 1.4 +++ Makefile 7 Dec 2005 17:21:12 -0000 1.5 @@ -8,9 +8,10 @@ # Copyright 2005 Tommy Reynolds, MegaCoder.com ############################################################################### -LANGUAGES = en +LANGUAGES = en it DOCBASE = selinux-faq XMLEXTRAFILES-en = +XMLEXTRAFILES-it = ###################################################### include ../docs-common/Makefile.common From fedora-docs-commits at redhat.com Wed Dec 7 21:28:24 2005 From: fedora-docs-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 7 Dec 2005 16:28:24 -0500 Subject: release-notes security-en.xml,1.5,1.6 Message-ID: <200512072128.jB7LSOCt005427@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5410 Modified Files: security-en.xml Log Message: Replacing with equivalent and useful URL that works everywhere. Index: security-en.xml =================================================================== RCS file: /cvs/docs/release-notes/security-en.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- security-en.xml 25 Nov 2005 19:22:48 -0000 1.5 +++ security-en.xml 7 Dec 2005 21:28:17 -0000 1.6 @@ -81,7 +81,7 @@ http://post-office.corp.redhat.com/archives/rhselinux-project/2005-June/msg00001.html + url="http://www.livejournal.com/users/james_morris/5583.html">http://www.livejournal.com/users/james_morris/5583.html
From fedora-docs-commits at redhat.com Thu Dec 8 00:27:39 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Wed, 7 Dec 2005 19:27:39 -0500 Subject: install-guide fedora-install-guide-diskpartitioning-en.xml, 1.14, 1.15 fedora-install-guide-en.xml, 1.28, 1.29 fedora-install-guide-firstboot-en.xml, 1.15, 1.16 fedora-install-guide-nextsteps-en.xml, 1.8, 1.9 Message-ID: <200512080027.jB80RdRf012703@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12664 Modified Files: fedora-install-guide-diskpartitioning-en.xml fedora-install-guide-en.xml fedora-install-guide-firstboot-en.xml fedora-install-guide-nextsteps-en.xml Log Message: - Updated Disk Partitioning to match new screen - Added initial note on Modifying SELinux Policy option - Added yum and Package Updater to indexing Index: fedora-install-guide-diskpartitioning-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-diskpartitioning-en.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fedora-install-guide-diskpartitioning-en.xml 26 Nov 2005 16:59:27 -0000 1.14 +++ fedora-install-guide-diskpartitioning-en.xml 8 Dec 2005 00:27:16 -0000 1.15 @@ -1,149 +1,102 @@ + Disk Partitioning - - If you are new to Linux, you may want to use the automatic - partitioning method. If you are a more experienced Linux user, use - the manual partitioning method for more control over your system - configuration, or select and modify the automatically defined - partitions. + &FC; creates and uses several partitions on + the available hard drives. You may customize both the partitions, + and how the drives on your system are managed. On systems with more + than one hard drive you may also configure &FC; to operate several + drives as a group, or array, with RAID. Partitions and RAID arrays + are explained in , and + . + + Changing Your Mind -
- - Disk Partitioning Setup Screen - - - - - - - - - - disk partitioning setup screen - - -
- - -
- Choosing a Partitioning Method - -
- Setting Up Partitions Automatically - - - Choose Automatic partitioning at the - partitioning menu to use a preset partitioning layout. - Disk Druid then displays additional - options: - - - -
- - Automatic Partitioning Setup Screen - - - - - - - - - - automatic partitioning screen - - -
- - - - Remove all Linux partitions on this - system - - - Removes all ext2, - ext3, and Linux - swap partitions from all hard disks - - - - - Remove all partitions on this - system - - - Removes all partitions from all hard - disks - - - - - Keep all partitions and use only existing free - space - - - Uses only the unpartitioned space on the hard disk(s) to - install &FC; - - - - - - - Select the desired option. - - - - Next, select any disks you wish to use for Linux partitions. If - your system contains only one disk, that disk is automatically - selected. Any disks you select are used for Linux partitions - according to the option selected above. The option selection is - global, and you may not select a different option for each disk. - - - - Device Names - - If you are confused about the device names used in this box, - consult the Linux Partition-HOWTO at http://www.tldp.org/HOWTO/Partition/partition-2.html. - - - - - To review the automatic partition configuration, select the - Review checkbox. - - - If you remove any existing partitions, the installation program - asks you to confirm this choice. After you review and approve - the partition configuration, select Next - to continue to the next installation step. Proceed with . - - -
- -
- Setting Up Partitions Manually + + The installation process makes no changes to your system until + package installation begins. You may use + Back to return to previous screens and + change your selections at any time. + + + + Needs screenshot. + + + + The box on the screen lists the available drives. By default, the + installation process may affect all of the drives on your computer. + To ensure that specific drives are not repartitioned, clear the + checkbox next to those drives on this list. + + + The installation process erases any existing Linux partitions on the + selected drives, and replaces them with the default set of + partitions for &FC;. All other types of partitions remain unchanged. + For example, partitions used by Microsoft Windows, and system + recovery partitions created by the computer manufacturer, are both + left intact. You may choose an alternative from the drop-down list: + + + + Remove all partitions on selected drives and create default layout + + + Avoid this option, unless you wish to erase all of the + existing operating systems and data on the selected drives. + + + - - To manually set up all disk partitions, choose - Manually partition with Disk Druid. Choose - this method if you require a special partition configuration. - If you are familiar with how disk partitions and the Linux file - system work, move on to . - Otherwise, read . - + + Use free space on selected drives and create default layout + + + If the selected drives have capacity that has not been + assigned to a partition, this option installs &FC; into the + free space. This ensures that no existing partition is + modified by the installation process. + + + -
+ + Create custom layout + + + You manually specify the partitioning on the selected drives. + The next screen enables you to configure the drives and + partitions for your computer. If you choose this option, &FC; + creates no partitions by default. + + + + + + Select Review and modify partitioning layout to + customize the set of partitions that &FC; creates, to configure your + system to use drives in RAID arrays, or to modify the boot options + for your computer. If you choose one of the alternative partitioning + options, this is automatically selected. + + + Choose a partitioning option, and select Next + to proceed. + + + The Next Screen -
- + + The next screen is Network Devices, explained + , unless you select an option to + customize the partition layout. If you choose to either + Create custom layout, or Review and + modify partitioning layout, proceed to the next section + of this document. + +
General Information on Partitions @@ -153,199 +106,194 @@ - - A data partition mounted at /boot - + + A data partition mounted at /boot + - - A data partition mounted at / - + + A data partition mounted at / + - - A swap partition - + + A swap partition + Many systems have more partitions than the minimum listed above. - Choose partitions based on your particular system needs. If you - are not sure what to choose, use the Automatic Partitioning - method shown in . + Choose partitions based on your particular system needs. If you + are not sure what to choose, accept the default partition layout. Data partitions have a - mount point - mount point. The mount point - indicates the directory whose contents reside on that partition. - A partition with no mount point is not accessible by users. Data - not located on any other partition resides in the + mount point + mount point. The mount point + indicates the directory whose contents reside on that partition. A + partition with no mount point is not accessible by users. Data not + located on any other partition resides in the / (or - partition - root - root) partition. - + partition + root + root) partition. + - Root and <filename>/root</filename> + Root and <filename>/root</filename> + - The / (or - partitionroot - root) partition is the top of the directory structure. The - partition/root - /root (sometimes pronounced - "slash-root") directory is the home directory of the user - account for system administration. - - + The / (or + partition + root + root) partition is the top of the directory + structure. The + partition + /root + + /root (sometimes pronounced + "slash-root") directory is the home directory of the user + account for system administration. + + - In the minimum configuration shown above: + In the minimum configuration shown above: + - - All data under the /boot/ directory - resides on the /boot partition. For - example, the file /boot/grub/grub.conf - resides on the /boot partition. - + + All data under the /boot/ directory + resides on the /boot partition. For + example, the file /boot/grub/grub.conf + resides on the /boot partition. + - - Any file outside of the /boot partition, - such as /etc/passwd, resides on the - / partition. - + + Any file outside of the /boot partition, + such as /etc/passwd, resides on the + / partition. + + - Subdirectories may be assigned to partitions as well. Some + Subdirectories may be assigned to partitions as well. Some administrators create both /usr and - /usr/local partitions. In that case, files - under /usr/local/, such as + /usr/local partitions. In that case, files + under /usr/local, such as /usr/local/bin/foo, will be on the - /usr/local partition. Any other files in + /usr/local partition. Any other files in /usr/, such as /usr/bin/foo, will be in the /usr partition. + If you create many partitions instead of one large - / partition, upgrades become easier. Refer - to the description of Disk Druid's - Edit option for more - information. + / partition, upgrades become easier. Refer to + the description of Disk Druid's + Edit option + for more information. - -
+
Partition Types - Every partition has a - partition - type - file system - partition type, to indicate - the format of the - file system file - system on that partition. The file system enables - Linux to organize, search, and retrieve files stored on that - partition. Use the - - ext3 - file system - - file system - ext3 - + partition + type + file system + partition type, to indicate + the format of the + file system + file system on that + partition. The file system enables Linux to organize, search, + and retrieve files stored on that partition. Use the + ext3 + + file system + + file system + ext3 + + + ext3 - file system for data partitions that are not part of LVM, unless - you have specific needs that require another type of file - system. + file system for data partitions that are not part of LVM, unless + you have specific needs that require another type of file + system. +
-
- - -
+
Understanding LVM - - LVM - understanding + LVM + understanding - - LVM (Logical Volume Management) partitions provide a number of - advantages over standard partitions. LVM partitions are - formatted as - LVM - physical volume - physical volumes. One or more physical - volumes are combined to form a - LVM - volume group - volume group. Each volume - group's total storage is then divided into one or more - - LVM - logical volume - logical volumes. The logical volumes - function much like standard data partitions. They have a file - system type, such as ext3, and a mount point. + LVM (Logical Volume Management) partitions provide a number of + advantages over standard partitions. LVM partitions are + formatted as + LVM + physical volume + physical volumes. One or + more physical volumes are combined to form a + LVM + volume group + volume group. Each volume + group's total storage is then divided into one or more + + LVM + logical volume + logical volumes. The logical + volumes function much like standard data partitions. They have a + file system type, such as + ext3, and a mount + point. - An administrator may grow or shrink logical volumes without - destroying data, unlike standard disk partitions. If the - physical volumes in a volume group are on separate drives then - administrators may also spread a logical volume across multiple - disks and RAID arrays. + An administrator may grow or shrink logical volumes without + destroying data, unlike standard disk partitions. If the + physical volumes in a volume group are on separate drives then + administrators may also spread a logical volume across multiple + disks and RAID arrays. - Automatic Partitioning and LVM - - The Automatic Partitioning option creates partitions as LVM volumes. - - + LVM and the Default Partition Layout + + By default, the installation process creates partitions within + LVM volumes. + +
Creating a <filename>/home</filename> Partition - Many users find it helpful to create a separate partition for - the /home directory. With a separate - /home partition, you can reinstall &FC; - without erasing user data files. If you expect that you or - other users will be creating data files, you should create a - /home partition. + If you expect that you or other users will be storing data on + the system, create a separate partition for the + /home directory within an LVM volume. With + a separate /home partition, you may upgrade + or reinstall &FC; without erasing user data files. LVM provides + you with the ability to add more storage capacity for the user + data at a later time. - - - LVM and <filename>/home</filename> - - If your &FC; system will host accounts for numerous users, you - should create the /home partition in an - LVM logical volume. LVM provides flexibility for adding more - user data storage later. - - -
-
- -
Disk Druid - - Disk Druid - Disk - Druid is an interactive program for - editing disk partitions. Users run it only within the &FC; - installation system. Disk Druid supports - RAID - RAID and - LVM + Disk Druid + Disk + Druid is an interactive program for + editing disk partitions. Users run it only within the &FC; + installation system. Disk Druid supports + RAID + RAID and + LVM LVM to provide more extensible and reliable data storage. -
- - Disk Setup Screen - + Disk Setup Screen - - - - - - - - disk setup screen - + + + + + + + + disk setup screen +
- Disk Druid displays the following actions in the installation program: + - New - - - Select this option to add a partition - partition - adding - or LVM physical volume to the disk. In the - Add partition dialog, choose a mount - point and a partition type. If you have more than one disk - on the system, choose which disks the partition may inhabit. - Indicate a size in megabytes for the partition. - - - Illegal Partitions - - - partition - illegal - The /bin/, - /dev/, /etc/, - /lib/, /proc/, - /root/, and - /sbin/ directories may not be used - for separate partitions in Disk - Druid. These directories reside on the - - partition - root - / (root) partition. - - - The /boot partition may not reside on - an LVM volume group. Create the - /boot partition before configuring - any volume groups. - - - - You may also choose from three options for sizing your - partition: - - - - Fixed size - - - Use a fixed size as close to your entry as possible. - - - - - Fill all space up to - - - Grow the partition to a maximum size of your choice. - - - - - Fill to maximum allowable + New + + + Select this option to add a partition + partition + adding + or LVM physical volume to the disk. In the + Add partition dialog, choose a mount + point and a partition type. If you have more than one disk + on the system, choose which disks the partition may inhabit. + Indicate a size in megabytes for the partition. + + + Illegal Partitions + + + + partition + illegal + The /bin/, + /dev/, /etc/, + /lib/, /proc/, + /root/, and + /sbin/ directories may not be used + for separate partitions in Disk + Druid. These directories reside on the + + partition + root + / (root) partition. + + + + The /boot partition may not reside on + an LVM volume group. Create the /boot + partition before configuring any volume groups. + + + + You may also choose from three options for sizing your + partition: + + + + Fixed size + + + Use a fixed size as close to your entry as possible. + + + + + + Fill all space up to + + + Grow the partition to a maximum size of your choice. + + + + + + Fill to maximum allowable size - - - Grow the partition until it fills the remainder of the - selected disks. - - - - - - Partition Sizes - - The actual partition on the disk may be slightly smaller - or larger than your choice. Disk geometry issues cause - this effect, not an error or bug. - - - - After you enter the details for your partition, select - OK to continue. - - + + + Grow the partition until it fills the remainder of the + selected disks. + + + + + + Partition Sizes + + + The actual partition on the disk may be slightly smaller + or larger than your choice. Disk geometry issues cause + this effect, not an error or bug. + + + + After you enter the details for your partition, select + OK to continue. + + + - Edit - - - Select this option to edit an existing partition, - - partition - editing - LVM volume group, or an LVM physical volume that - is not yet part of a volume group. To change the size of a - LVM physical volume partition, first remove it from any - volume groups. - - - Removing LVM Physical Volumes - - If you remove an LVM physical volume from a volume group, - you will erase any logical volumes it contains. - - - - Edit a partition to change its size, mount point, or file - system type. Use this function to: - - - - - correct a mistake in setting up your partitions - - - - - migrate Linux partitions if you are upgrading or - reinstalling &FC; - - - - - provide a mount point for non-Linux partitions such as - those used on some Windows operating systems - - - - - Windows Partitions - - You may not label Windows partitions that use the - - NTFS - file system - - - file system - NTFS - NTFS file system with a - mount point in the &FC; installer. You may label - - vfat - file system - - - file system - vfat - vfat - (FAT16 or - FAT32) - partitions with a mount point. - - - - If you need to make drastic changes to - your partition configuration, you may want to delete - partitions and start again. If your disk contains data that - you need to keep, back it up before you edit any partitions. - If you edit the size of a partition, you may lose all data - on it. - - - If your system contains many separate partitions for system - and user data, it is easier to upgrade your system. The - installation program allows you to erase or retain data on - specific partitions. If your user data is on a separate - - partition - /home - /home partition, you may - retain that data while erasing system partitions such as - /boot. - - + Edit + + + Select this option to edit an existing partition, + + partition + editing + LVM volume group, or an LVM physical volume + that is not yet part of a volume group. To change the size + of a LVM physical volume partition, first remove it from any + volume groups. + + + Removing LVM Physical Volumes + + + If you remove an LVM physical volume from a volume group, + you will erase any logical volumes it contains. + + + + Edit a partition to change its size, mount point, or file + system type. Use this function to: + + + + + correct a mistake in setting up your partitions + + + + + migrate Linux partitions if you are upgrading or + reinstalling &FC; + + + + + provide a mount point for non-Linux partitions such as + those used on some Windows operating systems + + + + + Windows Partitions + + + You may not label Windows partitions that use the + + NTFS + + file system + + file system + NTFS + + + NTFS file + system with a mount point in the &FC; installer. You may + label + vfat + + file system + + file system + vfat + + + vfat + (FAT16 or + FAT32) + partitions with a mount point. + + + + If you need to make drastic changes to + your partition configuration, you may want to delete + partitions and start again. If your disk contains data that + you need to keep, back it up before you edit any partitions. + If you edit the size of a partition, you may lose all data + on it. + + + If your system contains many separate partitions for system + and user data, it is easier to upgrade your system. The + installation program allows you to erase or retain data on + specific partitions. If your user data is on a separate + + partition + /home + + /home partition, you may + retain that data while erasing system partitions such as + /boot. + + + - Delete - - - Select this option to erase an existing partition - - partition - deleting - or LVM physical volume. To delete an LVM - physical volume, first delete any volume groups of which - that physical volume is a member. - - - If you make a mistake, use the Reset - option to abandon all the changes you have made. - - + Delete + + + Select this option to erase an existing partition + + partition + deleting + or LVM physical volume. To delete an LVM + physical volume, first delete any volume groups of which + that physical volume is a member. + + + If you make a mistake, use the Reset + option to abandon all the changes you have made. + + + - Reset - - - Select this option to force Disk - Druid to abandon all changes made to disk - partitions. - - + Reset + + + Select this option to force Disk + Druid to abandon all changes made to disk + partitions. + + + - RAID - - - Select this button to set up software RAID - RAID - on your &FED; system. - - - - Create a software RAID + RAID + + + Select this button to set up software RAID + RAID + on your &FED; system. + + + + Create a software RAID partition - - - Choose this option to add a partition for software - RAID. This option is the only choice available if - your disk contains no software RAID partitions. - - - - - Create a RAID device - - - Choose this option to construct a RAID device from two - or more existing software RAID partitions. This - option is available if two or more software RAID - partitions have been configured. - - - - - Clone a drive to create a RAID + + + Choose this option to add a partition for software + RAID. This option is the only choice available if your + disk contains no software RAID partitions. + + + + + + Create a RAID device + + + Choose this option to construct a RAID device from two + or more existing software RAID partitions. This option + is available if two or more software RAID partitions + have been configured. + + + + + + Clone a drive to create a RAID device - - - Choose this option to set up a RAID - mirror of an existing disk. - This option is available if two or more disks are - attached to the system. - - - - - + + + Choose this option to set up a RAID + mirror of an existing disk. + This option is available if two or more disks are + attached to the system. + + + + + + - LVM - - - Select this button to set up LVM - LVM - on your &FED; system. First create at least one - partition or software RAID device as an LVM physical volume, - using the New dialog. - - - To assign one or more physical volumes to a volume group, - first name the volume group. Then select the physical - volumes to be used in the volume group. Finally, configure - logical volumes on any volume groups using the - Add, Edit and - Delete options. - - - You may not remove a physical volume from a volume group if - doing so would leave insufficient space for that group's - logical volumes. For example, if a volume group is made up - of two 5 GB LVM physical volume partitions, then it contains - an 8 GB logical volume. The installer would not allow you - to remove either of the component physical volumes, since - that would leave only 5 GB in the group for an 8 GB logical - volume. If you reduce the total size of any logical volumes - appropriately, you may then remove a physical volume from - the volume group. In the example, reducing the size of the - logical volume to 4 GB would allow you to remove one of the - 5 GB physical volumes. - - + LVM + + + Select this button to set up LVM + LVM + on your &FED; system. First create at least one + partition or software RAID device as an LVM physical volume, + using the New dialog. + + + To assign one or more physical volumes to a volume group, + first name the volume group. Then select the physical + volumes to be used in the volume group. Finally, configure + logical volumes on any volume groups using the + Add, Edit and + Delete options. + + + You may not remove a physical volume from a volume group if + doing so would leave insufficient space for that group's + logical volumes. For example, if a volume group is made up + of two 5 GB LVM physical volume partitions, then it contains + an 8 GB logical volume. The installer would not allow you to + remove either of the component physical volumes, since that + would leave only 5 GB in the group for an 8 GB logical + volume. If you reduce the total size of any logical volumes + appropriately, you may then remove a physical volume from + the volume group. In the example, reducing the size of the + logical volume to 4 GB would allow you to remove one of the + 5 GB physical volumes. + + + After you finish setting up and reviewing your partition configuration, select Next to continue the installation process. -
- - - - + @@ -154,6 +154,16 @@ + + 1.0.5 + 2005-12-08 + StuartEllis + + + Updated partitioning section. + + + Index: fedora-install-guide-firstboot-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-firstboot-en.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fedora-install-guide-firstboot-en.xml 6 Dec 2005 01:25:25 -0000 1.15 +++ fedora-install-guide-firstboot-en.xml 8 Dec 2005 00:27:16 -0000 1.16 @@ -92,6 +92,11 @@ + Needs screenshot. + + + + To enable access to services listed on this screen, click the check box next to the service name. After installation is complete, you can enable access to other services as well. @@ -104,7 +109,7 @@ Changing the Firewall Settings - To change these settings later, from the main menu, choose + To change these settings later, choose System AdministrationSecurity Level and Firewall. @@ -115,6 +120,11 @@ &SEL; + Needs screenshot. + + + + The &SEL; &SEL; (Security Enhanced @@ -166,7 +176,7 @@ If you choose this mode for &SEL;, &FED; does not configure the access control system at all. To make &SEL; active - later, from the main menu, select + later, select System Administration Security Level and Firewall @@ -175,12 +185,17 @@ + + + To adjust &SEL;, choose Modify SELinux Policy. To exempt a service from &SEL;, select the service from the list, and choose the Remove SELinux protection option. + + Changing the &SEL; policy &SEL; is unique in that it cannot be bypassed, even by the system administrators. To change the behavior of &SEL; after - installation, from the main menu, choose + installation, choose System Administration Security Level and Firewall . @@ -228,7 +243,7 @@ Setting the Clock - To change these settings later, from the main menu, choose + To change these settings later, choose System Administration Date & Time . @@ -283,7 +298,7 @@ If you enable the Enable NTP Broadcast - advanced option, &FC; will attempt to automatically locate time + advanced option, &FC; attempts to automatically locate time servers on the network.
@@ -350,8 +365,7 @@ Resetting the display - To reconfigure your system after the installation has completed, - from the main menu, choose + To reconfigure your system after the installation has completed, choose System Administration Display . @@ -393,7 +407,7 @@ Creating extra user accounts To add additional user accounts to your system after the - installation is complete, from the main menu, choose + installation is complete, choose System Administration Users & Groups . @@ -458,7 +472,7 @@ &FC; will automatically attempt to detect a new sound card if you add one to your system. If you need to launch the detection - process manually, from the main menu, choose + process manually, choose System Administration Soundcard Detection . Index: fedora-install-guide-nextsteps-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-nextsteps-en.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fedora-install-guide-nextsteps-en.xml 6 Dec 2005 01:25:25 -0000 1.8 +++ fedora-install-guide-nextsteps-en.xml 8 Dec 2005 00:27:16 -0000 1.9 @@ -16,13 +16,16 @@ vulnerabilities. To ensure the security of your system, carry out an update when the installation process completes. You should then update regularly, and as soon as possible after a security - announcement. Refer to for - information on the &FED; announcements services. + announcement is issued. Refer to + for information on the + &FED; announcements services. To update your system with the latest packages, use the - Package Updater: + + Package Updater + Package Updater: @@ -66,9 +69,10 @@ - To update packages from the command-line, use the - yum utility. Type this command to begin a full - update of your system with yum: + To update packages from the command-line, use the + yum + yum utility. Type this command to + begin a full update of your system with yum: su -c 'yum update' @@ -126,7 +130,7 @@ - The annnouncements mailing list also provides you with news on the + The announcements mailing list also provides you with news on the &FP;, and the &FED; community. From fedora-docs-commits at redhat.com Fri Dec 9 09:13:40 2005 From: fedora-docs-commits at redhat.com (Andrew Martynov (andrmart)) Date: Fri, 9 Dec 2005 04:13:40 -0500 Subject: docs-common/images watermark-ru.png, NONE, 1.1 watermark-ru.svg, NONE, 1.1 Message-ID: <200512090913.jB99DebV012301@cvs-int.fedora.redhat.com> Author: andrmart Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12274 Added Files: watermark-ru.png watermark-ru.svg Log Message: Add transtated DRAFT watermark (Russian) --- NEW FILE watermark-ru.svg --- ]> Fedora Doc Project Watermark The word DRAFT rendered in grey at 45 degrees ???????????????? ?????????????? ?????????????????? ???? ???????? ???? ?????????????? From fedora-docs-commits at redhat.com Fri Dec 9 13:53:27 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Fri, 9 Dec 2005 08:53:27 -0500 Subject: docs-common/images watermark-zh_CN.png, NONE, 1.1 watermark-zh_CN.svg, NONE, 1.1 Message-ID: <200512091353.jB9DrRKo020720@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695/images Added Files: watermark-zh_CN.png watermark-zh_CN.svg Log Message: 1. the $ tag cause a lot of trouble in po -> xml, it produce incorrect newlines. 2. the watermark.png is generated using inkscape, the characters are not very clear but better than gimp. the picture is not 1024x768 but smaller. --- NEW FILE watermark-zh_CN.svg --- ]> Fedora Doc Project Watermark The word DRAFT rendered in grey at 45 degrees ??? ??? ??? ??? ???????????? From fedora-docs-commits at redhat.com Fri Dec 9 13:53:33 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Fri, 9 Dec 2005 08:53:33 -0500 Subject: docs-common/common cvs-zh_CN.xml,NONE,1.1 Message-ID: <200512091353.jB9DrXZb020733@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/docs-common/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695/common Added Files: cvs-zh_CN.xml Log Message: 1. the $ tag cause a lot of trouble in po -> xml, it produce incorrect newlines. 2. the watermark.png is generated using inkscape, the characters are not very clear but better than gimp. the picture is not 1024x768 but smaller. --- NEW FILE cvs-zh_CN.xml --- CVS ???????????????????????? (CVS) ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS???????????????????????????????????????????????????????????????CVS ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????CVS ?????????????????????CVS ?????????????????????????????????????????????????????????????????????????????? cvs
CVS ???????????? cvs CVS ???????????? cvs ?????? ????????????????????????????????????????????? CVS ????????????????????? module(??????)??? ????????? CVS ?????????????????? checkout(??????)??????????????????????????????????????????????????????????????????????????? commit(??????)????????? CVS ???????????? ?????? CVS ?????????????????????????????????????????????????????????CVS ???????????????concurrent(??????)?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????CVS ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? add(??????)????????????????????????????????????????????????????????????????????????????????????????????? CVS ????????????????????????????????????????????????????????????????????? ???????????????????????????????????? ??? ??????????????? CVS ????????????????????????????????????????????????????????????????????????????????????????????????CVS ??????????????????????????? CVS ???????????????????????????????????????????????????????????????????????????????????????????????????????????? conflict(??????)????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? update(??????)????????????????????????????????????????????????????????????????????? ???????????????????????????
??? CVS ????????? cvs ??? cvs ????????? ????????? CVS ????????????????????? CVS ?????????????????????????????????????????????????????????????????????????????????
CVS ??????????????????????????? cvs RPM ???????????? ??????????????? CVS ??? RPM?????????????????????????????????????????? $ rpm -q cvs ???????????????????????? cvs-1.11.19-1 ?????????????????????????????????????????????????????? package cvs is not installed ??????????????????????????????????????????????????????????????????????????????????????????????????????
?????? SSH ?????? OpenSSH ???????????? CVS ??????????????? SSH 2 ????????????????????????????????????????????????????????????????????????????????? CVS ?????????????????????????????? SSH DSA ???????????????????????????????????? ?????? ?????????????????? ~/.ssh/id_dsa.pub ???????????????????????????????????? DSA ????????? ??????????????? DSA ??????????????? passphrase(??????)?????????????????????????????????????????????????????? ??????????????????????????? SSH 2 ??????????????? DSA ??????????????? cvs.fedora.redhat.com CVS ?????????????????? OpenSSH ssh-keygen ssh-keygen ????????? SSH2 ????????? DSA ???????????? shell ?????????????????????????????? $ ssh-keygen -t dsa ??????????????????????????? ~/.ssh/id_dsa??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????? $ cat ~/.ssh/id_dsa.pub>>~/.ssh/authorized_keys ????????? ENTER(??????)???????????????????????????????????? ~/.ssh/authorized_keys ??????????????? ~/.ssh/id_dsa.pub ???????????????????????? ~/.ssh/authorized_keys ?????????????????? ??????????????????????????? ~/.ssh ????????????????????????????????? $ chmod 755 ~/.ssh $ chmod 644 ~/.ssh/authorized_keys ?????? ????????????????????????????????????????????? CVS ???????????????????????????????????????????????? ssh-add ??????????????????
?????? CVS ?????? cvs ?????? cvs ?????? cvs CVSROOT cvs CVS_RSH CVSROOT CVS_RSH cvs .cvsrc .cvsrc
?????????????????? cvs ?????????????????? ?????? CVS ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS ??????????????????????????? ???????????????????????????????????? ~/.cvsrc ?????????????????????????????????????????????????????????????????? cvs -z3 diff -uNp rdiff -uNp update -dP
??????????????? CVS ?????? cvs ?????????????????? cvs ???????????? ????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ?????????????????? CVS ??????????????????????????????????????????????????? $ export CVSROOT=:pserver:cvs.fedora.redhat.com:/cvs/docs $ cvs login $ cvs checkout docs-common module-name $ cvs checkout module-name $ cd module-name ?????????????????????CVSROOT ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS/Root ??????????????????????????????????????? CVS/ ?????????CVS ??????????????????????????? &FC; ?????????
?????????????????? CVS ?????? cvs ?????????????????? cvs ????????????????????? ????????????????????????????????????????????????????????? &FC; Docs CVS ???????????????????????????????????????????????????????????? http://fedoraproject.org/wiki/DocsProject/NewWriters ???????????????????????????????????? ?????? fedora-docs-list ???????????????????????????????????????????????? ???????????? GNU Privacy Guard (GPG) ????????????????????????????????????????????? ?????? Bugzilla ?????????????????????????????????????????????Bugzilla ??????????????????????????????????????????????????? ????????????????????? self introduction(????????????)??? ????????? ???????????? ??????????????????????????? CVS ???????????? ??????????????????????????????????????????????????????????????????????????????????????? $CVSROOT ????????? CVS ????????? $ export CVSROOT=:ext: yourname @cvs.fedora.redhat.com:/cvs/docs $ export CVS_RSH=/usr/bin/ssh ????????? $CVSROOT ??? $CVS_RSH ????????????????????????????????????????????? $ cvs co -c ????????????????????? SSH ???????????????????????? ENTER ?????????????????????????????????????????????
????????? CVS ?????? cvs ?????? ?????????????????? CVS ?????????????????????????????????????????? ?????? ???????????????????????? $CVSROOT ????????????????????????????????? repository????????????????????????????????????????????? CVS/ ???????????? ????????? CVS/ ????????????CVS ???????????? $CVSROOT ??? ????????????????????????
???????????? cvs ???????????? ???????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????? $ cvs co <module-name> ?????????????????? example-tutorial ??????????????????????????????????????????????????????????????? $ cvs co example-tutorial ??????????????????????????????????????? example-tutorial/ ??????????????? ???????????????????????????????????????????????????????????? CVS ???????????? HEAD ?????????
????????????????????? cvs ???????????? ???????????? ????????? CVS ?????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? $ cvs co <directory> <branchname> <module-name> ??????????????? <directory> ???????????? ?????? <module-name> ??? <branchname> ???????????????????????????????????????????????? ?????????????????? mymodule ????????? BRANCH-VERSION-1.2 ???????????????????????? $ cvs co -d mymodule-1.2 -r BRANCH-VERSION-1.2 mymodule ????????? BRANCH-VERSION-1.2 ????????????????????? mymodule-1.2 ???????????? ????????????????????????????????????????????????????????? $ cvs status <filename> ??????????????? foo.sgml ?????????????????? =================================================================== File: foo.sgml Status: Up-to-date Working revision: 1.47 Repository revision: 1.47 /cvs/docs/custom-guide/rhl-cg-en.sgml,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) Existing Tags: BRANCH-VERSION-1.2 (branch: 1.25.2) ????????? Existing Tags(????????????)????????????"??????"???????????????????????????????????????
???????????? cvs ???????????? ???????????????????????????????????????????????????????????????????????????????????????????????? $ cvs update ?????????????????????????????????????????????????????????????????????????????????????????????????????? ???
???????????? cvs ???????????? ??????????????????????????????????????????????????????????????? CVS ??????????????????????????? $ cvs commit "some log message" filename ???????????????????????????????????????????????????????????????????????????????????? $VISUAL ??? $EDITOR ?????????????????????????????? -m "some log message"?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? updated some files(?????????????????????)??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Bugzilla ????????? <filename> ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? *.png ??? foo-*.sgml??? ????????? commit ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? commit ??????????????????????????????????????????????????????????????? ?????????????????????????????????????????? ???
???????????? cvs ???????????? ???????????????????????????????????????????????????????????????????????????????????????????????? $ cvs add file-to-add ??????????????????????????? commit(??????)?????????????????????????????? $ cvs commit "some log message" file-to-add
????????????????????? cvs ??????????????? ??????????????????????????????????????????????????????????????????????????????????????????CVS ??????????????????????????????????????????????????? .png ??? .jpg?????????????????????????????? ????????????????????????cvs ????????????????????????????????????????????? "$id:$"????????????????????????????????? ?????????????????? ???????????????????????????????????????????????????????????? CVS ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? $ cvs filename ??????????????? ???????????????????????????????????? CVS ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????
???????????? cvs ???????????? ????????????????????????????????????????????? remove ?????????????????????????????? commit ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? add ??????????????? $ cvs rm -f file-to-remove ???????????????????????? commit(??????)????????? $ cvs commit "some log message" file-to-remove ?????? commit ?????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? CVS ????????????????????????????????????????????????????????????????????????????????????????????????????????? cvsdocs-administrator at fedora.redhat.com ???????????????????????????????????????????????????
??????????????? cvs ??????????????? ???????????????????????????????????? status(??????)?????????????????? $ cvs status filename ?????????????????????????????????????????? Up-to-date ???????????????????????? CVS ?????????????????????????????? Locally Modified ????????????????????????????????????????????????????????????????????? Locally Added ????????? cvs add ???????????????????????????????????????????????????????????? Locally Removed ????????? cvs remove ???????????????????????????????????????????????????????????? Needs Checkout ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? cvs update ????????????????????? Needs Patch ????????????????????????????????????????????????????????????????????? cvs update ?????????????????? Needs Merge ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? File had conflicts on merge ?????? Needs Merge????????????????????? cvs update ??????????????????????????????????????????????????????????????????????????? ??? Unknown CVS ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS ?????????????????????????????? generated-index.sgml????????????????????????????????????????????? cvs add ??????????????????
???????????? cvs ???????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? RCS file: /cvs/docs/module-name/filename.sgml,v retrieving revision 1.12 retrieving revision 1.13 Merging differences between 1.12 and 1.13 into filename.sgml rcsmerge: warning: conflicts during merge cvs server: conflicts found in filename.sgml C filename.sgml ??????????????????????????????????????? <<<<<<< ??????????????????????????????????????????????????? <para> Some sentence. <<<<<<< filename.sgml A sentence that was changed in the working copy. ======= A same sentence that was changed differently and committed. >>>>>>> 1.13 </para> <<<<<<< ??? ======= ????????????????????????????????????????????? ======= ??? >>>>>>> ????????????????????????????????? ????????????????????????????????????????????????
?????? cvs ?????? ?????? ?????????????????????????????????????????????????????? ????????? CVS ?????? ?????? ?????? cvs checkout <module-name> ??? cvs co <module-name> ?????????????????? <module-name> ???????????? ?????????????????????????????? cvs co -d <directory> -r <branchname><module-name> ?????? <directory> ???????????? <module-name> ????????? <branchname> ???????????????????????? cvs update ??? cvs up ??????????????????????????????????????? cvs add <filename> ????????? "filename" ????????? CVS ????????? cvs commit -m "My message" <filename> ?????????????????????????????? <filename> ?????????????????? cvs log <filename> ???????????? <filename> ??????????????? cvs status <filename> ?????????????????????????????? Locally Modified cvs status -v <filename> ???????????????????????????????????? cvs diff <filename> ????????????????????????????????????????????????????????????????????? cvs diff -r1.1 -r1.2 <filename> ???????????? 1.1 ??? 1.2 ?????????????????????
????????????????????? CVS ??????????????????????????????????????? /usr/share/doc/cvs-<version-number>/cvs.ps (CVS ????????????????????????)?????????????????? CVS ?????????????????? http://www.cvshome.org/??? ?????? ?????? CVS ?????? ssh ????????? CVS ????????????????????? CVS ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? &RH; Linux 9 Customization Guide(????????????)????????? ssh-agent ????????????
From fedora-docs-commits at redhat.com Fri Dec 9 15:29:03 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Fri, 9 Dec 2005 10:29:03 -0500 Subject: documentation-guide acknowledgments-zh_CN.xml, NONE, 1.1 docs-converting-zh_CN.xml, NONE, 1.1 docs-emacs-nxml-zh_CN.xml, NONE, 1.1 docs-emacs-zh_CN.xml, NONE, 1.1 docs-getting-files-zh_CN.xml, NONE, 1.1 docs-intro-zh_CN.xml, NONE, 1.1 docs-rh-guidelines-zh_CN.xml, NONE, 1.1 docs-style-zh_CN.xml, NONE, 1.1 docs-tutorial-zh_CN.xml, NONE, 1.1 docs-vim-zh_CN.xml, NONE, 1.1 docs-xml-tags-zh_CN.xml, NONE, 1.1 documentation-guide-zh_CN.xml, NONE, 1.1 Message-ID: <200512091529.jB9FT3Bx024138@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24110 Added Files: acknowledgments-zh_CN.xml docs-converting-zh_CN.xml docs-emacs-nxml-zh_CN.xml docs-emacs-zh_CN.xml docs-getting-files-zh_CN.xml docs-intro-zh_CN.xml docs-rh-guidelines-zh_CN.xml docs-style-zh_CN.xml docs-tutorial-zh_CN.xml docs-vim-zh_CN.xml docs-xml-tags-zh_CN.xml documentation-guide-zh_CN.xml Log Message: --- NEW FILE acknowledgments-zh_CN.xml --- ?????? ??????????????? Tammy Fox (tfox at redhat.com) ???????????????????????????????????? Sandra Moore (smoore at redhat.com) ??? Johnray Fuller (jrfuller at redhat.com) ???????????? Roozbeh Pournader (roozbeh at sharif.edu) ????????????????????????????????????????????????????????????????????? CVS ????????????????????????????????? Gavin Henry (ghenry at suretecsystems.com) ??????????????????????????? docs-xml-tags.xml ?????? figure ????????????????????????????????????????????? ??? Joshua Daniel Franklin (joshuadfranklin at yahoo.com) ?????????????????????????????? ??? Karsten Wade (kwade at redhat.com) ?????????????????????????????? ????????? Paul W. Frields (stickstr5 at hotmail.com) ????????? Paul W. Frields (stickstr5 at hotmail.com) ??????????????????????????? ?????? screen ????????????????????????????????? ***** Error reading new file: [Errno 2] No such file or directory: 'docs-converting-zh_CN.xml' --- NEW FILE docs-emacs-nxml-zh_CN.xml --- Emacs ??? nXML ?????? nXML Emacs Emacs nXML ?????? ??????????????? Emacs ??? nXML ?????????????????? DocBook XML ?????????????????????nXML ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? RPM ???????????? ???????????? ?????????????????????Emacs ??? nXML ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ?????? nXML RPM nXML RPM nXML RPM ?????? emacs ????????? nXML ???????????????????????? Tim Waugh ???????????? nXML RPM??????????????? http://www.thaiopensource.com/download/ ???????????????????????????????????????????????????????????????????????? RPM ????????? ?????????????????????????????? ??? ?????? ??? PSGML ????????????????????????????????????????????????????????? Emacs ?????????????????????????????????????????????????????????????????? ?????? ?????????????????????????????? < ????????????????????????????????????????????????????????? Ctrl-Ret???????????????????????? >????????????????????????????????? </??? ?????? ??????????????????????????? DOCTYPE ????????????????????????????????????????????????????????????????????????????????? nXML ??????????????????????????????????????? ????????? schema????????? Ctrl-c???????????? Ctrl-s ???????????? /usr/share/emacs/site-lisp/nxml-mode/schema/ ????????? docbook.rnc???Emacs ?????????????????????????????????????????? ?????? ??????????????????????????? Emacs PSGML ????????? Emacs nXML ????????????????????????????????????????????? ????????????????????? ???????????? ????????? Emacs ??? nXML ???????????????????????????????????? http://www.thaiopensource.com/download/ — Author's download area http://wks.uts.ohio-state.edu/unix_course/intro-135.html — Emacs Quick Reference Guide emacs ?????????????????? Emacs ??????????????????????????????????????????????????????— /usr/share/emacs/<version>/etc/refcard.ps nXML README ?????? ?????? ????????????????????????????????????????????????????????????????????? RPM?????????????????? /usr/share/doc/nxml-mode-<version>/??? README ????????? ?????? GNU Emacs ??????????????????????????????????????????????????? XML ????????????????????? RELAX NG Compact Syntax ??? XML ??????????????? schema-sensitive ??????????????? ???????????????????????? GNU Emacs 21.x ??????????????? 21.3???GNU Emacs 20 ??????????????????????????????XEmacs ????????????????????????????????????????????? M-x load-file RET rng-auto.el RET ???????????????????????? autoloads?????????????????????????????? XML ????????????????????????????????? M-x nxml-mode ???????????? C-h m ????????? nXML ????????????????????????????????????????????? nxml-mode.info ?????????????????????????????? C-u M-x info RET nxml-mode.info RET ??????????????? info ??????????????????????????????????????????????????????????????????????????? C-h i ??????????????? ???????????? test.valid.xml ??? test.invalid.xml ??????????????????????????? XML ??????????????? ?????? Emacs ????????????????????????????????????????????????????????? .emacs??? (load "~/nxml-mode-200YMMDD/rng-auto.el") ?????? ~/nxml-mode-200YMMDD ????????? .elc ???????????????????????? rng-auto.el ?????????????????? nXML ???????????????????????????????????????????????? nXML ?????????????????????????????????????????????????????????????????????????????? rng-auto.el ????????? ???????????????????????? xml, xsl, rng ??? xhtml ??????????????????????????? nXML ???????????????????????????????????? .emacs??? (setq auto-mode-alist (cons '("\\.\\(xml\\|xsl\\|rng\\|xhtml\\)\\'" . nxml-mode) auto-mode-alist)) ??????????????? iso-8859-N ????????? XML???????????? iso-8859-1???????????????????????? Emacs 21.3 ???????????????????????????????????? unify-8859-on-decoding-mode?????????????????????????????? .emacs??? (unify-8859-on-decoding-mode) ????????????????????? schema-sensitive ????????????????????????????????? RELAX NG Compact Syntax (RNC) schema ?????????schema ???????????????????????????????????? schema??? ?????? RELAX NG ????????? http://relaxng.org/??? ?????? RELAX NG Compact NG ?????????????????? http://relaxng.org/compact-tutorial.html ?????????????????? RNC schema??????????????? Trang ?????????http://eee.thaiopensource.com/relaxng/trang.html" ????????????????????? ????????????????????? RNC schema??? DTD ????????? RNC schema??? RELAX NG XML syntax schema ????????? RNC schema ?????? RELAX NG XML syntax (.rng) schema ????????? RNC schema????????????????????? http://www.pantor.com/download.html" ??? XSLT ???????????? ?????? W3C XML Schema ????????? RNC schema????????????????????????????????? RELAX NG XML syntax????????? Sun ??? RELAX NG ???????????? rngconv (?????? MSV)???????????? https://www.dev.java.net/??? ?????? NEWS ??????????????????????????? ????????????????????? http://groups.yahoo.com/group/emacs-nxml-mode ????????? bug ??????????????????????????????????????????????????? James Clark jjc at thaiopensource.com ***** Error reading new file: [Errno 2] No such file or directory: 'docs-emacs-zh_CN.xml' --- NEW FILE docs-getting-files-zh_CN.xml --- ???????????? ???????????? Docs Project ????????????????????????????????? DocBook XML ????????????????????????????????????????????????????????????????????? xmlto — ?????? HTML ??? PDF ??????????????? docbook-style-xsl — ????????????????????? XSLT ????????? docbook-dtds — DocBook DTD ?????? XML ????????? ??????????????????????????????????????? cvs.fedora.redhat.com CVS ??????????????????????????????????????????????????????????????? DocBook XML ??????????????? ??????????????????????????? docs CVS ?????????????????????????????????????????????????????????????????? Enter??? mkdir my-fedora-docs cd my-fedora-docs export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs cvs login cvs co docs-common cvs co example-tutorial ?????????????????? CVS ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS ???????????????????????? CVS ?????????????????? ??? ????????????????????????????????? cvs co -c ???????????????????????????????????????????????????????????? cvs co example-tutorial ?????? &IG; ?????????CVS ???????????????????????? DocBook XML article ??????????????? example-tutorial ????????????????????????????????? ?????? ????????????????????????????????????????????? XML ????????? ***** Error reading new file: [Errno 2] No such file or directory: 'docs-intro-zh_CN.xml' ***** Error reading new file: [Errno 2] No such file or directory: 'docs-rh-guidelines-zh_CN.xml' --- NEW FILE docs-style-zh_CN.xml --- ???????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ????????????????????????????????????????????? ?????? ????????????????????????????????? ????????????????????? ???????????????????????? ???????????????????????????????????? ?????????????????? &FED; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
??????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????style ???????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? James Joyce ????????? Ulysses ?????? Episode 18, "Penelope," http://www.online-literature.com/james_joyce/ulysses/18/?????????????????????????????????????????????????????????????????????????????????????????????Joyce ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Joyce ??????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????? So you made the changes I showed you in the last section. What's the next thing you should do? Just pop your thumb drive onto your system and read the messages log. When you see "USB device found," then Bob's your uncle. ??????????????? After you complete the configuration changes above, attach the USB removable media to your system. Use the dmesg command to examine the kernel message log. The message USB device found indicates that your device was installed successfully. ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? The Elements of Style, ?????? William Strunk. ????????????: http://bartleby.com/141/ The Chicago Manual of Style, ?????? the University of Chicago Press. ????????????: http://www.chicagomanualofstyle.org/ Paradigm Online Writing Assistant, ????????? Chuck Guilford, Ph.D. ????????????: http://www.powa.org/ ????????????????????????????????????????????????????????????????????????????????????????????????????????? GNOME Documentation Style Guidelines (GDSG)??????????????????????????? GDSG???????????? http://developer.gnome.org/documents/style-guide/???
??????????????????????????? ?????????????????? ??????????????? GDSG??? ??????????????????????????????????????????????????????
???????????????????????? &FP; ??????????????????????????????????????????????????????????????????????????? &FED; ???????????????????????????????????? ?????? ????????????????????????????????????????????????????????????????????????????????????????????? ?????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? ?????? The Elements of Style (http://www.bartleby.com/141/) ??????????????????????????? ?????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? ????????????????????????????????????????????????????????????????????? ???
?????? ??????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????? ????????????????????? 25 ??????????????? ???????????????????????? 23 ??????????????? ?????????????????? Under normal operating conditions, the kernel does not always immediately write file data to the disks, storing it in a memory buffer and then periodically writing to the disks to speed up operations. ??????????????? Normally, the kernel stores the data in memory prior to periodically writing the data to the disk. ????????????????????? ??????????????????????????? ?????????????????????????????? ???????????????????????????????????? ???????????????????????? The Workspace Switcher applet helps you navigate all of the virtual desktops available on your system. The X Window system, working in hand with a piece of software called a window manager, allows you to create more than one virtual desktop, known as workspaces, to organize your work, with different applications running in each workspace. The Workspace Switcher applet is a navigational tool to get around the various workspaces, providing a miniature road map in the GNOME panel showing all your workspaces and allowing you to switch easily between them. ?????????????????? Use the Workspace Switcher to add new workspaces to the GNOME Desktop. You can run different applications in each workspace. The Workspace Switcher applet provides a miniature map that shows all of your workspaces. You can use the Workspace Switcher applet to switch between workspaces. ??????????????????????????????????????????????????????????????????????????? ???????????????????????? ????????????????????????????????????????????????????????????????????? ?????????????????????????????? There is a text box that you can use to find out the definition of a word. ????????????????????? To request a definition of a word, type the word in the text box, then select Lookup. ????????????????????????????????????????????????????????????????????? ?????????????????? ??????????????????????????? ???????????????????????? The applet is a handy little screen grabber. ????????????????????? Use the applet to take screenshots.
?????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????? ????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????? ?????????????????????????????????????????????????????????????????? ????????????????????? ????????????????????????????????????????????????????????????????????????????????? ?????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
??????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? GUI ?????????????????????????????????????????????????????????????????????????????????
?????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????? ?????????????????????????????????????????????????????? ?????????????????? ????????????????????????????????????????????????????????????????????????????????????docs ????????? documentation??????????????????????????????????????????????????????????????? ???????????????????????? &FED; Jargon Buster (http://fedora.redhat.com/docs/jargon-buster/) ?????? ???????????????????????? American Heritage Dictionary (http://www.bartleby.com/61/ ) ?????? ???????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? ??????????????????????????? ?????????????????? ??????/?????? ??? ???/??????????????????????????????????????? ??????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????
????????????????????? ?????????????????? ????????????????????? GDSG??????????????? The Elements of Style???????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????? &FED; ??????????????????????????????????????????????????? American Heritage Dictionary (http://www.bartleby.com/61/) ??? Chicago Manual of Style (http://www.press.uchicago.edu/Misc/Chicago/cmosfaq/cmosfaq.html)??? ?????? ????????????????????????????????????????????????????????????????????? Dr., a.m., p.m. ??????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? ???????????????????????????????????????????????????????????? ?????????????????????????????? i.e. ("in other words", ????????????) ??? e.g. ("for example", ??????)???????????????????????????????????????????????? ????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????? From the first letters of each word in a compound term, for example Table of Contents (TOC). From recognizable parts of a compound term, such as GNU Object Model Environment (GNOME). ???????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????? ????????????????????????????????????????????????????????? ?????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? ??? ???????????? ?????? ???????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????? "??????" ??????????????????????????? ?????? ?????????????????????????????????????????? the??? ???????????? ???????????? ?????? ???????????? ???????????? ?????? ?????? ??????????????????????????? ???????????????????????????????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????? the Main Menu'sHelp option don't use the default option several SCSI disk's ???????????????????????? the Help option on the Main Menu do not use the default option several SCSI disks ????????? ????????????????????? [????????????] ??????????????? (????????????) ????????????????????????????????????????????? ????????????????????????????????????????????????????????? replaceable ?????????????????????????????? ??? ?????? ???????????????????????? ?????????????????????????????????????????????????????????????????? ??????????????????????????????????????? ????????????????????????????????????????????? ??????????????????????????????????????? Shift ???????????????????????? ????????? ???????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ??????????????????????????? ????????? ?????????????????????????????????????????? ?????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? ???????????????????????????????????? ???????????? ?????????????????? ??????????????? ??????????????????????????????????????? ???????????????????????? ???????????? ???????????????????????? ???????????? ?????????????????????????????? ?????? ????????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????????????????????????????? ??? ????????? ????????????????????? ??????????????????????????????????????? ??????????????????????????????????????? ??????????????????????????? ?????? ?????????????????????????????? ?????? ??????????????????????????? can't, don't, ??? isn't??? ????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????? ???????????????????????????????????? ???????????????????????????????????? ?????????????????????????????? ?????? ??????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????1 1/2 ????????? 11/2??? ????????????????????????????????????????????????????????????????????????????????? ?????? ????????? ??? ?????? ??????????????????????????????????????? Chicago Manual of Style ( http://www.press.uchicago.edu/Misc/Chicago/cmosfaq/cmosfaq.html)??? ?????? ?????????????????????????????????????????? ?????????????????????????????? ????????????????????????????????????????????? ????????????????????????????????????????????????????????? ???????????????????????????????????????????????? ??????????????????????????????????????? ????????? ???????????????????????????????????? ???????????????????????? ???????????? ?????????????????????????????????????????? American Heritage Dictionary (http://www.bartleby.com/61/)??? ????????????????????? ????????????????????????????????????????????????????????? directory-name???????????? filename ???????????? ?????????????????????????????????????????? ???????????? ???????????? ??? ly ??????????????? ??????????????????????????? American Heritage Dictionary (http://www.bartleby.com/61/) ???????????????????????????????????????????????????????????? ?????? ??????????????? ???????????????????????????????????????????????????????????? ??? ???????????? ??? ??????????????????????????? ?????? ?????????????????????????????????????????????????????? ?????? ???????????????????????????????????? ??? 0 ??? 9 ????????????????????????????????????????????? ?????? ????????????????????? ????????????????????????????????????????????? ?????????????????????????????? ???????????????????????????????????????????????? 10 MB ????????? ???????????? ????????????????????????????????? ?????? 10 ????????? ?????? ??????????????? ????????? ?????? ?????? ??????????????????????????? ???????????????????????? ????????? ???????????????????????????????????? ?????????????????????????????????????????? ?????????????????????????????????????????? ?????? ????????????????????????????????? ???????????? ????????????????????? ????????????????????????????????????????????? a.m. ??? U.S. ?????? ????????????????????????????????????????????? Chicago Manual of Style (http://www.press.uchicago.edu/Misc/Chicago/cmosfaq/cmosfaq.html)??? ?????????????????? ???????????????????????????????????????????????????????????????????????????????????? ?????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? See v. Refer to ??????????????????????????????????????? "refer to" ????????? "see"????????? "refer also to" ????????? "see also"????????????????????????????????? see ??? seealso ?????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????? "see" ??? "see also" ??????????????????????????????????????? "refer to" ??? "refer also to" ????????????????????????????????????????????? ?????? ????????????????????? ?????? ???????????????????????????????????????????????????????????? "/"??????????????? and/or ??????????????????????????????????????????????????? ?????? ????????????????????????????????????????????? American Heritage Dictionary (http://www.bartleby.com/61/)??? ?????? ????????????????????????????????????????????????????????? ?????? ??????????????????????????????????????? ????????????????????????????????????????????????????????? ????????? IEEE Standard Dictionary of Electrical and Electronics Terms??? ??????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????? ???????????????????????????????????????
???????????? ?????????????????????????????????????????? &FDP; ????????????????????????????????????????????????????????????????????????????????????&FDP; ?????????????????????????????????
???????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"??????", "??????"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"??????," "??????"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????? ?????? yum update ?????????????????? ?????????????????? yum update ????????? ????????????????????? ?????? yum update ?????????
?????????????????? ???????????????????????????????????????????????????????????? "??????" ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ???????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????????????????????????? ??????????????????????????? ??????????????????????????????????????????
??????????????? ?????????????????????"???" "??????" ????????????????????? (????????????????????????)???&FDP;???&FED; ????????????????????????????????????????????????????????? ("???" "???" ??? "?????????") ?????? "??????"????????????????????? "???" ?????????????????????????????? ????????????????????????????????? ??????????????????????????????????????? Samba ????????????????????? up2date??? ????????????????????????????????????????????????????????????????????? tar ??? cpio ????????? ?????????????????????????????????????????? ?????? Samba ????????????????????????????????? up2date ???????????? ????????????????????????????????? tar ??? cpio ????????????????????????
??????????????? ????????????????????????????????????????????????????????????"??????"????????????????????????????????????????????????????????? don't ??? can't???????????? ???
????????? ?????????????????? "?????????"???"?????????"???"???????????????"???"??????"????????????????????????
??????????????? ???????????????????????????????????????????????? &FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????? ???????????? "???????????????????????? XYZ" ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? "??? XYZ"???????????????????????????????????????????????????????????????????????? XYZ ??????????????????????????????????????????????????? ???
??????????????? ??????????????????????????????????????????????????????????????????????????? "???" ???????????????????????????????????? "???"??? ?????????????????????????????? ?????? Main Menu -> Foobar ???????????? Search ????????? ???????????????????????? ??? Main Menu ?????????????????? Foobar ?????? Search ????????? ??????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????? "??????"????????????????????????????????????????????????????????? "??????"?????????????????????
DocBook ?????? ????????????????????????????????????????????????????????? DocBook ??????????????????
???????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? ?????? <command>sfdisk</command> ???????????? sfdisk ??????????????????????????????????????????????????????????????????????????????sfdisk ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? sfdisk -n ??????????????????????????? ???????????????????????? sfdisk ??????????????????????????????????????????????????????????????????????????????sfdisk ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? sfdisk -n ??????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? "????????????"??????????????????????????????????????????????????? ("??????")??? ??????????????????????????????????????????????????????????????????
<sgmltag class="starttag">replaceable</sgmltag> ?????? ?????????????????????????????????????????????????????????????????????????????????????????????????????? replaceable ?????????
XML ?????? ?????? &FDP; ??????????????????????????????????????? fedora-docs ??? common/ ???????????????(????????? ???) ??????????????????????????? "FC2"????????????????????????????????? "&FC; &FCVER;"???????????????????????? "&FC; &FCVER;"???
***** Error reading new file: [Errno 2] No such file or directory: 'docs-tutorial-zh_CN.xml' ***** Error reading new file: [Errno 2] No such file or directory: 'docs-vim-zh_CN.xml' ***** Error reading new file: [Errno 2] No such file or directory: 'docs-xml-tags-zh_CN.xml' --- NEW FILE documentation-guide-zh_CN.xml --- %FEDORA-ENTITIES-EN; ]> &FP; ?????????????????? ?????? &VERSION; 2003,2004,2005 &FORMAL-RHI; Tammy Fox Johnray Fuller Sandra Moore Fox Tammy Fuller Johnray Moore Sandra &LEGALNOTICE; &INTRODUCTION; &GETTINGFILES; &GUIDELINES; &EMACS; &EMACS-NXML; &VIM; &TAGS; &TUTORIAL; &STYLE; &CONVERTING; &CVS; &ACKNOWLEDGMENTS; From fedora-docs-commits at redhat.com Fri Dec 9 15:40:39 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Fri, 9 Dec 2005 10:40:39 -0500 Subject: yum-software-management yum-software-management-zh_CN.xml,1.1,1.2 Message-ID: <200512091540.jB9Fedfb024205@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/yum-software-management In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24180 Modified Files: yum-software-management-zh_CN.xml Log Message: update &FED; ==> &FC; accordingly. Index: yum-software-management-zh_CN.xml =================================================================== RCS file: /cvs/docs/yum-software-management/yum-software-management-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yum-software-management-zh_CN.xml 15 Nov 2005 14:42:32 -0000 1.1 +++ yum-software-management-zh_CN.xml 9 Dec 2005 15:40:31 -0000 1.2 @@ -2,136 +2,85 @@ %FEDORA-ENTITIES-EN; - - + + + + + ]>
- ?????? <command>yum</command> ????????????2005Stuart Ellis2005bbbush (bbbush.yuan at gmail.com)EllisStuart &LEGALNOTICE; 0.42005-06-01StuartEllis?????? CVS???0.52005-07-19StuartEllis??? &FC; &FCLOCALVER; ?????????0.62005-07-25PaulWFrields?????????????????????????????? BETA???1.02005-08-13PaulWFrields??????????????????????????????1.0.12005-08-18StuartEllis??????????????????????????????????????????????????????????????????1.0.22005-08-26StuartEllis??????????????????????????????1.0.32005-10-13PaulWFrields???????????? (#170584)???1.0.42005-11-15StuartEllis??????????????????????????????????????? #166122??? - + + ?????? <command>yum</command> ???????????? + + 2005 + Stuart Ellis + + + 2005 + bbbush (bbbush.yuan at gmail.com) + + + + Ellis + Stuart + + &LEGALNOTICE; 0.42005-06-01StuartEllis?????? CVS???0.52005-07-19StuartEllis??? &FC; &FCLOCALVER; ?????????0.62005-07-25PaulWFrields?????????????????????????????? BETA???1.02005-08-13PaulWFrields??????????????????????????????1.0.12005-08-18StuartEllis??????????????????????????????????????????????????????????????! ????1.0.22005-08-26StuartEllis??????????????????????????????1.0.32005-10-13PaulWFrields???????????? (#170584)???1.0.42005-11-15StuartEllis??????????????????????????????????????? #166122???1.0.52005-11-28PaulWFrields????????????????????? "&FC;" ?????? "&FED;"???
?????? -
?????? - ????????????????????? &FED; ?????????????????????????????????????????????????????? &FED; ????????????????????????????????? yum ??????????????????
-
?????? - ???????????????????????????????????? &FED; ?????????
-
?????????????????? - ?????????????????? yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? yum ??????????????? ??????????????? Linux ??????????????? ????????? - - ??????????????? &FED; - - ?????????????????? yum ?????????????????? &FED; &FCLOCALVER; ???????????? &FED; 3 ????????????????????? ???????????????????????? yum??? + ??????????????? &FC; + ?????????????????? yum ?????????????????? &FC; &FCLOCALVER; ???????????? &FC; 3 ????????????????????? ???????????????????????? yum??? - ????????????????????????????????????????????? tsclient??????????????? &FC; ?????????tsclient ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ApplicationsInternetTerminal Server Client ???????????????????????????????????????????????? tsclient ????????????????????????????????????&FED; ????????????????????????????????? MySQL Database ?????? - ????????? root ???????????? - ??????????????? root ????????????????????????????????? &FED; ??????????????????????????????????????????????????? root ??????????????????????????? root ???????????????????????? su ??????????????????????????????
-
???????????? - yum - ?????? - - yum - ????????? - - ????????????????????? yum ??????????????????????????????????????? man ???????????? yum(8) ??? yum.conf(5) ????????????????????????????????? - -man yum -man yum.conf - - - yum - ?????? - - yum - ???????????? - - ??????????????????????????? yum ??????????????? - - - - ???????????? - - - - - - - - - ????????????????????? - - - - - - - - - ????????????????????? - - - - - - - - - ???????????? &BZ; - ?????????????????????????????????????????????????????? &BZ-URL; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? yum ????????????????????? &BZ; ????????????????????? &FED; ??????????????????????????? - -
+ yum + ?????? + yum?????????????????????????????? yum ??????????????????????????????????????? man ???????????? yum(8) ??? yum.conf(5) ?????????????????????????????????man yum +man yum.confyum?????? yum??????????????????????????????????????? yum ????????????????????????????????????????????????????????????????????????????????? &BZ;?????????????????????????????????????????????????????? &BZ-URL; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? yum ????????????????????? &BZ; ????????????????????? &FED; ???????????????????????????
-
?????????????????? -
??????????????? - ????????? - ?????? + ????????? + ?????? &FED; ????????????????????????????????? RPM ????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FED; ????????????????????? &FC; ??????????????????????????????????????????????????????????????? - ?????????????????????????????????????????????????????????????????????????????????????????? GPG ?????? ????????????????????????yum ??? rpm ????????????????????? keyring????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - &FED; ???????????????????????????????????? - &FP; ????????????????????????????????????????????????????????? &FED; ????????????????????????????????????????????????
-
???????????? - ?????? - ?????? + ?????? + ?????? - ?????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? yum?????????????????????????????????????????????????????? RPM ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ????????????????????????????????????????????? &FED; ??????????????????????????????&FC; ???????????????????????????????????????????????????????????????????????? - + + ?????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? yum?????????????????????????????????????????????????????? RPM ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????????????????? &FC; ??????????????????????????????&FC; ???????????????????????????????????????????????????????????????????????? Base @@ -139,14 +88,12 @@ ?????? &FC; ??????????????????????????????????????? - Updates Base ????????????????????????????????? - &EX; @@ -154,161 +101,66 @@ - - ??????????????? &FED; - - &FED; &FCLOCALVER; ?????????????????????????????????????????? &FED; 3 ?????????????????????????????????????????? &FEX;??????????????? ????????? + ??????????????? &FC; + &FC; &FCLOCALVER; ?????????????????????????????????????????? &FC; 3 ?????????????????????????????????????????? &FEX;??????????????? ????????? - &FED; ???????????? - &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ????????????????????????????????????fedora-devel (Rawhide), fedora-extras-devel, ??? updates-testing??? - ???????????????????????????????????????????????????????????????????????? &FED; ??????????????????????????????????????? &FED; ????????????????????????????????????????????? ??? - ????????? - ?????? + ????????? + ?????? ???????????? &FED; ??????????????? ????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - + ?????????????????? - ??????????????? &FED; ???????????????????????????????????????????????? su -c 'yum grouplist'??? - ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - ????????????????????????????????? - ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ???????????????????????? - ??????????????? yum ????????????????????????????????????????????????????????? yum ?????????????????????????????????????????????????????? ???
-
?????????????????? - ???????????? - ?????? + ???????????? + ?????? &FED; ??????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????&FED; ????????????????????????????????????????????? RPM ??????????????????????????????????????? RPM ???????????? - - yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????yum ?????????????????????????????????????????? + + yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????yum ??????????????????????????????????????????
-
????????????????????? - ????????? - ??????????????? - - ????????? - ?????? - - ????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ??? tsclient ????????????????????? - -tsclient-0.132-6.i386.rpm - - ???????????????????????????????????????????????????????????????????????? - - - - ??????????????????tsclient - - - ???????????????????????????????????????????????????tsclient-0.132-6 + ????????? + ??????????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ??? tsclient ?????????????????????tsclient-0.132-6.i386.rpm??????????????????????????????????????????????????????????????????????????????????????????tsclient???????????????????????????????????????????????????tsclient-0.132-6 - - - ???????????????????????????????????????tsclient.i386 - - - - ?????????????????????yum ??? ??????.?????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? ????????? - - - - i386 - - ????????????????????? Intel ??????????????? - - - - - noarch - - ?????????????????? - - - - - ppc - - ?????? PowerPC ??????????????? Apple Power Macintosh - - - - - x86_64 - - ?????? 64 ??? Intel ?????????????????? Opterons - - - - - ????????????????????????????????? Intel ????????????????????? , , ??? ?????????????????????????????????????????????????????? Intel ?????????VIA C3 ???????????????????????????????????????????????? ?????????????????????????????? Intel ????????????????????????????????????????????????????????? AMD ?????????????????????????????? ???????????? - - ??? yum ??????????????????????????????????????????????????????yum ???????????????????????????????????????????????????????????????????????????????????? - - ???????????????????????????????????????????????????????????????????????? yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ??????????????? - ???????????? yum ?????????????????????????????????????????????????????????name, name.architecture, name-version, name-version-release, name-version-release.architecture, ??? epoch:name-version-release.architecture??? - -
+ ???????????????????????????????????????tsclient.i386?????????????????????yum ??? ??????.?????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? ?????????i386????????????????????? Intel ???????????????noarch??????????????????ppc?????? PowerPC ??????????????? Apple Power Macintoshx86_64?????? 64 ??? Intel ?????????????????? Opterons????????????! ????????????????????? Intel ????????????????????? , , ??? ?????????????????????????????????????????????????????? Intel ?????????VIA C3 ???????????????????????????????????????????????? ?????????????????????????????? Intel ????????????????????????????????????????????????????????? AMD ?????????????????????????????? ??????????????? yum ??????????????????????????????????????????????????????yum ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? yum ?????????????! ????????????????????????????????????????????name, name.architecture, name-version, name-version-release, name-version-release.architecture, ??? epoch:name-version-release.architecture???
-
&FC; ???????????????????????? - ??????/???????????????????????? - - ???????????? - - up2date - - yum ?????????????????????????????????????????????&FC; ?????????????????????????????????????????? yum ???????????? - - ???????????????????????? Alert Icon?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? up2date ?????????????????????????????????????????????????????? - - &FC; ?????????????????? system-config-packages ???????????????????????????????????????????????????????????????????????? DesktopSystem SettingsAdd/Remove Applications?????? up2date ??? yum ?????????system-config-packages ???????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ??????????????? rpm ?????????????????????????????????????????? RPM ?????????????????????????????????????????????????????????????????????????????????????????? rpm ????????????????????????????????????????????????????????????????????????????????????????????????yum ????????????????????????????????? - - - ????????????????????? - - up2date ??? yum ????????????????????????????????????????????????????????????????????????????????????????????????????????? - -
- + ??????/???????????????????????? + ???????????? up2dateyum ?????????????????????????????????????????????&FC; ?????????????????????????????????????????? yum ???????????????????????????????????? Alert Icon?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? up2date ??????????????????????????????????????????????????????&FC; ?????????????????? system-config-packages ???????????????????????????????????????????????????????????????????????? DesktopSystem SettingsAdd/Remove Applications?????? up2date ??? yum ?????????system-config-packages ???????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? rpm ?????????????????????????????????????????? RPM ?????????????????????????????????????????????????????????????????????????????????????????? rpm ????????????????????????????????????????????????????????????????????????????????????????????????yum ??????????????????????????????????????????????????????up2date ??? yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????
?????? <command>yum</command> ???????????? - yum - ???????????? + yum + ???????????? ?????? yum ????????????????????????????????????????????????????????? - @@ -325,25 +177,20 @@ - + ???????????????????????????????????? - ??????????????? yum ????????????????????????????????????????????????????????? yum ?????????????????????????????????????????????????????? ??? - ?????? yum ????????????????????????????????????????????????????????????/???????????? - ?????????????????????yum ???????????????????????????????????????????????????????????????????????????????????????????????????yum ????????????????????????????????????????????????????????????????????? - ???????????????????????????yum ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - <command>yum</command> ????????????????????? - + + <command>yum</command> ????????????????????? ????????????????????? tsclient ??????????????? - -============================================================================= + + ============================================================================= Package Arch Version Repository Size ============================================================================= Installing: @@ -358,411 +205,88 @@ Remove 0 Package(s) Total download size: 355 k Is this ok [y/N]: - + - ??????????????????????????????????????? y ????????????????????????????????? N ??? Enter(??????)???yum ???????????????????????????????????? - ??????????????? - - yum ???????????????????????????????????????????????????????????????????????????????????? + + yum ???????????????????????????????????????????????????????????????????????????????????? - - yum ????????????????????????????????????????????????????????? rpm ????????????????????? - + + yum ????????????????????????????????????????????????????????? rpm ????????????????????? - <command>yum</command> ????????????????????? - + + <command>yum</command> ????????????????????? ???????????????????????????????????? - -warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 + + warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 public key not available for tsclient-0.132-6.i386.rpm Retrieving GPG key from file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora Importing GPG key 0x4F2A6FD2 "Fedora Project <fedora at redhat.com>" Is this ok [y/N]: - + - ????????????????????????????????? y ??????????????????????????????????????????????????? N ??? Enter(??????)???yum ???????????????????????????????????? - ?????????????????????????????????????????????yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????yum ???????????????????????????????????? - ??????????????????????????????????????? /var/log/yum.log ????????????????????????????????????????????? root ?????????????????? ??????????????? - yum ??????????????????????????????????????????????????????????????????????????????????????? /var/cache/yum/ ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + yum ??????????????????????????????????????????????????????????????????????????????????????? /var/cache/yum/ ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????? <command>yum</command> ??????????????? - ???????????? - ??????????????? - - ?????? - ?????? - - ??????????????? tsclient?????????????????? - -su -c 'yum install tsclient' - - ????????????????????? root ?????????????????? - - ?????????????????? MySQL Database?????????????????? - -su -c 'yum groupinstall "MySQL Database"' - - ????????????????????? root ?????????????????? - - - ???????????????????????? - - ????????????????????????????????????&FED; ???????????????????????????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsServer SettingsServices?????????????????????????????? chkconfig ??? service??? - -
- + ???????????? + ??????????????? + ??????????????????????????? tsclient??????????????????su -c 'yum install tsclient'????????????????????? root ???????????????????????????????????? MySQL Database??????????????????su -c 'yum groupinstall "MySQL Database"'????????????????????? root ??????????????????????????????????????????????????????????????????????????????&FED; ???????????????????????????????????????????????????????????????????????????????????????????????? DesktopSystem SettingsServer SettingsSe! rvices?????????????????????????????? chkconfig ??? service???
?????? <command>yum</command> ???????????? - ?????? - ????????? - - ?????? - ?????? - - ????????? tsclient ????????????????????????????????? - -su -c 'yum update tsclient' - - ????????????????????? root ?????????????????? - - - ????????????????????????????????? - - ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - - ?????????????????? MySQL Database ???????????????????????????????????? - -su -c 'yum groupupdate "MySQL Database"' - - ????????????????????? root ?????????????????? - - - ?????????????????? - - ??????????????? &FED; ????????????????????????????????? ????????????????????? - -
- + ?????? + ????????? + ????????????????????? tsclient ?????????????????????????????????su -c 'yum update tsclient'????????????????????? root ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? MySQL Database ????????????????????????????????????su -c 'yum groupupdate "MySQL Database"'????????????????????? root ??????????????????????????????! ????????????????????? &FED; ????????????????????????????????? ?????????????????????
?????? <command>yum</command> ???????????? - ???????????? - - ?????? - ?????? - - ??????????????????yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ????????? tsclient ???????????????????????? - -su -c 'yum remove tsclient' - - ????????????????????? root ?????????????????? - - ?????????????????? MySQL Database ???????????????????????????????????? - -su -c 'yum groupremove "MySQL Database"' - - ????????????????????? root ?????????????????? - - - ???????????????????????????????????? - - ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -
+ ???????????? + ??????????????????????????????yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? tsclient ????????????????????????su -c 'yum remove tsclient'????????????????????? root ???????????????????????????????????? MySQL Database ????????????????????????????????????su -c 'yum groupremove "MySQL Database"'????????????????????? root ?????????????????????????????????????????????????????????????????????????????????????! ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? -
?????? <command>yum</command> ???????????? - ????????? - ?????? - - ?????? - ????????? - - ?????? yum ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -
- ?????????????????????????????? - - ?????????????????????????????? ???????????????????????? tsclient?????????????????? - -su -c 'yum list tsclient' - - ????????????????????? root ?????????????????? - - ??????????????????????????????????????????????????????????????????????????????????????????????????? tsclient ??? 0.132 ????????????????????? - -su -c 'yum list tsclient-0.132' - - - ????????????????????? - - ?????? ???????????????????????????????????????????????????????????????????????? - -
- -
- ???????????? - - ?????????????????????????????????????????? ??? ????????????????????????????????? yum ??????????????????????????????????????????????????????????????????????????? - - ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? PalmPilots ??????????????????????????? - -su -c 'yum search PalmPilot' - - ????????????????????? root ?????????????????? - - ???????????????????????????????????????????????????????????????????????? ??????????????????????????? yum ????????????????????????????????????????????? - - ??????????????????????????? libneon ???????????????????????? - -su -c 'yum provides libneon' - - ???????????????????????? MTA (Mail Transport Agent, ??????????????????) ?????????????????????????????? mta ??????????????? - -su -c 'yum provides MTA' - - ??????????????????????????????????????? root ?????????????????? - - ??????????????????????????????????????????????????????????????? ??????????????????????????? ?????? 0 ????????????????????????????????????????????????????????? ()??? - - ??? ??????????????? tsc ??????????????????????????? - -su -c 'yum list tsc\*' - - - ??????????????? - ?????? Perl ??? Python ????????????????????????????????????????????? - -
- -
- ???????????? - - ?????? yum ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ??????????????? shadowutils ??? shadow-util ????????????????????? shadow-utils ?????????????????????????????? shadow-util\? ??? shadow\*?????????????????????????????????????????????????????? -
-
- + ????????? + ?????? + ????????????????????? yum ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????? ???????????????????????? tsclient??????????????????su -c 'yum list tsclient'????????????????????? root ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? tsclient ??? 0.132 ?????????????????????! su -c 'yum list tsclient-0.132'??????????????????????????? ????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????? ??? ????????????????????????????????? yum ??????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? PalmPilots ???????????????????????????su -c 'yum search PalmPilot'????????????????????? root ?????????????????? ! ?????? ??????????????????????????????????????????????????????????????? ??????????????????????????? yum ???????????????????????????????????????????????????????????????????????? libneon ????????????????????????su -c 'yum provides libneon'???????????????????????? MTA (Mail Transport Agent, ??????????????????) ?????????????????????????????? mta ???????????????su -c 'yum provides MTA'??????????????????????????????????????? root ????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? ?????? 0 ????????????????????????????????????????????????????????? ()?????? list ??????????????? tsc ???????????????????????????su -c 'yum list tsc\*'????????????????????? Perl ??? Python ?????????????????????????????????????????????
?????????????????? yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? shadowutils ??? shadow-util ????????????????????? shadow-utils ?????????????????????????????? shadow-util\? ??? shadow\*??????????????????????????????????????????????????????
?????? <command>yum</command> ?????????????????? - ?????? - ???????????? - - yum - ?????????????????? - - ?????? ????????????????????? &FED; ????????????????????????????????????????????????????????? - - ???????????????????????????????????????????????? - -su -c 'yum update' - - ????????????????????? root ???????????? - -
- ???????????????????????? - - ???????????? - - &FC; ?????? yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start' - - ????????????????????? root ?????????????????? - - - ?????????????????????????????? - - ??????????????????????????? yum ?????????????????????????????????????????? /etc/rc.d/init.d/yum?????????????????????????????? /etc/cron.daily/yum.cron?????????????????? cron ??????????????????????????????????????????????????????????????? - -
-
- + ?????? + ???????????? + yum???????????????????????? ????????????????????? &FED; ?????????????????????????????????????????????????????????????????????????????????????????????????????????su -c 'yum update'????????????????????? root ????????????
????????????????????????????????????&FC; ?????? yum ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start'????????????????????? root ????????????????????????????????????????????????! ??????????????????????????? yum ?????????????????????????????????????????? /etc/rc.d/init.d/yum?????????????????????????????? /etc/cron.daily/yum.cron?????????????????? cron ???????????????????????????????????????????????????????????????
???????????????????????? - &FEX; - - ?????? - ?????? - - ?????? - ?????? - - &FED; ?????????????????? &FP; ???????????????????????? &FEX;???????????????????????? &FC; ?????????????????? - - - ??????????????? &FC; ??? &FEX; ?????? - - ????????????????????? &FED; 3 ???????????? &FEX;????????? ????????????????????? &FED; 1 ??? &FED; 2 ?????????????????????????????? ??? - - - ?????? &FP; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ??????????????????????????? ???????????? Java ????????????????????? - -
- ?????????????????????????????? - - ?????? - ?????? - - ?????????????????????????????????????????????????????? /etc/yum.repos.d/ ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ????????????????????? - ?????????????????????????????? .repo ????????? - - ???????????? root ??????????????????????????????????????????????????????????????? example.repo?????????????????? - -su -c 'cp example.repo /etc/yum.repos.d/' - - ????????????????????? root ?????????????????? - - ????????????????????????????????????????????? gpgkey ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? - - - ????????? <application>up2date</application> ?????? - - ??? &FED; 4 ?????????yum ????????????????????? up2date ???????????? &FED; 3 ??????????????????????????????????????????????????? up2date ??????????????????????????????????????????????????? /etc/sysconfig/rhn/sources??? - -
- -
- ???????????????????????? - - ?????? - ?????? - - ???????????? rpm ????????????????????????????????? rpm ??? ???????????????????????? GPG-PUB-KEY.asc?????????????????? - -su -c 'rpm --import GPG-PUB-KEY.asc' - - ????????????????????? root ?????????????????? - - ???????????????????????????????????????????????????????????????????????? www.therepository.com ???????????? GPG-PUB-KEY.asc?????????????????? - -su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc' - - ????????????????????? root ???????????? - - - ??? &FED; 3 ????????? &FED; ?????? - - ?????? &FED; 3 ???????????? rpm ??????????????? &FED; ???????????????????????? su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'??? - -
- -
- ????????????????????? - - ????????? - ??????????????? - - ?????? - ????????? - - &FEX; ???????????????????????? &FC; ???????????????????????????????????????????????????????????? &FP; ????????????????????????????????????????????????????????????????????? - - ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ???????????????????????????????????? - - ????????????????????????????????????????????????????????? &FP; ????????????????????????????????? &FP; ?????????????????????????????????????????????????????????????????????????????????????????? - - - ?????????????????? - - ?????????????????????????????????????????????????????????yum ?????????????????? - - - ?????????????????? &FED; ????????????????????????????????????????????? &FED; ?????????????????????????????????????????????????????????????????? &FED; ????????? - - ???????????? <command>yum</command> ?????????????????? - ??? yum 2.1 ???????????????????????????????????????????????????????????? &FED; 3 ??????????????????????????????????????????????????????????????? &FED; ??????????????????????????????????????????????????????????????? yum ????????????????????????????????????????????? repodata/ ??????????????? - -
-
- + &FEX; + ???????????? ????????????&FED; ?????????????????? &FP; ???????????????????????? &FEX;???????????????????????? &FC; ????????????????????????????????? &FC; ??? &FEX; ??????????????????????????? &FC; 3 ???????????? &FEX;????????? ????????????????????? &FC; 1 ??? &FC; 2 ?????????????????????????????? ????????? &FP; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ??????????????????????????? ???????????? Java ?????????????????????
??????????????????????????????????????????! ?????????????????????????????????????????????????????? /etc/yum.repos.d/ ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? .repo ????????????????????? root ??????????????????????????????????????????????????????????????? example.repo??????????????????su -c 'cp example.repo /etc/yum.repos.d/'????????????????????? root ??????????????????????????????????????????????????????????????? gpgkey ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????! ??????????????????????????????????????????????????????????? ???????????? <application>up2date</application> ????????? &FC; 4 ?????????yum ????????????????????? up2date ???????????? &FC; 3 ??????????????????????????????????????????????????? up2date ??????????????????????????????????????????????????? /etc/sysconfig/rhn/sources???
???????????????????????????????????????????????? rpm ????????????????????????????????? rpm ??? ???????????????????????? GPG-PUB-KEY.asc??????????????????su -c 'rpm --import GPG-PUB-KEY.asc'????????????????????? root ?????????????????????????????????????????????????????????????????????????????????????????? www.therepository.com ???????????? GPG-PUB-KEY.asc??????????????????su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'????????????????????? root ??????????????? &FC; 3 ????????? &FED; ???????????? &FC; 3 ???????????? rpm ??????????????? &FED; ???????????????????????? su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'???
????????????????????????????????????????????? ???????????????! &FEX; ???????????????????????? &FC; ??????????????????????????! ?????? ????????????????????????? &FP; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ????????????????????????????????????????????????????????????????????????????????????????????? &FP; ????????????????????????????????? &FP; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????yum ???????????????????????????????????? &FED; ????????????????????????????????????????????? &FED; ?????????????????????????????????????????????????????????????????? &FED; ????????????????????? <command>yum</command> ?! ???????????????????? yum 2.1 ???????????????????????????????????????????????????????????? &FC; 3 ??????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????? yum ????????????????????????????????????????????? repodata/ ???????????????
????????????????????????????????????????????? - ???????????? - ???????????? - ???????????????????????? - - ?????? - ???????????????????????? - - ???????????????????????? yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????? - - - ??????????????? - - ?????????????????????????????????????????????????????????????????????????????????????????? ??? - - - ?????????????????? tsclient-0.132-4.i386.rpm?????????????????? - -su -c 'yum localinstall tsclient-0.132-4.i386.rpm' - - ????????????????????? root ???????????? - - - ????????????????????????????????? - - ???????????????????????????????????????????????????yum ?????????????????????????????? - - - ???????????????????????????????????????????????????yum ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - - ?????????????????????????????? - - ?????????????????????????????????????????????????????????????????????yum update ??????????????????????????????????????????????????????????????????????????????????????????????????? RSS ??????????????????????????????????????????????????? - -
- + ???????????? + ???????????? + ???????????????????????? + ?????????????????????????????????????????????????????? yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? tsclient-0.132-4.i386.rpm??????????????????su -c 'yum localinstall tsclient-0.132-4.i386.rpm'????????????????????? root ????????????????????????????????????????????????????????????????????????????????????????????????yum ?????????????????????????????????????????????????????????????????????????????????yum ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????yum update ??????????????????????????????????????????????????????????????????????????????????????????????????? RSS ???????????????????????????????????????????????????
?????? <command>yum</command> - - yum ?????????????????????????????????????????? yum ?????????????????????????????????????????????????????????????????????????????????????????? yum ???????????????????????????????????????????????? - + + yum ?????????????????????????????????????????? yum ?????????????????????????????????????????????????????????????????????????????????????????? yum ????????????????????????????????????????????????
??????????????????????????? - ?????? - ?????? - - ?????? - ?????? - - ????????????????????????????????? enable=0 ???????????? yum ?????????????????????yum ???????????????????????????????????????????????? - - ??????????????????????????? - - - ??? /etc/yum.repos.d/ ????????????????????????????????? - - - ??? /var/cache/yum/ ??????????????????????????????????????? - - + ?????? + ?????? + ????????????????????????????????????????????? enable=0 ???????????? yum ?????????????????????yum ?????????????????????????????????????????????????????????????????????????????? /etc/yum.repos.d/ ???????????????????????????????????? /var/cache/yum/ ??????????????????????????????????????? @@ -845,111 +369,41 @@ -->
-
?????? <command>yum</command> ?????? - yum - ???????????? + yum + ???????????? ??????????????????yum ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -su -c 'yum clean headers' - + + su -c 'yum clean headers' + ??????????????????????????????????????????????????? - -su -c 'yum clean packages' - + + su -c 'yum clean packages' + ????????????????????? root ?????????????????? - ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
-
??????????????????????????? <command>yum</command> - ??????????????? - - yum - ?????????????????????????????? - - ??????????????????yum ?????? HTTP ???????????????????????????????????? yum HTTP ??????????????? HTTP/1.1??????????????????????????? web ????????????????????????????????????????????? FTP ?????????????????? yum ?????? FTP ??????????????????squid ???????????????????????? HTTP/1.1 ??? FTP ???????????????????????? - - ???????????????????????? <command>yum</command> - ????????? yum.conf ?????????????????????????????? HTTP ??????????????????????????? web ??????????????????????????????????????? yum ?????? FTP ???????????????????????? FTP ?????????&FED; ?????????????????? HTTP ??? FTP??? - -
- ??????????????????????????? - - ??????????????? yum ?????????????????????????????????????????? /etc/yum.conf ???????????????????????????????????? ??????????????????????????????????????????????????? URL????????? TCP ????????????????????????????????????????????????????????????????????????????????? ??? ??????????????????????????? - - ?????????????????? yum ????????????????????? mycache.mydomain.com?????????????????? 3128???????????? yum-user????????? qwerty??? - - - ????????????????????????????????????????????? - -# ??????????????? - proxy server:port number + ??????????????? + yum????????????????????????????????????????????????yum ?????? HTTP ???????????????????????????????????? yum HTTP ??????????????? HTTP/1.1??????????????????????????? web ????????????????????????????????????????????? FTP ?????????????????? yum ?????? FTP ??????????????????squid ???????????????????????? HTTP/1.1 ??? FTP ???????????????????????????????????????????????? <command>yum</command>????????? yum.conf ?????????????????????????????? HTTP ??????????????????????????? web ??????????????????????????????????????? yum ?????? FTP ???????????????????????? FTP ?????????&FED; ?????????????????? HTTP ??? FTP???
?????????????????????????????????????????? yum ?????????????????????????????????????????? /etc/yum.conf ???????????????????????????????????? ??????????????????????????????????????????????????? URL????????? TCP ????????????????????????????????????????????????????????????????????????????????? ??? ????????????????????????????????????????????? yum ????????????????????? mycache.mydomain.com?????????????????? 3128???????????? yum-user????????? qwerty????????????????????????????????????????????????# ??????????????? - proxy server:port number proxy=http://mycache.mydomain.com:3128 # ?????? yum ????????????????????? proxy_username=yum-user -proxy_password=qwerty - - - - - ???????????? - - ???????????? /etc/yum.conf ????????????????????????????????? ??????????????? yum ????????????????????????????????????????????? - -
- -
- ???????????????????????????????????? - - ?????????????????????????????????????????????????????????????????????????????????????????????????????? shell ??????????????????????????? bash shell??????????????? ~/.bash_profile ???????????????????????? yum ????????????????????? mycache.mydomain.com?????????????????? 3128??? - - - ??????????????????????????????????????? - -# ???????????????????????????????????? +proxy_password=qwerty???????????????????????? /etc/yum.conf ????????????????????????????????? ??????????????? yum ?????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? shell ??????????????????????????? bash shell??????????????? ~/.bash_profile ???????????????????????? yum ????????????????????? mycache.mydomain.com?????????????????? 3128??????????????????????????????????????????# ???????????????????????????????????? http_proxy="http://mycache.mydomain.com:3128" -export http_proxy - - - - ????????????????????????????????????????????????????????????????????? URL????????????????????? yum-user????????? qwerty?????????????????? - - - ????????????????????????????????????????????? - -# ????????????????????????????????????????????????/?????? +export http_proxy????????????????????????????????????????????????????????????????????? URL????????????????????? yum-user????????? qwerty???????????????????????????????????????????????????????????????# ????????????????????????????????????????????????/?????? http_proxy="http://yum-user:qwerty at mycache.mydomain.com:3128" -export http_proxy - - - - - ???????????? <option>http_proxy</option> - - ???????????? http_proxy ?????? curl ?????????????????????????????? yum ?????????????????????????????? http_proxy???curl ??????????????????????????????????????? - -
-
- - - +export http_proxy???????????? <option>http_proxy</option>???????????? http_proxy ?????? curl ?????????????????????????????? yum ?????????????????????????????? http_proxy???curl ???????????????????????????????????????
+
?????? - Paul Frields ?????????????????????Timothy Murphy ????????? BETA ?????????
-
- From fedora-docs-commits at redhat.com Fri Dec 9 16:24:06 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 11:24:06 -0500 Subject: docs-common/images Makefile,1.1,1.2 Message-ID: <200512091624.jB9GO6SC026462@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: Makefile Log Message: Pick up additional watermark files. Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/images/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 23 Nov 2005 06:30:23 -0000 1.1 +++ Makefile 9 Dec 2005 16:23:58 -0000 1.2 @@ -3,7 +3,7 @@ %.png: %.svg batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$< -SVGFILES=watermark.svg +SVGFILES=watermark-ru.svg watermark-zh_CN.svg watermark.svg PNGFILES=${SVGFILES:.svg=.png} all: ${PNGFILES} From fedora-docs-commits at redhat.com Sat Dec 10 01:45:42 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 20:45:42 -0500 Subject: docs-common/images watermark-it.png, NONE, 1.1 watermark-it.svg, NONE, 1.1 Makefile, 1.2, 1.3 Message-ID: <200512100145.jBA1jg5I012237@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12212 Modified Files: Makefile Added Files: watermark-it.png watermark-it.svg Log Message: Added Italian translation, courtesy of Francesco Tombolini --- NEW FILE watermark-it.svg --- ]> Fedora Doc Project Watermark (it) The word DRAFT rendered in grey at 45 degrees BOZZA NON PER RIFERIMENTO Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/images/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 9 Dec 2005 16:23:58 -0000 1.2 +++ Makefile 10 Dec 2005 01:45:33 -0000 1.3 @@ -3,7 +3,8 @@ %.png: %.svg batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$< -SVGFILES=watermark-ru.svg watermark-zh_CN.svg watermark.svg +SVGFILES=watermark-it.svg watermark-ru.svg watermark-zh_CN.svg \ + watermark.svg PNGFILES=${SVGFILES:.svg=.png} all: ${PNGFILES} From fedora-docs-commits at redhat.com Sat Dec 10 02:23:56 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 21:23:56 -0500 Subject: docs-common/images watermark-en.png, NONE, 1.1 watermark-en.svg, NONE, 1.1 watermark.png, 1.2, NONE watermark.svg, 1.2, NONE Message-ID: <200512100223.jBA2Nuoe013972@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938/images Added Files: watermark-en.png watermark-en.svg Removed Files: watermark.png watermark.svg Log Message: Require per-language watermark file by default. --- NEW FILE watermark-en.svg --- ]> Fedora Doc Project Watermark The word DRAFT rendered in grey at 45 degrees DRAFT NOT FOR REFERENCE --- watermark.svg DELETED --- From fedora-docs-commits at redhat.com Sat Dec 10 02:23:50 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 21:23:50 -0500 Subject: docs-common Makefile.common,1.17,1.18 Message-ID: <200512100224.jBA2OLLq013975@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938 Modified Files: Makefile.common Log Message: Require per-language watermark file by default. Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.common 2 Dec 2005 16:03:46 -0000 1.17 +++ Makefile.common 10 Dec 2005 02:23:43 -0000 1.18 @@ -47,7 +47,7 @@ HTMLCSS = ${FDPDIR}/docs-common/css/fedora-draft.css endif ifeq (${HTMLCSSEXTRA},) -HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark.png +HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark-${LANG}.png endif ######################################################################### # Define a macro to locate xmlto(1) so we can choose a specific version From fedora-docs-commits at redhat.com Sat Dec 10 02:30:10 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 21:30:10 -0500 Subject: docs-common/images watermark-de.svg,NONE,1.1 Makefile,1.3,1.4 Message-ID: <200512100230.jBA2UAdD014007@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13988 Modified Files: Makefile Added Files: watermark-de.svg Log Message: Added Deutsch translation, courtesy google.com's translate feature. My apologies if something has been lost in translation. --- NEW FILE watermark-de.svg --- ]> Fedora Doc Project Watermark (de) The word DRAFT rendered in grey at 45 degrees ENTWURF NICHT ALS REFERENZ Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/images/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 10 Dec 2005 01:45:33 -0000 1.3 +++ Makefile 10 Dec 2005 02:30:03 -0000 1.4 @@ -3,8 +3,8 @@ %.png: %.svg batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$< -SVGFILES=watermark-it.svg watermark-ru.svg watermark-zh_CN.svg \ - watermark.svg +SVGFILES=watermark-de.svg watermark-en.svg watermark-it.svg \ + watermark-ru.svg watermark-zh_CN.svg PNGFILES=${SVGFILES:.svg=.png} all: ${PNGFILES} From fedora-docs-commits at redhat.com Sat Dec 10 02:36:16 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 21:36:16 -0500 Subject: docs-common/images watermark-de.png, NONE, 1.1 watermark-ja_JP.png, NONE, 1.1 watermark-ja_JP.svg, NONE, 1.1 Makefile, 1.4, 1.5 Message-ID: <200512100236.jBA2aG2x014048@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14027 Modified Files: Makefile Added Files: watermark-de.png watermark-ja_JP.png watermark-ja_JP.svg Log Message: Added placeholder for ja_JP watermark page. --- NEW FILE watermark-ja_JP.svg --- ]> Fedora Doc Project Watermark The word DRAFT rendered in grey at 45 degrees DRAFT NOT FOR REFERENCE Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/images/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 10 Dec 2005 02:30:03 -0000 1.4 +++ Makefile 10 Dec 2005 02:36:08 -0000 1.5 @@ -4,7 +4,7 @@ batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$< SVGFILES=watermark-de.svg watermark-en.svg watermark-it.svg \ - watermark-ru.svg watermark-zh_CN.svg + watermark-ja_JP.svg watermark-ru.svg watermark-zh_CN.svg PNGFILES=${SVGFILES:.svg=.png} all: ${PNGFILES} From fedora-docs-commits at redhat.com Sat Dec 10 02:53:14 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Fri, 9 Dec 2005 21:53:14 -0500 Subject: docs-common Makefile.common,1.18,1.19 Message-ID: <200512100253.jBA2rEBg014099@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14073 Modified Files: Makefile.common Log Message: Allow ${HTMLCSSEXTRA} to be blank and not create the "watermark.png" file. Copy "watermark-${LANG}.png" to "watermark.png" by default. Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Makefile.common 10 Dec 2005 02:23:43 -0000 1.18 +++ Makefile.common 10 Dec 2005 02:53:07 -0000 1.19 @@ -71,7 +71,7 @@ # mkdir -p mydoc-en/stylesheet-images # cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/ # cp ${HTMLCSS} mydoc-en/fedora.css -# cp ${HTMLCSSEXTRA} mydoc-en/ +# cp ${HTMLCSSEXTRA} mydoc-en/watermark.png # cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/ # mkdir -p mydoc-en/figs # cp -p figs/*-${LANG}.* mydoc-en/figs @@ -85,7 +85,8 @@ mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css - cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/ + [ -z "${HTMLCSSEXTRA}" ] || \ + cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png [ ! -d figs ] || ( \ mkdir -p ${DOCBASE}-$(1)/figs; \ find figs -type f -iname '*.*' -print | \ @@ -107,7 +108,8 @@ mkdir -p stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/ cp ${HTMLCSS} fedora.css - cp ${HTMLCSSEXTRA} . + [ -z "${HTMLCSSEXTRA}" ] || \ + cp ${HTMLCSSEXTRA} watermark.png endef # html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html) @@ -146,7 +148,7 @@ ${RM} -r ${DOCBASE}-$(1).html stylesheet-images ${RM} -r ${DOCBASE}-$(1).pdf ${RM} -r ${DOCBASE}-$(1).tar.gz - ${RM} fedora.css watermark.png + ${RM} fedora.css watermark-${LANG}.png endef # distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean) From fedora-docs-commits at redhat.com Sat Dec 10 12:43:58 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Sat, 10 Dec 2005 07:43:58 -0500 Subject: docs-common/images Makefile, 1.5, 1.6 watermark-de.png, 1.1, 1.2 watermark-en.png, 1.1, 1.2 watermark-it.png, 1.1, 1.2 watermark-ja_JP.png, 1.1, 1.2 watermark-ru.png, 1.1, 1.2 watermark-zh_CN.png, 1.1, 1.2 watermark-zh_CN.svg, 1.1, 1.2 Message-ID: <200512101243.jBAChwNA031835@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31809 Modified Files: Makefile watermark-de.png watermark-en.png watermark-it.png watermark-ja_JP.png watermark-ru.png watermark-zh_CN.png watermark-zh_CN.svg Log Message: Use rsvg(1) to render the SVG into PNG instead of batik, which isn't GPL'ed. Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/images/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 10 Dec 2005 02:36:08 -0000 1.5 +++ Makefile 10 Dec 2005 12:43:50 -0000 1.6 @@ -1,7 +1,10 @@ .SUFFIXES: .png .svg +RSVG =rsvg +RSVGOPTS=-d72 -p72 -h768 -w1024 -q100 + %.png: %.svg - batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$< + ${RSVG} ${RSVGOPTS} $< $@ SVGFILES=watermark-de.svg watermark-en.svg watermark-it.svg \ watermark-ja_JP.svg watermark-ru.svg watermark-zh_CN.svg Index: watermark-zh_CN.svg =================================================================== RCS file: /cvs/docs/docs-common/images/watermark-zh_CN.svg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- watermark-zh_CN.svg 9 Dec 2005 13:53:20 -0000 1.1 +++ watermark-zh_CN.svg 10 Dec 2005 12:43:51 -0000 1.2 @@ -9,7 +9,7 @@ The word DRAFT rendered in grey at 45 degrees - ??? ??? ??? ??? + ??? ??? ??? ??? ???????????? From fedora-docs-commits at redhat.com Sat Dec 10 12:54:18 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 07:54:18 -0500 Subject: install-guide fedora-install-guide-beginninginstallation-zh_CN.xml, 1.1, 1.2 fedora-install-guide-diskpartitioning-zh_CN.xml, 1.1, 1.2 fedora-install-guide-firstboot-zh_CN.xml, 1.3, 1.4 fedora-install-guide-intro-zh_CN.xml, 1.1, 1.2 fedora-install-guide-nextsteps-zh_CN.xml, 1.1, 1.2 fedora-install-guide-other-instmethods-zh_CN.xml, 1.1, 1.2 fedora-install-guide-packageselection-zh_CN.xml, 1.3, 1.4 fedora-install-guide-zh_CN.xml, 1.1, 1.2 Message-ID: <200512101254.jBACsIN4031879@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31854 Modified Files: fedora-install-guide-beginninginstallation-zh_CN.xml fedora-install-guide-diskpartitioning-zh_CN.xml fedora-install-guide-firstboot-zh_CN.xml fedora-install-guide-intro-zh_CN.xml fedora-install-guide-nextsteps-zh_CN.xml fedora-install-guide-other-instmethods-zh_CN.xml fedora-install-guide-packageselection-zh_CN.xml fedora-install-guide-zh_CN.xml Log Message: Index: fedora-install-guide-beginninginstallation-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-beginninginstallation-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-beginninginstallation-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-beginninginstallation-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 @@ -1,11 +1,8 @@ ???????????? - ??????????????? &FC;?????????????????????????????????????????????????????? CD ??? DVD ?????????USB ????????????????????????????????????????????????????????? - - ?????????????????? - ??????????????????????????? &FC;??? - + ??????????????? &FC;???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ??????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????? boot: ?????????????????? linux askmethod?????????????????????????????????????????????????????? ?????? ??????????????????????????? BIOS (????????????????????????) @@ -16,19 +13,23 @@ ?????? Installing Packages ???????????????????????????????????????????????????????????? CtrlAltDel ?????????????????????????????????????????????&FED; ?????????????????????????????????????????????????????????????????????
- ??????????????? - ???????????????????????????????????? + ??? CD???DVD ??? USB ???????????? + ??????????????????????????? ???????????????????????? - ???????????????????????? CD ??? DVD ???????????? + ???????????????????????? CD ??? DVD ????????????????????? USB ????????? ????????????????????????????????????????????? boot: ???????????? + + BIOS ???????????? + BIOS ?????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????? BIOS ??????????????? +
???????????? @@ -43,7 +44,7 @@
- ??????????????? Enter?????????????????????????????????????????????????????????????????????????????? CD ??? DVD ???????????????????????????????????????????????????????????????????????? boot: ?????????????????? linux ??????????????????????????????????????? + ??????????????? Enter?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????????????????? boot: ?????????????????? linux ??????????????????????????????????????? ????????????????????????????????????????????????????????? askmethod??? @@ -52,62 +53,66 @@ ???????????????????????????????????? text - ????????????????????????????????????????????????????????????????????????????????? acpi=off??? + ????????????????????????????????????????????????????????????????????????????????? acpi=off???ACPI ?????????????????????????????????????????????????????? ACPI ?????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FDPDOCS-URL; ????????? - ????????? boot: ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? -
- ?????????????????? - - - - - - - - - ????????????????????? - - -
- ?????? OK ?????????????????????????????? Skip ??????????????????????????????????????? - - ???????????? - ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ???????????????????????????????????????????????????????????????????????????????????? -
- ?????????????????? - - - - - - - - - ????????????????????? - - -
- ?????? OK?????????????????????????????? -
- ?????????????????? - - - - - - - - - ????????????????????????????????????????????? - - -
- ?????? Test ???????????????????????????????????? Continue ???????????????????????? - + +
?????????????????????????????? Continue ?????????????????????????????????????????????????????????????????????????????????????????? - ???????????????????????????????????????????????????????????????????????? boot: ?????????????????? linux askmethod???&FC; ?????????????????????????????????????????? CD????????????????????? ISO ???????????????????????? &FC; ???????????????????????????????????? images/boot.iso??? - ???????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ?????? - - cdrecord --device=cdwriter-device -tao -eject image-file.iso - BIOS ???????????? - BIOS ?????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????? BIOS ??????????????? + BIOS ?????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????? BIOS ??????????????? -
- ??????????????????????????? - ????????? USB ?????????????????????????????????????????????????????? CF ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? -
- ?????????????????? - - ???????????? - - ?????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - ????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ?????????????????? - ??? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ????????? - - - ????????????????????? - - - ???????????????????????? - - - ??????????????????????????????????????????????????????????????????????????????????????????????????? - - - ??????????????????????????? - - - ?????????????????????????????????????????????dd if=diskboot.img of=/dev/sdax - - -
-
- ??????????????? - ?????????????????????????????????????????? - - - ???????????????????????? - - - ???????????????????????? - - - ????????????????????????????????? boot: ??????????????????????????????????????? Enter ?????? - - - - BIOS ???????????? - BIOS ?????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????? BIOS ??????????????? - -
-
?????? PXE ??????????????? ????????? PXE (Pre-boot eXecution Environment) PXE Index: fedora-install-guide-diskpartitioning-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-diskpartitioning-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-diskpartitioning-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-diskpartitioning-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 @@ -1,80 +1,48 @@ ???????????? - ???????????? Linux ????????????????????????????????????????????????????????????????????????????????? Linux ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? -
- ???????????????????????? - - - - - - - - - ???????????????????????? - - -
-
- ???????????????????????? -
- ?????????????????? - ????????????????????? Automatic partitioning ?????????????????????????????????Disk Druid ???????????????????????????????????? -
- ???????????????????????? - - - - - - - - - ?????????????????? - - -
- - - - ????????????????????? Linux ?????? - - - ???????????????????????? ext2, ext3 ??? Linux swap ??????????????? - - - - - ?????????????????????????????? - - - ?????????????????? ?????? ???????????? - - - - - ??????????????????????????????????????????????????? - - - ????????????????????? ??????????????? ????????? &FC; - - - - ???????????????????????? - ??????????????????????????????????????? Linux ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Linux ????????????????????????????????????????????????????????????????????????????????????????????? - - ???????????? - ?????????????????????????????????????????????????????????????????????????????? Linux Partition-HOWTO???????????? http://www.tldp.org/HOWTO/Partition/partition-2.html??? - - ??????????????????????????????????????? Review ???????????? - ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Next ??????????????????????????????????????? ??? -
-
- ?????????????????? - ?????????????????????????????????????????? Manually partition with Disk Druid???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????? ??? -
-
+ &FC; ????????????????????????????????????????????? partitions(??????)???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????? RAID ?????????????????? RAID ???????????? ??? ???????????? + + ???????????? + ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Back ????????????????????????????????????????????? + + + (??????????????????) + + ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????????????????? Linux ?????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? Microsoft Windows ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + + + ????????????????????????????????????????????????????????????????????? + + + ????????????????????????????????????????????????????????????????????????????????????????????????????????? + + + + + ??????????????????????????????????????????????????????????????? + + + ???????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????? + + + + + ????????????????????? + + + ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FC; ??????????????????????????? + + + + ?????? Review and modify partitioning layout ????????? &FC; ???????????????????????????????????? RAID ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ??????????????????????????????????????? Next ????????? + + ???????????? + ????????????????????????????????????????????? Network Devices?????? ???????????? ?????????????????? Create custom layout ??? Review and modify partitioning layout??? ????????????????????????????????? +
????????????????????? &FC; ????????????????????????????????? @@ -89,7 +57,7 @@ ?????? swap ???????????? - ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????? + ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? mount pointmount point ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? / (partitionrootroot ???) ???????????? ???????????? <filename>/root</filename> @@ -109,7 +77,7 @@ ????????????????????????????????????????????????????????? / ????????????????????????????????????????????? Disk Druid ??? Edit option ????????????????????????????????????
???????????? - ???????????????????????? partitiontypefile systempartition type ?????????????????????????????????????????? file systemfile system ?????????????????????????????????????????? Linux ??????????????????????????????????????????????????????????????? ext3file systemfile systemext3ext3 + ???????????????????????? partitiontypefile systempartition type (????????????)?????????????????? file systemfile system (????????????)?????????????????????????????? Linux ????????????????????????????????????????????????????????? ext3file systemfile systemext3ext3 ????????????????????? LVM ?????????????????????????????????????????????????????????????????????????????????
?????? LVM @@ -117,13 +85,17 @@ LVM ?????? - LVM ???Logical Volume Management) ???????????????????????????????????????????????????????????????LVM ????????????????????? LVMphysical volumephysical volumes ?????????????????????????????????????????????????????? LVMvolume groupvolume group ?????????????????????????????????????????????????????????????????????????????? LVMlogical volumelogical volumes ????????????????????????????????????????????????????????????????????????????????????????????????????????? ext3??????????????????????????? + LVM (Logical Volume Management, ???????????????)????????????????????????????????????????????????LVM ????????????????????? LVMphysical volumephysical volumes ?????????????????????????????????????????????????????? LVMvolume groupvolume group ?????????????????????????????????????????????????????????????????????????????? LVMlogical volumelogical volumes ????????????????????????????????????????????????????????????????????????????????????????????????????????? ext3??????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? RAID ???????????? - ??????????????? LVM - ??????????????????????????????????????? LVM ?????? + LVM ????????????????????? + ???????????????????????????????????? LVM ?????????????????????
+
+ ???????????? <filename>/home</filename> ?????? + ?????????????????????????????????????????????????????????????????????????????? LVM ?????????????????? /home ?????????????????????????????????????????? /home ???????????????????????????????????????????????? &FC; ????????????????????????????????????LVM ????????????????????????????????????????????? +
?????? - &FC; ????????????????????????????????????????????????????????????????????????????????? &FC; ???????????? &FC; ???????????????????????????????????????????????????????????????&FC; ????????????????????????????????????????????????????????? ????????????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????? Linux ??????????????????????????????????????????????????????????????????????????????????????????&FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? - ????????????????????????????????????????????????????????? -
- ?????? - &FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ?????????????????????????????? - ??????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ?????????????????????????????????????????????????????? -
-
- ???????????? - ?????????????????? &FC;????????????????????????????????????????????? DVD ?????????????????????????????? architecture ????????????????????????????????????????????????&FC; ?????? i386, ppc, ??? x86_64 ??????????????????????????????????????? - - - i386 - - Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? Sempron - - - - ppc - - PowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ?????????????????? - - - - x86_64 - - 64-bit AMD ?????????????????? Athlon64, Turion64, Opteron; ?????? Intel 64-bit ????????? EM64T - - - - ????????????????????????????????? - - - ????????????????????????????????? - - - ?????? &IG; ??????????????? - - - ???????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - ??????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ????????? -
- ?????? - ??????????????????&FC; ?????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ???????????????????????????????????????????????????????????? DHCP ????????????????????????????????????????????????DHCP ????????????????????????????????????????????????????????????????????????????????????????????? - ?????????????????????????????????????????????????????????????????????????????????????????? ??? ???????????????????????? - - Modem ?????? - &FC; ??????????????????????????????????????????????????????????????????????????? modem???????????????????????????????????????????????? - -
-
- ??? &FC; ???????????????????????? - &FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Server ????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????? -
-
- ?????????????????????????????? - ????????????????????????????????? &FC;????????????????????????????????? - - - ?????????????????? - - - ??????????????????????????? (FTP, HTTP ?????? NFS) - - - ???????????????????????? - - - ???????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment) ??????????????????????????? DVD ?????????????????????????????? CD????????????????????? USB ?????????????????????????????????????????? - PXE (???????????? netboot ????????????) ???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ???????????? - ????????? ??????????????????????????? -
-
- ????????????????????????????????? &FC; - ??????????????????????????? directory service ????????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ???????????????????????????????????????&FC; ??????????????? LDAP ????????? - - - ????????????????????? - ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -
-
- + ????????????????????????????????????????????????????????? &BUG-REPORTING;
??????&FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ????????????????????????????????????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ??????????????????????????????????????????????????????
????????????????????? &FC; ?????????????????????????????????????????????????????????(????????? ?????????????????????)???????????????????????????????????? &IG; ??????????????????????????? &FC; ??????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ?????????
????????????????????????&FC; ?????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ?????????????????????????????! ?????? ?????????????????????? DHCP ????????????????????????????????????????????????DHCP ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ????????????????????????Modem ??????&FC; ??????????????????????????????????????????????????????????????????????????? modem????????????????????????????????????????????????
??????????????????????????????????????????????????????????????? &FC;?????????????????????????????????????????????????????????????????????????????? (FTP, HTTP ?????? NFS)???????????????????????????????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment????????????????????????)??????????????????????????? DVD ?????????????????????????????? CD????????????????????? CD????????????????????? USB ??????????????????????????????????????????????????? ????????????????????????PXE (???????????? netboot ????????????) ???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ????????????
????????????????????????????????? &FC;??????????????????????????? directory service ????????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ??????????????????????????????????! ?????& ??????????????? LDAP ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????&FED; ??????????????????????????????CD ??? DVD ?????? (??????????????????????????????????????????????????????????????????????????????)USB ?????????????????? (?????? PXE)&FED; ???????????????????????????CD ??? DVD ??????????????????????????????????????? HTTP, FTP, ??? NFS??????????????????????????????????! ??????????? &FC;????????????????????? &FC;????????????????????????????????????????????? DVD ?????????????????????????????? architecture(??????)??????????????????????????????????????????&FC; ?????? i386, ppc, ??? x86_64 ???????????????????????????????????????i386Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? SempronppcPowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ??????????????????x86_6464-bit AMD ?????????????????? Athlon64, Turion64, Opteron; ?????? Int! el 64-bit ????????? EM64T?????????????????????????????? &FC;????????????????????????????????????????????????????????????????????????&FC; ??????????????? CD???DVD ??? USB ???????????????????????? image files(????????????)???????????????????????????????????????????????????????????????????????? Linux ?????????????????????????????????????????????????????????????????????????????? &FC; ????????????????????? CD ??? DVD ?????????????????????????????????????????????????????? CD ??? DVD ????????????????????????????????? ????????????????????????????????? &FC; ?????????????????????????????? ???
?????? CD ??? DVD ??????&FC; ??????????????????????????? images/boot.iso ???????????? CD ??? DVD ??????????????????????????????????????????????????????! ?????? &FC; ??? FTP ??? Web ???????????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ??????cdrecord --device=cdwriter-device -tao -eject image-file.iso
?????? USB ?????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ???????! ??????????????????????????????????????????????????????????????! ?????? ???????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????????????????????? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????dd if=diskboot.img of=/dev/sda
Index: fedora-install-guide-nextsteps-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-nextsteps-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-nextsteps-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-nextsteps-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 @@ -2,10 +2,71 @@ ?????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+ ???????????? &FED; ?????? + &FP; ??? &FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????? &FED; ?????????????????????????????? + ???????????????????????????????????????????????? Package UpdaterPackage Updater(???????????????)????????? + + + ?????? SystemAdministrationPackage Updater??? + + + ????????????????????? root(?????????)?????????????????? + + + ????????????????????????????????????????????????????????????????????????????????????Package Updater ?????????????????????????????????????????????????????????????????? + + + ?????? Apply Updates???????????????????????? + + + ???????????????????????????????????????????????????????????????????????????????????????????????? kernel(??????)????????????????????????????????????????????????????????? + + + + Check this procedure on test2 + + ??????????????????????????????????????? yumyum ????????????????????? yum ?????????????????????????????? + + su -c 'yum update' + + ????????????????????? root(?????????)?????????????????? + ????????? ??????????????? yum ?????????????????? + + ???????????? + ???????????? &FED; ??????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? + +
+
+ ?????? &FED; ??????????????? + ??????????????????????????????????????????????????????????????? RSS??? + + + &FP; ????????????????????????(announcement) + + + + + + + + &FC; RSS ?????? + + + + + + + + ????????????????????????????????? &FP; ??? &FED; ?????????????????? + + ???????????? + ???????????????????????? [SECURITY] ????????????????????????????????????????????????????????? + +
- Web ???????????? + ??? Web ??????????????? &FC; ?????????????????? &FP; ?????????????????? - http://fedora.redhat.com/docs/ @@ -23,7 +84,7 @@
- ???????????? + ?????????????????? &FED; ???????????????????????????????????????????????????????????????????????? Linux ????????? (LUG) ?????????????????? ??????????????????????????? Index: fedora-install-guide-other-instmethods-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-other-instmethods-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-other-instmethods-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 @@ -4,7 +4,7 @@ ???????????????????????????????????????????????????????????????????????? - ???????????? PXE ??? USB ?????????????????????????????? + ?????? PXE, USB ?????????????????????????????? CD ??? DVD ????????? ?????? boot: ???????????????????????? ????????? @@ -27,7 +27,7 @@ ????????????????????????????????????????????????????????? OK??? CD/DVD ?????? - ???????????????????????????????????? &FED; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????
???????????????????????? Index: fedora-install-guide-packageselection-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-packageselection-zh_CN.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-packageselection-zh_CN.xml 4 Dec 2005 23:15:24 -0000 1.3 +++ fedora-install-guide-packageselection-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.4 @@ -1,10 +1,14 @@ ??????????????? + + ?????? + &FC; &FCLOCALVER; ???????????????????????????????????????????????? test1 ??????????????????????????????????????? test2 ?????????????????? + &FED; ??????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Custom ???????????????&FED; ??????????????? Package Group Selection??? ???????????? - ??????????????????????????????????????????????????????????????????????????????????????????????????? Package Management ?????????????????????????????????????????????????????????????????????????????? SystemAdministrationAdd/Remove Applications??? + ??????????????????????????????????????????????????????????????????????????????????????? Package Management ??????????????????????????????????????????????????? SystemAdministrationAdd/Remove Applications???
????????????????????? Index: fedora-install-guide-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 @@ -1,23 +1,23 @@ + %FEDORA-ENTITIES-EN; - - - + + + + + - - + + - - @@ -29,7 +29,7 @@ ]> - &FC; &FCLOCALVER; &IG; + &FC; &FCLOCALVER; &IG; - BETA 2005 &FORMAL-RHI; @@ -46,4 +46,4 @@ Paul W. - &LEGALNOTICE; 0.6.22005-04-30StuartEllisPaulWFrields?????? CVS???????????????0.6.32005-05-10PaulWFrieldsStuartEllis????????????????????????????????? "nextsteps"0.72005-05-15StuartEllisPaulWFrields???????????????????????????1.0rc12005-06-08KarstenWade?????????????????????????????????1.02005-06-10KarstenWade???????????? &INTRODUCTION; &BEGINNINGINSTALLATION; &OTHERINSTALLMETHODS; &LOCALE; &UPGRADING; &INSTALLTYPES; &DISKPARTITIONING; &BOOTLOADER; &NETWORKCONFIG; &FIREWALLCONFIG; &TIMEZONE; &ROOTPASSWORD; &PACKAGESELECTION; &ABOUTTOINSTALL; &INSTALLINGPACKAGES; &FIRSTBOOT; &NEXTSTEPS; &ACKNOWLEDGEMENTS; + &LEGALNOTICE; 0.6.22005-04-30StuartEllisPaulWFrields?????? CVS???????????????0.6.32005-05-10PaulWFrieldsStuartEllis????????????????????????????????? "nextsteps"0.72005-05-15StuartEllisPaulWFrields???????????????????????????1.0rc12005-06-08KarstenWade?????????????????????????????????1.02005-06-10KarstenWade????????????1.0.1rc12005-11-20PaulWFrields???????????????????????????1.0.22005-11-25PaulWFrields??????????????????????????????????????? /home ???????????????1.0.32005-12-04StuartEllis????????????????????? anaconda ?????????????????????1.0.42005-12-06StuartEllis??????????????????????????????????????????1.0.52005-12-0! 8StuartEllis????????????????????? &INTRODUCTION; &BEGINNINGINSTALLATION; &OTHERINSTALLMETHODS; &LOCALE; &UPGRADING; &DISKPARTITIONING; &BOOTLOADER; &NETWORKCONFIG; &TIMEZONE; &ROOTPASSWORD; &PACKAGESELECTION; &ABOUTTOINSTALL; &INSTALLINGPACKAGES; &FIRSTBOOT; &NEXTSTEPS; &ACKNOWLEDGEMENTS; From fedora-docs-commits at redhat.com Sat Dec 10 12:56:42 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 07:56:42 -0500 Subject: docs-common/common fedora-entities-zh_CN.ent, NONE, 1.1 bugreporting-zh_CN.xml, NONE, 1.1 Message-ID: <200512101256.jBACuglF031928@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/docs-common/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31906 Added Files: fedora-entities-zh_CN.ent bugreporting-zh_CN.xml Log Message: add translations to bugreport text ***** Error reading new file: [Errno 2] No such file or directory: 'fedora-entities-zh_CN.ent' --- NEW FILE bugreporting-zh_CN.xml --- ?????????????????? ???????????????????????????????????????????????? &BZ-URL; ?????? &BZ; ??????????????????????????????????????????????????????????????? "&BZ-PROD;" ?????? Product(??????)???????????????????????????????????? Component(??????)???????????????????????? &BOOKID;??? ???????????????????????????????????????????????????????????????????????? &FED; ??????????????????????????????????????????????????? From fedora-docs-commits at redhat.com Sat Dec 10 13:48:48 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Sat, 10 Dec 2005 08:48:48 -0500 Subject: install-guide fedora-install-guide-intro-en.xml, 1.20, 1.21 fedora-install-guide-other-instmethods-en.xml, 1.15, 1.16 Message-ID: <200512101348.jBADmmTj001312@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1293 Modified Files: fedora-install-guide-intro-en.xml fedora-install-guide-other-instmethods-en.xml Log Message: - Modified sections on installing from a network server to cover using mirrors - Moved Architecture explanation to a separate section, as both mirror URLs and disc sets reference architecture names Index: fedora-install-guide-intro-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fedora-install-guide-intro-en.xml 6 Dec 2005 20:54:47 -0000 1.20 +++ fedora-install-guide-intro-en.xml 10 Dec 2005 13:48:41 -0000 1.21 @@ -1,33 +1,32 @@ + Introduction - &FC; is a complete desktop and server operating system created entirely with open source software. - &FC; Lifecycle + &FC; is a rapidly evolving system which follows the latest - technical developments. &FC; may not be appropriate for use in + technical developments. &FC; may not be appropriate for use in critical applications in your organization. - This manual helps you to install &FC; on desktops, laptops and - servers. The installation system is flexible enough to use even if - you have no previous knowledge of Linux or computer networks. If - you select default options, &FC; provides a complete desktop - operating system, including productivity applications, Internet - utilities, and desktop tools. + servers. The installation system is flexible enough to use even if + you have no previous knowledge of Linux or computer networks. If you + select default options, &FC; provides a complete desktop operating + system, including productivity applications, Internet utilities, and + desktop tools. - This document does not detail all of the features of the - installation system. @@ -41,69 +40,117 @@ The &FP;, which produces and maintains &FC;, is a collaboration between &FORMAL-RHI; and the - free software - FOSS + free software + FOSS - open source - FOSS - - - FOSS (free and open source software) + open source + FOSS + + FOSS (free and open source software) free and open source software - (FOSS) community. The &FP; also provides &FEX;, additional + (FOSS) community. The &FP; also provides &FEX;, additional software packaged for installation on a &FC; system. - For more information about the &FP;, please visit &FP-URL;. Refer to + For more information about the &FP;, please visit + &FP-URL;. Refer to http://www.opensource.org/ - and http://www.gnu.org/philosophy/free-sw.html + url="http://www.opensource.org/">http://www.opensource.org/ + and + http://www.gnu.org/philosophy/free-sw.html for more information about open source software. -
+
+ Understanding i386 and Other Architectures + + The &FP; provides versions of &FC; for PCs, and also for a range + of other machines that are based on different technologies. Each + version of &FC; is built for computers that are based on a + specific architecture. All 32-bit PCs are + based on the i386 architecture. You may + also install versions of &FC; on computers that are based on + x86_64, and ppc. The + architectures are explained below: + + + + i386 + + + Intel x86-compatible processors, including Intel Pentium and + Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, + Pentium 4, and Xeon; VIA C3/C3-m and Eden/Eden-N; and AMD + Athlon, AthlonXP, Duron, AthlonMP, and Sempron + + + + + + ppc + + + PowerPC processors, such as those found in Apple Power + Macintosh, G3, G4, and G5, and IBM pSeries systems + + + + + + x86_64 + + + 64-bit AMD processors such as Athlon64, Turion64, Opteron; + and Intel 64-bit processors such as EM64T + + + + +
Before You Begin - + Before installing &FC; you will need access to the following things: + - - Boot or installation media (refer to + Boot or installation media (refer to + for more information) - + - - Information about your network configuration - + + Information about your network configuration + - - A copy of this &IG; and the Release Notes for this version of - &FC; - + + A copy of this &IG; and the Release Notes for this version of + &FC; + The Release Notes specify the hardware requirements for the - version of &FC; which you are about to install. They also provide + version of &FC; which you are about to install. They also provide advice on any known problems with particular hardware and software configurations. - + The Release Notes are available on the first disc in HTML and - plain text format. The latest versions of this &IG; and the + plain text format. The latest versions of this &IG; and the Release Notes can always be found at &FDPDOCS-URL;. @@ -111,34 +158,36 @@ Networking - By default, &FC; systems attempt to discover correct connection - settings for the attached network using - DHCP (Dynamic Host Configuration Protocol) - DHCP (Dynamic Host Control - Protocol). Your network may include a DHCP provider which - delivers settings to other systems on demand. The DHCP provider - may be a router or wireless access point for the network, or a - server. + By default, &FC; systems attempt to discover correct connection + settings for the attached network using + DHCP (Dynamic Host Configuration Protocol) + DHCP (Dynamic Host Control + Protocol). Your network may include a DHCP provider which + delivers settings to other systems on demand. The DHCP provider + may be a router or wireless access point for the network, or a + server. - In some circumstances you may need to provide information about - your network during the installation process. Refer to and for more information. + In some circumstances you may need to provide information about + your network during the installation process. Refer to + and + for more + information. - Modem Configuration - - The installation system for &FC; does not configure modems. If - your computer has a modem, configure the dialing settings - after you complete the installation and reboot. - - + Modem Configuration + + The installation system for &FC; does not configure modems. If + your computer has a modem, configure the dialing settings + after you complete the installation and reboot. + +
- -
- Installing from a Network Server + Installing from a Server or Website - To install &FC; using a network installation server you will - need to know the following: + You may install &FC; using a mirror, a + website or network server that provide a copy of the necessary + files. To use a mirror you will need to know the following: + - - - the name of the server - - - - - the network protocol used for installation (FTP, HTTP, or - NFS) - - - - - the path to the installation files - - + + + the name of the server + + + + + the network protocol used for installation (FTP, HTTP, or + NFS) + + + + + the path to the installation files on the server + + - A network installation requires boot media, unless you are using - PXE (Pre-boot eXecution Environment) to - boot your computer. Boot your computer using either an - installation DVD, the first installation CD, a boot CD, or a - prepared USB storage device. Refer to for more information. + You may install &FC; from your own private mirror, or use one of + the public mirrors maintained by members of the community. The + &FP; maintains a list of public mirrors that provide the + installation files with HTTP and FTP: + . + Choose a server from the list for your region. - + - PXE (also referred to as netboot) is a - standard that enables PCs to use files on a server as a boot - device. &FC; includes utilities that allow it to function as a - PXE server for other computers. + Add + /&FCLOCALVER;/architecture/os/ + to the path shown on the website, to determine the complete the + directory path for the installation files. + + + Building Your Own Mirror + + Refer to + for information on how to create your own &FED; mirror for + either public or private use. + + + + To use a mirror, boot your computer with a &FED; disc, and + follow the instructions in + . Refer to + for more information on + creating the boot media. + + + + Using the Installation Discs + + + If you boot your computer with either an installation DVD, or + the first installation CD, enter linux + askmethod at the + boot: + prompt to access the server installation options. + + + + + If your network includes a server, you may also use + PXE (Pre-boot eXecution Environment) to + boot your computer. PXE (also referred to as + netboot) is a standard that enables PCs + to use files on a server as a boot device. &FC; includes + utilities that allow it to function as a PXE server for other + computers. -
-
Installing &FC; on a Managed Network - Some corporate networks include a directory - service that manages user accounts for the - organization. &FC; systems can join a Kerberos, NIS, Hesiod, or - Microsoft Windows domain as part of the - installation process. &FC; can also use LDAP directories. + Some corporate networks include a directory + service that manages user accounts for the + organization. &FC; systems can join a Kerberos, NIS, Hesiod, or + Microsoft + Windows domain as + part of the installation process. &FC; can also use LDAP + directories. - - - - Consult Network Administrators - - If you are installing outside of your home, always consult the - administrators before installing a &FC; system on an existing - network. They can provide correct network and authentication - settings, and guidance on specific organizational policies and - requirements. - - + Consult Network Administrators + + If you are installing outside of your home, always consult the + administrators before installing a &FC; system on an existing + network. They can provide correct network and authentication + settings, and guidance on specific organizational policies and + requirements. + +
-
-
Preparing Media @@ -254,20 +338,20 @@ - - CD or DVD media (either installation disc #1 or a special - boot-only disc) - + + CD or DVD media (either installation disc #1 or a special + boot-only disc) + - - USB media - + + USB media + - - Network interface (via PXE) - + + Network interface (via PXE) + @@ -277,75 +361,42 @@ - - CD or DVD media installation discs - + + CD or DVD media installation discs + - - Hard disk - + + Hard disk + - - Network installation tree via HTTP, FTP, or NFS - + + Network installation tree via HTTP, FTP, or NFS + Installation from Diskettes + - There is no option to install &FC; from diskettes. + There is no option to install &FC; from diskettes. To install &FC; from discs, you need five installation CDs, or the - installation DVD. There are separate disc sets for each supported - architecture. Currently, &FC; supports the - i386, ppc, and - x86_64 architectures. These architectures - are described below: + installation DVD. There are separate disc sets for each supported + architecture. - - - i386 - - - Intel x86-compatible processors, including Intel Pentium and - Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, - Pentium 4, and Xeon; VIA C3/C3-m and Eden/Eden-N; and AMD - Athlon, AthlonXP, Duron, AthlonMP, and Sempron - - - - - ppc - - - PowerPC processors, such as those found in Apple Power - Macintosh, G3, G4, and G5, and IBM pSeries systems - - - - - x86_64 - - - 64-bit AMD processors such as Athlon64, Turion64, Opteron; - and Intel 64-bit processors such as EM64T - - - - - Architecture-Specific Distributions + - To install &FC; you need the boot or installation media that is - particular to your architecture. + To install &FC; you need the boot or installation media that is + particular to your architecture. @@ -358,10 +409,11 @@ You may also use the first CD or DVD installation disc from the - complete &FC; distribution as boot media. For instructions to + complete &FC; distribution as boot media. For instructions to download and prepare this CD or DVD installation media, refer to - . If you already - have the full set of &FC; installation media, skip to . If you already + have the full set of &FC; installation media, skip to + . @@ -369,97 +421,89 @@ Preparing CD or DVD Media - The images/boot.iso file on the first &FC; - installation disc is a boot image designed for CD and DVD media. - This file also appears on FTP and Web sites providing &FC;. You - can also find this file on mirror sites in the &FC; distribution - directory for your particular architecture. + The images/boot.iso file on the first &FC; + installation disc is a boot image designed for CD and DVD media. + This file also appears on FTP and Web sites providing &FC;. You + can also find this file on mirror sites in the &FC; distribution + directory for your particular architecture. - To convert an ISO file into a physical CD, use the option in - your CD-writing program that burns a CD image file to a CD. If - you copy the file itself to a CD instead, the disc will not boot - or work correctly. Refer to your CD writing program - documentation for instructions. If you are using Linux, use the - following command to burn a CD image file to a blank recordable - CD: + To convert an ISO file into a physical CD, use the option in + your CD-writing program that burns a CD image file to a CD. If + you copy the file itself to a CD instead, the disc will not boot + or work correctly. Refer to your CD writing program + documentation for instructions. If you are using Linux, use the + following command to burn a CD image file to a blank recordable + CD: - cdrecord --device=cdwriter-device -tao -eject image-file.iso -
- +
Preparing USB Boot Media - Data Loss - - This procedure destroys data on the - media. Back up any important information before - you begin. Some models of USB media use additional partitions - or software to provide functions such as encryption. This - procedure may make it difficult or impossible to access these - special areas on your boot media. - + Data Loss + + + This procedure destroys data on the + media. Back up any important information before you + begin. Some models of USB media use additional partitions or + software to provide functions such as encryption. This + procedure may make it difficult or impossible to access these + special areas on your boot media. + - The images/diskboot.img file on the first - &FC; installation disc is a boot image designed for USB media. - This file also appears on FTP and Web sites providing &FC;. + The images/diskboot.img file on the first + &FC; installation disc is a boot image designed for USB media. + This file also appears on FTP and Web sites providing &FC;. - Several software utilities are available for Windows and Linux - that can write image files to a device. Linux includes the - dd command for this purpose. To write an - image file to boot media with dd on a current - version of &FC;: + Several software utilities are available for Windows and Linux + that can write image files to a device. Linux includes the + dd command for this purpose. To write an + image file to boot media with dd on a current + version of &FC;: - - - - Locate the image file. - - - - - Attach or insert the media. - - - - - Your system may automatically detect and open the media. If - that happens, close or unmount the media before continuing. - - - - - Open a terminal window. - - - - - In the terminal window, type the following command: - - + + + Locate the image file. + + + + + Attach or insert the media. + + + + + Your system may automatically detect and open the media. If + that happens, close or unmount the media before continuing. + + + + + Open a terminal window. + + + + + In the terminal window, type the following command: + dd if=diskboot.img of=/dev/sda - - + -
-
- - - Other Installation Methods - + Alternative Installation Methods The installation method screen below appears if one of the following is true: @@ -10,17 +9,17 @@ - You booted with PXE, USB media, or boot-only CD or DVD media. + You booted with PXE, USB media, or boot-only CD or DVD media. - You entered the option at the - boot: prompt. + You entered the option at the + boot: + prompt. -
Installation Method Screen @@ -37,214 +36,203 @@
- Highlight the appropriate installation method on the list, and select OK. - CD/DVD Activity + If the first &FC; distribution installation disc is in your computer's CD or DVD drive, the installation program loads its - next stage from that disc. The installation program still + next stage from that disc. The installation program still downloads package data from the source you choose. - -
Installation from a Network Server You may install &FC; from a network server using FTP, HTTP, or - NFS (Network File System) - install from - NFS protocols. + NFS (Network File System) + install from + NFS protocols. Refer to + for + information on installation servers. -
TCP/IP Configuration - By default, the installation program uses DHCP to automatically - provide the network settings. If your network has no DHCP - server, clear the checkbox labeled Use dynamic IP - configuration and enter the settings manually. - Select OK to continue. + By default, the installation program uses DHCP to automatically + provide the network settings. If your network has no DHCP + server, clear the checkbox labeled Use dynamic IP + configuration and enter the settings manually. + Select OK to continue. -
- Configure TCP/IP Dialog - - - - - - - - - + Configure TCP/IP Dialog + + + + + + + + + TCP/IP configuration dialog. - - + +
- - These settings apply only during the installation process. The - installation program allows you to configure the final network - configuration later. + These settings apply only during the installation process. The + installation program allows you to configure the final network + configuration later. -
-
Network Service Setup - The FTP, HTTP, and NFS service setup dialogs are very similar. - Each requires the name or IP address of the server, and a - directory where the installation tree resides. + The FTP, HTTP, and NFS service setup dialogs are very similar. + Each requires the name or IP address of the server, and a + directory where the installation files reside. To use a public + server, or mirror website, refer to + for + information on valid server names and directory paths. -
- FTP Setup Dialog - - - - - - - - - + FTP Setup Dialog + + + + + + + + + FTP setup dialog. - - + +
- - The FTP service setup dialog also has an option for - non-anonymous FTP. If your FTP server does - not provide anonymous access, select this check box, and provide - an account name and password in the following dialog. Select - OK to continue. + The FTP service setup dialog also has an option for + non-anonymous FTP. If your FTP server does + not provide anonymous access, select this check box, and provide + an account name and password in the following dialog. Select + OK to continue. -
- Non-anonymous FTP Account Dialog - - - - - - - - - + Non-anonymous FTP Account Dialog + + + + + + + + + Non-anonymous FTP account dialog. - - + +
-
-
- -
Installation from a Hard Drive You may install from a hard drive that contains the ISO image - files for the &FED; discs. The hard drive may be internal to the - computer or attached by USB. The partition on the hard drive + files for the &FED; discs. The hard drive may be internal to the + computer or attached by USB. The partition on the hard drive holding the ISO files must be formatted with the - ext2 - file systems + ext2 + file systems - file systems - ext2 + file systems + ext2 ext2, - ext3 - file systems + ext3 + file systems - file systems - ext3 + file systems + ext3 ext3 or - vfat - file systems + vfat + file systems - file systems - vfat + file systems + vfat vfat file system. In &FED;, vfat includes a range of file systems, such as FAT-16 and FAT-32, found on most - removable media. External hard drives usually contain vfat (FAT-32) file systems. - Some Microsoft Windows systems also use vfat file systems on internal - hard disk partitions. + removable media. External hard drives usually contain + vfat (FAT-32) file + systems. Some Microsoft Windows systems also use + vfat file systems on + internal hard disk partitions. FAT-16, FAT-32, and <systemitem class="filesystem">vfat</systemitem> + - Before you begin installation from a hard drive, check the - partition type to ensure that &FED; can read it. To check a - partition's file system under Windows, use the Disk - Management tool. To check a partition's file - system under Linux, use the fdisk utility. + Before you begin installation from a hard drive, check the + partition type to ensure that &FED; can read it. To check a + partition's file system under Windows, use the Disk + Management tool. To check a partition's file + system under Linux, use the fdisk utility. You cannot use ISO files on partitions controlled by LVM (Logical - Volume Management). Refer to for more information about - file systems. + Volume Management). Refer to + for more information + about file systems. If you choose this option, the following screen appears: -
Select Partition Screen - - - - - - - - + + + + + + + + Select partition screen. - +
- Select the partition containing the ISO files from the list of - available partitions. Internal IDE drive device names begin with - /dev/hd. SCSI or USB drive device names - begin with /dev/sd. Each individual drive - has its own letter, for example /dev/hda. - Each partition on a drive is numbered, for example + available partitions. Internal IDE drive device names begin with + /dev/hd. SCSI or USB drive device names begin + with /dev/sd. Each individual drive has its + own letter, for example /dev/hda. Each + partition on a drive is numbered, for example /dev/sda1. @@ -257,9 +245,7 @@ Select OK to continue. -
- - + @@ -164,6 +164,16 @@ + + 1.0.6 + 2005-12-10 + StuartEllis + + + Updated sections on installation methods. + + + Index: fedora-install-guide-intro-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fedora-install-guide-intro-en.xml 10 Dec 2005 13:48:41 -0000 1.21 +++ fedora-install-guide-intro-en.xml 10 Dec 2005 17:51:38 -0000 1.22 @@ -65,7 +65,7 @@
- Understanding i386 and Other Architectures + Understanding i386 and Other Computer Architectures The &FP; provides versions of &FC; for PCs, and also for a range @@ -74,8 +74,8 @@ specific architecture. All 32-bit PCs are based on the i386 architecture. You may also install versions of &FC; on computers that are based on - x86_64, and ppc. The - architectures are explained below: + x86_64, and ppc + technology. The architectures are explained below: @@ -240,18 +240,22 @@ You may install &FC; from your own private mirror, or use one of - the public mirrors maintained by members of the community. The - &FP; maintains a list of public mirrors that provide the - installation files with HTTP and FTP: - . - Choose a server from the list for your region. + the public mirrors maintained by members of the community. To + ensure that the connection is as fast and reliable as possible, + use a server that is close to your own geographical location. - Add + The &FP; maintains a list of HTTP and FTP public mirrors, sorted + by region: + + + + + To determine the complete the directory path for the + installation files, add /&FCLOCALVER;/architecture/os/ - to the path shown on the website, to determine the complete the - directory path for the installation files. + to the path shown on the webpage. Building Your Own Mirror @@ -289,7 +293,8 @@ netboot) is a standard that enables PCs to use files on a server as a boot device. &FC; includes utilities that allow it to function as a PXE server for other - computers. + computers. This option enables you to install &FC; entirely over + the network connection, using no physical media at all.
@@ -333,46 +338,89 @@ Preparing Media - The types of boot media for &FED; include: + You may use the first CD or DVD installation disc from the + complete &FC; distribution to boot your computer. For instructions + to download and prepare this CD or DVD installation media, refer + to . If you + already have the full set of &FC; installation media, skip to + . + + + + To install &FC; from discs, you need five installation CDs, or the + installation DVD. There are separate disc sets for each supported + architecture. + + + + Architecture-Specific Distributions + + + To install &FC; you need the boot or installation media that is + particular to your architecture. + + + + + The &FC; distribution also includes image + files for boot-only CD or DVD media and USB media. + These files can be converted into bootable media using standard + Linux utilities or third-party programs on other operating + systems. + + + + You may boot your computer with boot-only media, and load the + installation system from another source to continue the process. + The types of installation source for &FED; include: - CD or DVD media (either installation disc #1 or a special - boot-only disc) + CD or DVD media installation discs - USB media + Hard drive, either attached by USB, or internal to the + computer - Network interface (via PXE) + Network installation server, using either HTTP, FTP, or NFS - The types of installation source media for &FED; include: + This facility enables you to install &FC; on machines without + using installation discs. For example, you may install &FC; on a + laptop with no CD or DVD drive by booting the machine with a USB + pen drive, and then using a hard drive as an installation source. + + + + The supported boot media for &FED; include: - CD or DVD media installation discs + CD or DVD media (either installation disc #1 or a special + boot-only disc) - Hard disk + USB media - Network installation tree via HTTP, FTP, or NFS + Network interface (via PXE) @@ -381,42 +429,11 @@ Installation from Diskettes - There is no option to install &FC; from diskettes. + There is no option to either boot or install &FC; from + diskettes. - - To install &FC; from discs, you need five installation CDs, or the - installation DVD. There are separate disc sets for each supported - architecture. - - - - Architecture-Specific Distributions - - - To install &FC; you need the boot or installation media that is - particular to your architecture. - - - - - The &FC; distribution includes image files - for boot-only CD or DVD media and USB media. These files can be - converted into bootable media using standard Linux utilities or - third-party programs on other operating systems. - - - - You may also use the first CD or DVD installation disc from the - complete &FC; distribution as boot media. For instructions to - download and prepare this CD or DVD installation media, refer to - . If you already - have the full set of &FC; installation media, skip to - . - -
Preparing CD or DVD Media Index: fedora-install-guide-networkconfig-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-networkconfig-en.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fedora-install-guide-networkconfig-en.xml 27 May 2005 22:15:15 -0000 1.12 +++ fedora-install-guide-networkconfig-en.xml 10 Dec 2005 17:51:38 -0000 1.13 @@ -18,12 +18,6 @@ interfaces on your computer and configures them to use DHCP. - - Wireless interfaces using DHCP will join an open wireless network - once it is in range. Many wireless networks are restricted, and - only accept systems which have the correct security credentials. - -
Network Configuration Screen Index: fedora-install-guide-other-instmethods-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-en.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-install-guide-other-instmethods-en.xml 10 Dec 2005 13:48:41 -0000 1.16 +++ fedora-install-guide-other-instmethods-en.xml 10 Dec 2005 17:51:39 -0000 1.17 @@ -153,10 +153,17 @@ Installation from a Hard Drive - You may install from a hard drive that contains the ISO image - files for the &FED; discs. The hard drive may be internal to the - computer or attached by USB. The partition on the hard drive - holding the ISO files must be formatted with the + Once you have booted your computer, you may use ISO image files of + the &FED; discs to continue the installation process. The ISO + files must be located on a hard drive that is either internal to + the computer, or attached to the machine by USB. This option + enables you to install &FC; on computers that have neither a + network connection, nor CD or DVD drives. + + + + The partition on the hard drive holding the ISO files must be + formatted with the ext2 file systems From fedora-docs-commits at redhat.com Sat Dec 10 17:54:58 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 12:54:58 -0500 Subject: release-notes colophon-relnotes-zh_CN.xml, NONE, 1.1 daemons-zh_CN.xml, 1.1, 1.2 desktop-zh_CN.xml, 1.1, 1.2 development-tools-zh_CN.xml, 1.1, 1.2 entertainment-zh_CN.xml, 1.1, 1.2 feedback-zh_CN.xml, 1.1, 1.2 file-servers-zh_CN.xml, 1.1, 1.2 hardware-reqs-zh_CN.xml, 1.1, 1.2 i18n-zh_CN.xml, 1.1, 1.2 install-notes-zh_CN.xml, 1.1, 1.2 intro-zh_CN.xml, 1.1, 1.2 java-package-zh_CN.xml, 1.1, 1.2 kernel-zh_CN.xml, 1.1, 1.2 legacy-zh_CN.xml, 1.1, 1.2 misc-server-zh_CN.xml, 1.1, 1.2 multimedia-zh_CN.xml, 1.1, 1.2 networking-zh_CN.xml, 1.1, 1.2 overview-zh_CN.xml, 1.1, 1.2 package-movement-zh_CN.xml, 1.1, 1.2 package-notes-zh_CN.xml, 1.1, 1.2 project-overview-zh_CN.xml, 1.1, 1.2 RELEASE-NOTES-zh_CN.xml, 1.1, 1.2 samba-zh_CN.xml, 1.1, 1.2 security-zh_CN.xml, 1.1, 1.2 server-tools-zh_CN.xml, 1.1, 1.2 splash-zh_CN.xml, 1.1, 1.2 web-servers-zh_CN.xml, 1.1, 1.2 xorg-zh_CN.xml, 1.1, 1.2 Message-ID: <200512101754.jBAHswnW010368@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10321 Modified Files: daemons-zh_CN.xml desktop-zh_CN.xml development-tools-zh_CN.xml entertainment-zh_CN.xml feedback-zh_CN.xml file-servers-zh_CN.xml hardware-reqs-zh_CN.xml i18n-zh_CN.xml install-notes-zh_CN.xml intro-zh_CN.xml java-package-zh_CN.xml kernel-zh_CN.xml legacy-zh_CN.xml misc-server-zh_CN.xml multimedia-zh_CN.xml networking-zh_CN.xml overview-zh_CN.xml package-movement-zh_CN.xml package-notes-zh_CN.xml project-overview-zh_CN.xml RELEASE-NOTES-zh_CN.xml samba-zh_CN.xml security-zh_CN.xml server-tools-zh_CN.xml splash-zh_CN.xml web-servers-zh_CN.xml xorg-zh_CN.xml Added Files: colophon-relnotes-zh_CN.xml Log Message: update to catch up before test2 freeze --- NEW FILE colophon-relnotes-zh_CN.xml ---
&FC; ?????????????????? ?????????????????? ??????????????????????????????????????????????????? ???????????? colophon (??????)??????????????????????????? ?????????????????????????????????????????????????????? ??????????????????????????????
????????? Andrew Martynov (???????????????) Anthony Green (beat ??????) Bob Jensen Dave Malcolm (beat ??????) David Woodhouse (beat ??????) Francesco Tombolini (?????????????????????) Gavin Henry (beat ??????) Jens Petersen (beat ??????) Joe Orton (beat ??????) Josh Bressers (beat ??????) Karsten Wade (beat ??????, ??????, ??????) LuyaTshimbalanga (beat ??????) PatrickBarnes (beat ??????, ??????) Rahul Sundaram (beat ??????, ??????) Sekine Tatsuo (???????????????) Steve Dickson (beat ??????) Stuar tElliss (??????) Thomas Graf (beat ??????) Tommy Reynolds (??????) Yoshinari Takaoka (???????????????) Yuan Yijun (?????????????????????)
????????????
Index: daemons-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/daemons-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- daemons-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ daemons-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -6,19 +6,12 @@ ???????????????????????? &DISTRO; &DISTROVER; ?????????
- <filename>cron</filename> ??? <filename>slocate</filename> + + <filename>cron</filename> ??? <filename>slocate</filename> ???????????? cron ???????????? updatedb ????????????????????????????????? slocate ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????? slocate ??????????????????????????????????????? /etc/updatedb.conf?????????????????? - DAILY_UPDATE=yes
- Index: desktop-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/desktop-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- desktop-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ desktop-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -4,34 +4,43 @@ ?????? - GNOME 2.12 ??? KDE 3.4.2 ??????????????? + GNOME 2.12 ??? KDE 3.4.2 ????????? &FC; &LOCALVER; ?????? - ?????????????????????????????? GNOME 2.12.1???????????????????????????????????? GNOME 2.14 ????????????????????? + ???????????????????????? GNOME 2.12.1???????????????????????? GNOME 2.14 ?????????????????????????????????????????????????????????????????????????????? - gnome-power-manager????????????????????? (HAL) ???????????????????????? UPS ????????????????????? -- ????????????????????????????????????????????? (????????????????????????????????????????????????????????????)??? + + gnome-power-manager: GNOME Power Manager (????????????)??? GNOME ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HAL (????????????????????????) ??? DBUS (Inter Process Communication????????????????????????)?????? &FC; ??????????????????????????? - gnome-screensaver????????????????????????????????????????????? ???????????? ????????? + + gnome-screensaver???????????????????????????????????????????????????????????????????????? - fontconfig ??? shared-mime-info ????????????????????? (????????????????????????????????????????????????????????????)?????????????????????????????????????????? + fontconfig ??? shared-mime-info ??????????????????????????????????????????????????????????????????????????????????????? - ??????????????????????????????????????????????????????????????? - GNOME 2.12 ?????????????????????????????????????????????????????????Fedora Extras ???????????? nautilus-open-terminal ???????????????????????????GNOME 2.12 ???????????????????????????????????????????????????????????????????????? Extras ????????? - ???????????????????????????????????????????????????????????????????????????????????? - rawhide ???????????? MCS SELinux????????????????????????(?????? -- ?????????????????????????????????) - - OpenOffice ??????????????????????????? - ????????????????????? ??????????????????????????? ????????????????????????????????? OpenOffice ???????????? - ?????????????????????????????????????????????????????????????????? - -rm -rf /usr/lib/openoffice.org*/share/template/*/wizard/bitmap - - - - - + + GNOME 2.12 ?????????????????????????????????????????????????????????&FEX; ???????????? nautilus-open-terminal ???????????????????????????????????????????????????????????????????????? + + yum install nautilus-open-terminal + + + + ??? &FC; 4 ?????????????????????????????????????????????????????? + ?????????????????????????????????????????????????????????????????????????????????????????????????????? xscreensaver-gl-extras ????????????????????? OpenGL ??????????????????????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????????????????????????????????????????????????????????????????? + + yum install xscreensaver-extras xscreensaver-gl-extras + + + + + ??????????????????????????? + + system-config-monitor ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ???????????? + + Index: development-tools-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/development-tools-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- development-tools-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ development-tools-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -0,0 +1,189 @@ + +
+ ???????????? +
+ ??? Java ?????? + &FC; &LOCALVER; ???????????????????????? Java ???????????????????????? + ????????????????????????GNU Java ??????????????? (libgcj)???Eclipse Java ????????? (ecj)?????????????????????????????? (java-gcj-compat)????????????????????????????????????????????? Java ??????????????????????????? + ???????????????????????????????????? Openoffice.org Base, Eclipse, ??? Apache Tomcat, ?????????????????????????????? Java ?????????????????????????????????????????? + ????????????????????????????????? FAQ??? + + http://www.fedoraproject.org/wiki/JavaFAQ + +
+ + + +
Index: entertainment-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/entertainment-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- entertainment-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ entertainment-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,19 +1,12 @@
??????????????? - &FC; ??? &FEX; ????????????????????????????????????????????????&FC; ????????????????????? GNOME ????????????????????? (????????? gnome-games)???????????????????????? yum ????????????????????????????????????????????????????????????????????????????????? - -yum groupinfo "Games and Entertainment" - + &FC; ??? &FEX; ????????????????????????????????????????????????&FC; ????????????????????? GNOME ????????????????????? (????????? gnome-games)???????????????????????? yum ??????????????????????????????????????????????????????????????????????????? + + yum groupinfo "Games and Entertainment" + ???????????? yum ????????????????????????????????????????????????????????????????????? - + http://fedora.redhat.com/docs/yum/ - +
- Index: feedback-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/feedback-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- feedback-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ feedback-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,32 +1,18 @@
- ???????????????????????? - - (???????????? &DISTRO; ?????????????????????????????????????????????) - - ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? URL??? - - %%% https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=<bug-number> %%% - - ???????????? URL ??????????????????????????????????????????????????????????????????????????? bug ????????????????????? - - ?????????????????????????????????????????????????????????????????? URL (???????????????????????????????????????)?????????????????????????????? (??????????????? HTML ???????????? — ???????????? URL ?????????)??? - - ????????????????????????????????????????????? - - ???????????????????????????????????????????????????????????????????????? - - http://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=114398 - - ?????????????????????????????????????????? bugs ????????????????????????????????????????????????????????????????????? - - ?????????????????????????????? - -
- + ???????????????????????? + (???????????? &DISTRO; ?????????????????????????????????????????????) + ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? URL??? + %%% https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=<bug-number> %%% + ???????????? URL ??????????????????????????????????????????????????????????????????????????? bug ????????????????????? + ?????????????????????????????????????????????????????????????????? URL (???????????????????????????????????????)?????????????????????????????? (??????????????? HTML ???????????? — ???????????? URL ?????????)??? + + ????????????????????????????????????????????? + + ???????????????????????????????????????????????????????????????????????? + + http://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=114398 + + ?????????????????????????????????????????? bugs ????????????????????????????????????????????????????????????????????? + ?????????????????????????????? + Index: file-servers-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/file-servers-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- file-servers-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ file-servers-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -10,20 +10,20 @@ Netatalk (??? Macintosh ??????) ????????????????????? Netatalk ??????????????????Netatalk ????????? Linux ????????? Macintosh ???????????? AppleTalk ??????????????????????????????
- <filename>netatalk</filename> - &DISTRO; &DISTROVER; ????????? Netatalk ??????????????????????????????????????????????????????????????????????????????Netatalk ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + <filename>netatalk</filename> + + &DISTRO; &DISTROVER; ?????? Netatalk ??????????????? + + ???????????? Netatalk ????????? + ??? Netatalk 1 ????????? 2 ??????????????????????????? + + Netatalk ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? Netatalk ????????????????????????????????? - http://netatalk.sourceforge.net/2.0/htmldocs/upgrade.html + http://netatalk.sourceforge.net/2.0/htmldocs/upgrade.html ?????????????????? netatalk ?????????????????? /usr/share/doc/netatalk-2.0.2/doc/htmldocs/upgrade.html, ??? /usr/share/doc/netatalk-2.0.2/doc/Netatalk-Manual.pdf (???????????? 25, ???????????? 33).
- Index: hardware-reqs-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/hardware-reqs-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hardware-reqs-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ hardware-reqs-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -6,7 +6,7 @@ ?????? ??????????????????????????????/????????????????????????????????????????????????????????? (?????????????????????) ??????????????? - +
CPU ?????? - ?????????????????? &DISTRO; &DISTROVER; ????????? CPU ????????? - ?????? - ?????? CPU ???????????? Intel ????????????????????????????????????????????? (??????????????? AMD, Cyrix ??? VIA ?????????) ????????? Intel ????????????????????????????????? &DISTRO;??? - - ??????????????????????????? — &FC; &LOCALVER; ??????????????? 4 CPU ????????????????????????????????????????????? CPU (???????????????????????????????????? II????????? III???????????? AMD ??? VIA ????????????)????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? 4 ???????????????????????????????????????????????? + ??????????????????????????? — &FC; &LOCALVER; ??????????????? 4 CPU ????????????????????????????????????????????? CPU (???????????????????????????????????? II????????? III???????????? AMD ??? VIA ????????????)????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? 4 ???????????????????????????????????????????????? - - ??????????????????????????????200 MHz ??????????????? + ??????????????????????????????200 MHz ??????????????? - - ??????????????????????????????400 MHz ?????? II ????????? + ??????????????????????????????400 MHz ?????? II ????????? - - AMD64 ????????? (?????? Athlon64 ??? Opteron) + AMD64 ????????? (?????? Athlon64 ??? Opteron) - - ?????? Intel Extended Memory 64 Technology (Intel EM64T) ??? Intel ????????? + ?????? Intel Extended Memory 64 Technology (Intel EM64T) ??? Intel ?????????
?????????????????? - ???????????????????????? &DISTRO; &DISTROVER; ??????????????? - ?????? - ?????????????????? &DISTRO; &DISTROVER; ??????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? (CD-ROM 1 ??????) /Fedora/base/stage2.img ???????????????????????????????????? /var/lib/rpm ???????????? - - + ????????????????????????????????????????????????????????? 90MB ???????????????????????? "everything" ??????????????????????????? 175MB ??????????????? - ??????????????????????????????????????????????????????????????? 5% ?????????????????????????????????????????? - - + ??????????????? 32 ??? x86 ????????? - ??????????????? (????????????)???620MB + ??????????????? (????????????)???620MB - - ????????????1.1GB + ????????????1.1GB - - ???????????????2.3GB + ???????????????2.3GB - - ????????????3.0GB + ????????????3.0GB - - ??????????????? (????????????)???6.9GB + ??????????????? (????????????)???6.9GB ??????????????? 64 ??? x86_64 ????????? - ??????????????? (????????????)???900MB + ??????????????? (????????????)???900MB - - ????????????1.5GB + ????????????1.5GB - - ???????????????2.7GB + ???????????????2.7GB - - ????????? 3.4GB + ????????? 3.4GB - - ??????????????? (????????????)???7.5GB + ??????????????? (????????????)???7.5GB
-
???????????? - ???????????????????????? &DISTRO; &DISTROVER; ??????????????? ??????????????? 32 ??? x86 ????????? - ????????????????????????64MB + ????????????????????????64MB - - ????????????????????????192MB + ????????????????????????192MB - - ????????????????????????256MB + ????????????????????????256MB ??????????????? 64 ??? x86_64 ????????? - ????????????????????????128MB + ????????????????????????128MB - - ????????????????????????256MB + ????????????????????????256MB - - ????????????????????????512MB + ????????????????????????512MB
@@ -150,24 +122,17 @@ ????????????????????? PowerPC (PPC) ????????? &FC; &LOCALVER; ???????????????????????? - ????????????PowerPC G3 / POWER4 + ????????????PowerPC G3 / POWER4 - &FC; &LOCALVER; ????????? Apple ??? 1999 ???????????????????????? New World ????????? Power Macintosh??????????????? 64 ?????? G5 ?????????????????? IBMeServerpSeries ?????? Power ??????????????????????????? 32 ??? IBMRS/6000 ????????? + &FC; &LOCALVER; ?????? New World ????????? Apple Power Macintosh (??? 1999 ??????), Genesi Pegasos II, ?????? IBM 32-bit RS/6000 ????????????????????? 64 ??? G5 ?????????????????? IBM eServer pSeries ?????? POWER ???????????? - ????????????????????????233MHz G3 ????????? + ????????????????????????233MHz G3 ????????? - ????????????????????????400MHz G3 ????????? + ????????????????????????400MHz G3 ????????? - Index: i18n-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/i18n-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- i18n-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ i18n-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -5,43 +5,9 @@
??????????????? ?????????????????? &DISTRO; ???????????????????????????????????? -
- IIIMF ???????????? - IIIMF ??? Internet/Intranet Input Method Framework?????? &FC; &LOCALVER; ??????iiimf ????????????????????? 12.2 ?????? - - - ????????????????????? - - iiimf ??????????????????????????????????????????????????????????????? - IIIMF ??????????????????????????? /usr/sbin/htt ?????? /usr/bin/iiimd???XIM ??????????????????????????? httx ?????? iiimx???init.d ??????????????????????????????????????????????????? iiim?????????????????????????????????????????? /etc/iiim/??? - ???????????? (LE) ???????????????????????????LE ??????????????????????????? ${libdir}/iiim/le/<LE_NAME>/??????????????????????????? /var/lib/iiim/le/<LE_NAME>/??? - ?????????????????????????????????????????????????????? Fedora IIIMF FAQ??? - http://www.fedora.redhat.com/projects/i18n/iiimf-faq.html. - - - - ????????? - - ?????????????????????????????????????????? CtrlSpace????????????????????????????????? iiimf-le-tools ????????????????????????????????????????????? GTK2 ?????????????????????????????????????????? XIM ??????????????????????????? X ??????????????????????????????????????? IIIMF FAQ ??????????????????????????????????????????????????? http://www.fedora.redhat.com/projects/i18n/iiimf-faq.html??? - ?????????????????? X ???????????????????????????????????????????????? Ctrl@ ????????????????????????????????? '<Control>at' ??????????????????????????? '<Control>@'??? - ????????? &SEL; enforcing ??????????????????????????? &SEL; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? - - - - Qt ?????? - - ?????????????????? iiimf ??? Qt immodule??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Qt ?????????????????????????????? XIM ????????? IIIMF ????????? - ?????????????????? Qt ????????????????????? immodule??????????????? iiimf-qt ???????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ?????????????????? iiimqcf??? - - - -
+ + IIIMF ????????? + ??????????????? SCIM ????????? IIIMF??? +
- Index: install-notes-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/install-notes-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- install-notes-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ install-notes-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -4,8 +4,9 @@ ?????????????????? Anaconda (&DISTRO; ????????????) ??????????????? &DISTRO; &DISTROVER; ???????????????????????? ?????? - ????????????????????? &DISTRO; &DISTROVER; DVD ISO ???????????????????????????????????????????????????????????? 2GB ?????????????????????wget ????????? File size limit exceeded ???????????? - curl ??? ncftpget ????????????????????????????????????????????????????????? 2GB ???????????? + ????????????????????? &DISTRO; &DISTROVER; DVD ISO ???????????????????????????????????????????????????????????? 2GB ?????????????????????wget ??? 1.9.1.16 ???????????????????????? File size limit exceeded (????????????????????????)???????????? + + wget 1.9.1-16 ??????????????????curl ??? ncftpget ????????????????????????????????????????????????????????? 2GB ???????????? Bittorrent ?????????????????????????????????????????????????????????????????? torrent ???????????????????????? http://torrent.fedoraproject.org/ @@ -13,144 +14,142 @@
PPC ?????? -
- PPC ???????????? - ????????????????????? PowerPC (PPC) ????????? &DISTRO; &DISTROVER; ???????????????????????? - - - ????????????PowerPC G3 / POWER4 - - - &DISTRO; &DISTROVER; ????????? Apple ??? 1999 ???????????????????????? New World ????????? Power Macintosh??? - - - &DISTRO; &DISTROVER; ????????? IBM eServer pSeries???IBM RS/6000 ?????? Genesi Pegasos II ???????????? - - - ????????????????????????233MHz G3 ????????????64MB ?????? - - - ????????????????????????400MHz G3 ????????????128MB ?????? - - - &FC; ??????????????? DVD ???????????? CD ????????????????????????????????????????????????????????????????????? DVD ???????????? CD ??? images/ ???????????????????????? CD ??????????????????????????????????????????????????? - - ??????????????????????????????????????? - - Apple Macintosh - - ??????????????????????????????????????? 32 ?????? 64 ???????????????????????????????????????????????????????????????????????????????????? apmud ???????????????????????? &FEX; ??????????????? &FC; ????????? &FEX; ???????????? yum ?????????????????????????????????????????? yum install apmud ????????? apmud??? - - - - 64-bit IBM eServer pSeries (POWER4/POWER5) - - ?????? OpenFirmware ?????? CD ????????????????????? (yaboot) ?????????????????? 64 ????????????????????? - - - - 32-bit CHRP (IBM RS/6000 ?????????) - - ?????? OpenFirmware ?????? CD ????????? boot: ?????????????????? linux32 ????????????????????? 32 ??????????????????????????????64 ?????????????????????????????????????????????????????? - - - - Genesi Pegasos II - - ?????? &DISTRO; &DISTROVER;????????? Pegasos ?????? ISO9660 ??????????????????????????????????????????????????????????????????????????? OpenFirmware ?????????????????????????????? - -boot cd: /images/netboot/ppc32.img - - ???????????????????????? Pegasos ?????? OpenFirmware ?????????????????? &FC; ???????????????????????????????????? boot-device ??? boot-file ?????????????????????????????? - - - - ???????????? - - ??????????????? images/netboot/ ???????????????????????????????????? ramdisk ????????????????????????????????????????????? TFTP ????????????????????????????????????????????????????????? - yaboot ?????? IBM eServer pSeries ??? Apple Macintosh ?????? tftp ?????????&FED; ???????????? yaboot ????????? netboot ??????????????? - - - -
+ &FC; ??????????????? DVD ???????????? CD ????????????????????????????????????????????????????????????????????? DVD ???????????? CD ??? images/ ???????????????????????? CD ??????????????????????????????????????????????????? + + ??????????????????????????????????????? + + Apple Macintosh + + ????????????????????????????????? 32 ?????? 64 ???????????????????????????????????????????????????????????????????????????????????? apmud ???????????????????????? &FEX; ??????????????? &FC; ????????? &FEX; ???????????? yum ????????????????????????????????????????????????????????? yum install apmud ????????? apmud??? + + + + 64-bit IBM eServer pSeries (POWER4/POWER5) + + ?????? OpenFirmware ?????? CD ????????????????????? (yaboot) ???????????? 64 ????????????????????? + + + + 32-bit CHRP (IBM RS/6000 ?????????) + + ?????? OpenFirmware ?????? CD ????????? boot: ?????????????????? linux32 ????????????????????? 32 ??????????????????????????????64 ?????????????????????????????????????????????????????? + + + + Genesi Pegasos II + + ?????? &DISTRO; &DISTROVER;????????? Pegasos ?????? ISO9660 ??????????????????????????????????????????????????????????????????????????? OpenFirmware ?????????????????????????????? + + boot cd: /images/netboot/ppc32.img + + ???????????????????????? Pegasos ?????? OpenFirmware ?????????????????? &FC; ???????????????????????????????????? boot-device ??? boot-file ?????????????????????????????? + + + + ???????????? + + ??????????????? images/netboot/ ???????????????????????????????????? ramdisk ??????????????????????????????????????????????????? TFTP ????????????????????????????????????????????????????????? + + yaboot ?????? IBM eServer pSeries ??? Apple Macintosh ?????? TFTP ?????????&FED; ???????????? yaboot ????????? netboot ??????????????? + + +
-
+
???????????? Anaconda - - &DISTRO; ??????????????????????????????????????????????????????????????? CD, DVD, ????????????????????? NFS ??????????????????????????????&RH; ???????????????????????????????????????????????????????????? bugs ????????????????????????????????? (??????????????????????????????????????? CD ??????????????????)???????????????????????? boot: ?????????????????? linux mediacheck??? - mediacheck ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? ISO ??????????????????????????????????????? padding???????????? mediacheck ??????????????????????????????????????????????????? - + &DISTRO; ??????????????????????????????????????????????????????????????? CD, DVD, ????????????????????? NFS ??????????????????????????????&RH; ???????????????????????????????????????????????????????????? bugs ????????????????????????????????? (??????????????????????????????????????? CD ??????????????????)???????????????????????? boot: ?????????????????? linux mediacheck??? + + mediacheck ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? ISO ??????????????????????????????????????? padding???????????? mediacheck ??????????????????????????????????????????????????? + linux ide=nodma - ????????????????????? sha1sum ???????????????????????????????????????????????????????????????????????? ISO ????????????????????? + ????????????????????? sha1sum ???????????????????????????????????????????????????????????????????????? ISO ????????????????????? - - ????????? boot: ?????????????????? memtest86???????????? &DISTRO; ????????????????????????????????? Memtest86 ???????????????????????????Memtest86 ????????????????????????????????? Esc ?????? - ?????????????????? CD-ROM 1 (????????? CD-ROM) ???????????????????????????????????? + ????????? boot: ?????????????????? memtest86???????????? &DISTRO; ????????????????????????????????? Memtest86 ???????????????????????????Memtest86 ????????????????????????????????? Esc ?????? + ?????????????????? CD-ROM 1 (????????? CD-ROM) ???????????????????????????????????? - - &DISTRO; &DISTROVER; ?????????????????? FTP ??? HTTP ???????????????????????????????????????????????????????????????????????????????????? 128MB ??????????????? (???????????????????????????????????????????????? CD-ROM 1 ???????????????) ???????????????????????????????????? 128MB ??????????????????????????????????????????????????????????????? + &DISTRO; &DISTROVER; ?????????????????? FTP ??? HTTP ???????????????????????????????????????????????????????????????????????????????????? 128MiB ??????????????? (???????????????????????????????????????????????? CD-ROM 1 ???????????????) ???????????????????????????????????? 128MiB ??????????????????????????????????????????????????????????????? + + +
+
+ ????????????????????? + + + ???????????????????????? yum ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + + ?????????????????????????????????????????????????????????????????????????????????????????????????????? SMP (Symmetric Multi Processor?????????????????????)????????????????????????????????????????????????????????????????????????????????? + + + ???????????????????????????????????????????????? + + + ???????????? syslog ??????????????????????????????????????????????????????????????? ????????????????????????????????? + + + Firewall/SELinux ?????????????????????????????????????????????????????? firstboot (????????????)?????? + + + ?????? gtkhtml ?????????????????????????????? HTML ???????????????????????? + + + Kickstart ?????????????????????????????? - pykickstart - ????????????????????????????????????????????????????????? kickstart ?????????????????? + + + Serial mice (????????????)???????????????????????? &FC; ???????????????
-
+
- Index: intro-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/intro-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intro-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ intro-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -10,7 +10,7 @@ ?????????????????????????????? ??? ??????????????????????????????????????????????????? http://fedora.redhat.com/docs/release-notes/ ??????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????? ??????????????? bugzilla ?????? ??????????????? bug ????????? - ????????????????????? &TINY-BUG-URL; ?????????????????????????????? bugzilla ?????????
- Index: java-package-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/java-package-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- java-package-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ java-package-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,17 +1,6 @@
?????? Java ????????? - - ?????????????????? - ???????????????????????? &DISTRO; &DISTROVER; ????????? - &FC; &LOCALVER; ????????????????????? Sun ????????? Java RPM??????????????? Provides ????????? &FC; &LOCALVER; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Sun Java ????????????????????? &FC; &LOCALVER; ?????????????????? jpackage.org ????????? RPM ??????????????? Sun Java tar ??????????????? /opt ????????????
- Index: kernel-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/kernel-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ kernel-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,6 +1,5 @@ - - -
+-->
Linux ?????? -
+
?????? - &DISTRO; ?????? 2.6 ??????????????????&FC; ????????????????????????????????????????????????????????????????????????????????????&FC; ???????????? kernel.org ???????????????????????????????????? vanilla kernel ????????????????????????????????? - ????????? &FC; ??????????????????????????????????????????????????????????????? - -rpm -qplkernel-version.src.rpm - + ?????????????????? 2.6 ??????????????????&FC; ????????????????????????????????????????????????????????????????????????????????????&FC; ???????????? http://www.kernel.org ???????????????????????????????????? vanilla kernel ????????????????????????????????? + ????????? &FC; ????????????????????????????????????????????????????????? + + rpm -qpl kernel-<version>.src.rpm +
???????????? &FC; ??????????????????????????? - ??????????????????????????????????????? SMP ??????????????????????????????????????? kernel-devel-version.arch.rpm ??????????????? + ??????????????????????????????????????? SMP (Symmetric Multi Processor?????????????????????) ??????????????????????????????????????? kernel-devel-version.arch.rpm ??????????????? ??????????????????????????? Xen ?????????????????????????????????????????? kernel-xen0-devel-version.arch.rpm ??????????????? - ????????????????????????????????????????????????????????????????????? /usr/src/kernels/version[-xen0]-arch/ ??????????????????????????????????????? - -rpm -Uvhkernel-devel[-xen0]-version.arch.rpm - - ??? - - ?????????????????????????????? - ?????? Linux ????????????????????????????????????????????????????????????????????????????????? /usr/src/linux ???????????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? - -ln -s/usr/src/kernels/kernel-all-the-rest/usr/src/linux - - + ????????????????????????????????????????????????????????????????????? /usr/src/kernels/version[-xen0]-arch/ ??????????????? + + ?????? x86_64 ??????????????? SMP ?????? + x86_64 ??????????????????????????????????????? SMP ???????????? &FC; &LOCALVER; ?????????????????????????????? SMP ????????? + +
+
+ ?????????????????????????????? + ?????? Linux ????????????????????????????????????????????????????????????????????????????????? /usr/src/linux ???????????????????????????????????????????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + ln -s /usr/src/kernels/kernel-version-arch /usr/src/linux +
- -
+
???????????????????????? - &DISTRO; &DISTROVER; ?????????????????????????????? kernel-source ????????????????????????????????????????????? ????????????????????? &FC; ????????????????????????????????? kernel.src.rpm ???????????????????????????????????????????????????????????????????????????????????????????????? - - ???????????????????????????????????????????????? - ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? version ??????????????????????????????????????????????????? - -uname -r - - - + &FC; &DISTROVER; ?????????????????????????????? kernel-source ????????????????????????????????????????????? ????????????????????? &FC; ????????????????????????????????? kernel.src.rpm ????????????????????? + ?????????????????????????????????????????????????????????????????????????????? + + ????????????????????????????????????????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? version ??????????????? uname -r ?????????????????????????????? + + ??????????????????????????? kernel-version.src.rpm ????????? - ????????? SRPMSCDISO ?????????????????? SRPMS ?????? + SRPMS ??????????????????????????? SRPMS CD iso ?????????????????? ???????????????????????? FTP ?????? - - ???????????????????????? - - -up2date --get-sourcekernel - - + ?????????????????????????????? + + yum install yum-utils yumdownloader --source kernel + - ?????????????????????????????? kernel-version.src.rpm??? - -rpm -Uvhkernel-version.src.rpm - - ????????? RPM ???????????? /usr/src/redhat/SOURCES ??? /usr/src/redhat/SPECS ????????? + ?????? kernel-version.src.rpm??????????????? rpm -Uvh kernel-version.src.rpm??? + ????????? RPM ??????????????? /usr/src/redhat/SOURCES ??? /usr/src/redhat/SPECS ????????? ???????????????????????????????????????????????? - -cd /usr/src/redhat/SPECS -rpmbuild -bp --target $(arch)kernel-2.6.spec - - ???????????????????????? /usr/src/redhat/BUILD/kernel-version ??????????????????????????????????????? linux-version ???????????? /usr/src ????????????????????????????????????????????????????????????????????????????????????????????? - -cd /usr/src/redhat/BUILD/kernel-version/usr/src/ -mv linux-version/usr/src/ -cd /usr/src -ln -s./linux-versionlinux -cd /usr/src/linux - - - - &DISTRO; &DISTROVER; ????????????????????????????????? configs/ ??????????????????i686 SMP ???????????????????????? configs/kernel-version-i686-smp.config?????????????????????????????????????????????????????????????????????????????????????????? - -cp configs/desired-config-file.config - - ??????????????? /lib/modules/version/build/.config ???????????????????????????????????????????????? .config ????????? - - - ?????????????????????????????????????????????????????? uname -r ??????????????????????????? Makefile ?????????????????????????????????????????????????????????????????????????????????Makefile ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Makefile??? - ??????????????? uname -r ????????????????????? 2.6.11-1.234_FC4???????????? EXTRAVERSION ??????????????? - + + cd /usr/src/redhat/SPECS rpmbuild -bp --target $(arch) kernel-2.6.spec + + ???????????????????????? /usr/src/redhat/BUILD/kernel-version ??????????????????????????????????????? linux-version ???????????? /usr/src/ ????????????????????????????????????????????????????????????????????????????????????????????? + + cd /usr/src/redhat/BUILD/kernel-version mv linux-version /usr/src/ cd /usr/src\ ln -s ./linux-version linux cd /usr/src/linux + + + + &FC; ?????????????????????????????? configs/ ??????????????????i686 SMP ???????????????????????? configs/kernel-version-i686-smp.config??????????????????????????????????????????????????????????????????????????????????????????cp configs/desired-config-file .config + ??????????????? /lib/modules/version/build/.config ???????????????????????????????????????????????? .config ????????? + + + ???????????????????????????????????????????????????????????? uname -r ??????????????????????????? Makefile ?????????????????????????????????????????????????????????????????????????????????Makefile ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Makefile??? + ??????????????? uname -r ??????????????? 2.6.11-1.234_FC4????????? EXTRAVERSION ???????????? + EXTRAVERSION = -prep ???????????? - + EXTRAVERSION = -1.234_FC4 - ?????????????????????????????????????????????????????????????????? + ?????????????????????????????????????????????????????????????????????????????? ????????????????????? - -make oldconfig - + + make oldconfig + + ????????????????????????????????? - ?????????????????????????????????
-
+
????????????????????? - ????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? - ?????????????????? foo.ko ?????????????????? foo.c ????????????????????????????????? Makefile??? - + ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? foo.ko ?????????????????? foo.c ????????????????????????????????? Makefile ??? + obj-m := foo.o KDIR := /lib/modules/$(shell uname -r)/build PWD := $(shell pwd) -default: - $(MAKE) -C $(KDIR) M=$(PWD) modules - - ?????? make ??????????????? foo.ko ????????????????????? +ndefault: + $(MAKE) -C $(KDIR) M=$(PWD) modules + + ?????? make ??????????????? foo.ko ?????????????????????
-
+
?????????????????????????????? - &DISTRO; ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? rpm -e kernel-version ???????????????????????????????????????????????????????????????????????????????????? rpm -e ???????????????????????????????????????????????????????????????????????????????????????????????? yum remove kernel-version????????? yum ????????????????????????????????????????????? + &DISTRO; ?????????????????????????????????????????? Red Hat GFS ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????? rpm -e kernel-version ???????????????????????????????????????????????????????????????????????? + ???????????? rpm -e ??????????????????????????????????????????????????????????????????????????????????????? yum remove kernel-version ??????????????? yum ????????????????????????????????????
- Index: legacy-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/legacy-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- legacy-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ legacy-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -0,0 +1,21 @@ + +
+ ???????????? + + ??????????????? <command>slocate</command> ?????? <command>mlocate</command> ????????? + + /usr/bin/{locate,updatedb} ???????????? slocate ??? mlocate ????????? + + + + + locate ??????????????????????????? + + + + + + /etc/updatedb.conf ??????????????????????????? + . slocate ????????????????????????????????????????????????????????? DAILY_UPDATE ?????????updatedb ???????????????????????? updatedb ??????????????????????????????????????? + LinuxThreads ??? &FC; 4 ?????????????????????????????????????????????????????? Red Hat Linux 9 ??? NPTL ?????????????????????????????? +
Index: misc-server-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/misc-server-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- misc-server-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ misc-server-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -11,10 +11,3 @@
- Index: multimedia-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/multimedia-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multimedia-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ multimedia-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -6,32 +6,32 @@ ?????????????????? - &FC; ???????????? rhythmbox???totem ??? Helix Player (hxplay) ??????????????????????????????&FC; ??? &FEX; ??????????????????????????????????????????????????? xmms ????????????GNOME ??? KDE ????????????????????????????????????????????????????????????????????????????????? Adobe/Macromedia ??? Flash ????????????Real Player???VLC???MPlayer ??? Xine ???????????????????????????????????????????????? &FED; ?????????????????????????????? &FED; ???????????????????????????????????????????????????????????????????????????????????? ??????????????? - &FC; ?????????????????????????????? Linux ???????????? (ALSA) ?????????????????????????????????????????????????????????????????? Linux ????????????????????????????????????????????????????????????????????????????????? ALSA ?????????????????????????????????????????????????????????????????????????????????????????????????????? - - http://www.alsa-project.org/ - - + &FC; ???????????? rhythmbox???totem ??? Helix Player (hxplay) ??????????????????????????????&FC; ??? &FEX; ??????????????????????????????????????????????????? xmms ????????????GNOME ??? KDE ????????????????????????????????????????????????????????????????????????????????? Adobe/Macromedia ??? Flash ????????????Real Player???VLC???MPlayer ??? Xine ???????????????????????????????????????????????? &FED; ?????????????????????????????? &FED; ???????????????????????????????????????????????????????????????????????????????????? ??????????????? + &FC; ?????????????????????????????? Linux ???????????? (ALSA) ?????????????????????????????????????????????????????????????????? Linux ????????????????????????????????????????????????????????????????????????????????? ALSA ?????????????????????????????????????????????????????????????????????????????????????????????????????? + + http://www.alsa-project.org/ + + Ogg ??? Xiph.Org ???????????????????????? - Fedora ???????????? Ogg ?????????????????????????????????????????? Vorbis ?????????Theora ?????????Speex ????????? FLAC ???????????????????????????????????????????????????????????????????????????????????????????????? Xiph.Org ????????????????????? - - http://www.xiph.org/ - - + Fedora ???????????? Ogg ?????????????????????????????????????????? Vorbis ?????????Theora ?????????Speex ????????? FLAC ???????????????????????????????????????????????????????????????????????????????????????????????? Xiph.Org ????????????????????? + + http://www.xiph.org/ + + MP3 ??? DVD ?????? - &FC; ??? &FEX; ??????????????? MP3 ??? DVD ???????????????????????????????????? MP3 ??? MPEG (DVD) ???????????????????????????????????????????????????????????????????????????????????????????????? ??? + &FC; ??? &FEX; ??????????????? MP3 ??? DVD ???????????????????????????????????? MP3 ??? MPEG (DVD) ???????????????????????????????????????????????????????????????????????????????????????????????? ???
?????????????????? - ???????????????????????????????????????????????? &FC; ??? &FEX; ???????????????????????????????????? MP3 ??? DVD ??????????????????Flash ???????????? Real ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????Fedora ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ???????????????????????????????????????????????? &FC; ??? &FEX; ???????????????????????????????????? MP3 ??? DVD ??????????????????Flash ???????????? Real ???????????????????????????????????? http://fedoraproject.org/wiki/ForbiddenItems @@ -41,10 +41,3 @@ &FC; ??? &FEX; ????????????????????????????????? CD ??? DVD ??????????????????????????????????????????????????? cdrecord???readcd???mkisofs ???????????? Linux ???????????????GNOME ?????????????????? &FC; ?????? xcdroast ??? &FEX; ?????? graveman ??????????????????????????????????????????KDE ?????????????????? k3b????????????????????????????????????
- Index: networking-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/networking-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- networking-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ networking-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -6,94 +6,94 @@ IPv4 ???????????? - ???????????? 2.6.12 ??????????????????????????????????????????????????????????????????????????????????????? IPv4 ?????????????????????????????????????????????????????????????????????????????????????????????????????? sysctl (??????????????????????????????) ????????????????????????????????????????????????????????? + ???????????? 2.6.12 ??????????????????????????????????????????????????????????????????????????????????????? IPv4 ?????????????????????????????????????????????????????????????????????????????????????????????????????? sysctl (??????????????????????????????) ????????????????????????????????????????????????????????? ICMP ?????????????????????????????? - ????????? ICMP ?????????????????????????????????????????????????????? ICMP ?????????????????????????????? 2.6.12 ????????????????????? sysctl???????????????????????????????????????????????????????????????????????? - ?????????????????? eth0 ???????????? ICMP ?????????????????????????????? sysctl ??????????????????????????? ICMP ?????????????????? eth1 ??????????????? eth0 ?????????????????????????????????????????? eth1 ???????????? - ????????????????????????????????????????????????????????? + ????????? ICMP ?????????????????????????????????????????????????????? ICMP ?????????????????????????????? 2.6.12 ????????????????????? sysctl???????????????????????????????????????????????????????????????????????? + ?????????????????? eth0 ???????????? ICMP ?????????????????????????????? sysctl ??????????????????????????? ICMP ?????????????????? eth1 ??????????????? eth0 ?????????????????????????????????????????? eth1 ???????????? + ????????????????????????????????????????????????????????? ?????? LC-Trie ????????????????????? - ?????????????????? trie ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????????????????? trie ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????? - TCP ???????????????????????????????????????????????????????????????????????? new RENO ???????????????????????????????????????????????????????????????????????????????????? - - - ?????? TCP ???????????? - - - TCP Hybla ???????????? - - - H-TCP ???????????? - - - ????????? TCP ???????????? - - - ?????????????????????????????????????????????????????????????????????BIC ??????????????? BICTCP 1.1 ???????????????????????????????????????????????? - - ???????????????????????? - ???????????????????????????????????????????????????????????????????????? ??????????????????????????????????????? - + TCP ???????????????????????????????????????????????????????????????????????? new RENO ???????????????????????????????????????????????????????????????????????????????????? + + + ?????? TCP ???????????? + + + TCP Hybla ???????????? + + + H-TCP ???????????? + + + ????????? TCP ???????????? + + + ?????????????????????????????????????????????????????????????????????BIC ??????????????? BICTCP 1.1 ???????????????????????????????????????????????? + + ???????????????????????? + ???????????????????????????????????????????????????????????????????????? ??????????????????????????????????????? + ????????????????????????????????? - ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DCCP ???????????? - ?????? 2.6.14-rc1 ??????????????? DCCP ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????? 2.6.14-rc1 ??????????????? DCCP ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????? - ???????????? HostAP ???????????????????????? 2.6.14-rc1 ????????????????????????????????????????????????????????????????????????????????? Intersil Prism2 ????????? (PC Card/PCI/PLX)?????????????????? Intel(R) PRO/Wireless 2100 ??? 2200 ???????????????????????? + ???????????? HostAP ???????????????????????? 2.6.14-rc1 ????????????????????????????????????????????????????????????????????????????????? Intersil Prism2 ????????? (PC Card/PCI/PLX)?????????????????? Intel(R) PRO/Wireless 2100 ??? 2200 ???????????????????????? ?????? - - - ????????? TCP ???????????? (TSO) ?????????????????????????????? - - - ????????????????????????????????????????????????????????? iptables ???????????????????????? - - - ????????????????????? IPv4 ??? IPv6 ??????????????????????????????????????????????????????????????? - - - IPv4 ?????????????????? SNMPv2 MIB ????????? ipInAddrErrors ???????????? - - - ??? Advanced API (RFC3542) ??????????????????????????????????????????????????? - - - + + + ????????? TCP ???????????? (TSO) ?????????????????????????????? + + + ????????????????????????????????????????????????????????? iptables ???????????????????????? + + + ????????????????????? IPv4 ??? IPv6 ??????????????????????????????????????????????????????????????? + + + IPv4 ?????????????????? SNMPv2 MIB ????????? ipInAddrErrors ???????????? + + + ??? Advanced API (RFC3542) ??????????????????????????????????????????????????? + + +
????????????????????? iproute ?????????????????? 2.6.12???IPv4 ???????????????????????????????????????????????????????????????????????????????????????????????????iproute2 ??????????????????????????????????????????????????? - + ip addr list dev eth0 4: eth0: <BROADCAST,MULTICAST,UP> mtu 1500 qdisc pfifo_fast qlen 1000 inet 10.0.0.3/24 scope global eth0 @@ -104,10 +104,11 @@ in further releases, fix your scripts! ??????????????????????????????????????????????????? - + su -c 'ip addr del 10.0.0.3/24 dev eth0' ????????????????????????????????????????????????????????????????????????????????????????????? (???????????????)????????? NO-CARRIER ???????????????????????????????????????????????????????????????????????????????????????????????? - ip ?????????????????????????????? ??????????????????????????? tc ????????????????????????????????????????????? + + ip ?????????????????????????????? ??????????????????????????? tc ?????????????????????????????????????????????
Index: overview-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/overview-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- overview-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ overview-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,10 +1,7 @@
?????????????????? - - ?????????????????? - ???????????????????????? &DISTRO; &DISTROVER; ????????? - +
- Index: package-movement-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/package-movement-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package-movement-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ package-movement-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,718 +1,1041 @@
- ??????????????? + Packages Movement - ????????????????????????????????????????????????????????????????????? \ ??????????????????????????????????????????????????? + Needs updating of entire contents for FC5. + + + This command was used to generate the list of package changes. The + backslash \ is used to artificially + break the line for printing purposes.: + -treediff.py dist-fc4 dist-rawhide > /tmp/diff \ - sed -e 's,^,* ,g' -e 's,$,\n,g' /tmp/diff > diffwiki +treediff.py dist-fc4 dist-rawhide > /tmp/diff \ +sed -e 's,^,* ,g' -e 's,$,\n,g' /tmp/diff > diffwiki
- ?????????????????? - ?????? 2005 ??? 9 ??? 21 ??? - [106429] MAKEDEV-3.19-1 -> [115423] MAKEDEV-3.19-4 - [111566] ImageMagick-6.2.2.0-2 -> [112246] ImageMagick-6.2.2.0-4 - [105261] newt-0.51.6-7 -> [117695] newt-0.51.6-8 - [106878] am-utils-6.0.9-12 -> [117066] am-utils-6.1.1-2 - [108819] amanda-2.4.5-2 -> [115871] amanda-2.4.5-3 - [112105] anaconda-10.2.1.5-2 -> [118390] anaconda-10.3.0.24-1 - [105300] aspell-0.50.5-6 -> [114172] aspell-0.60.3-2 - [108035] aspell-ca-0.50-2 -> [114184] aspell-ca-0.50-4 - [108036] aspell-cs-0.51-2 -> [114270] aspell-cs-0.51-3 - [108038] aspell-da-0.50-11 -> [114276] aspell-da-0.50-12 - [106443] libsoup-2.2.3-2 -> [116988] libsoup-2.2.6.1-1 - [108042] aspell-es-0.50-11 -> [117058] aspell-es-0.50-13 - [108044] aspell-fr-0.50-8 -> [114285] aspell-fr-0.50-9 - [108051] aspell-it-0.53-2 -> [114362] aspell-it-0.53-3 - [108055] aspell-nl-0.50-6 -> [114363] aspell-nl-0.50-7 - [108058] aspell-no-0.50.1-8 -> [114366] aspell-no-0.50.1-9 - [108060] aspell-pl-0.51-3 -> [118018] aspell-pl-0.51-5 - [108061] aspell-sv-0.50-7 -> [114371] aspell-sv-0.50-8 - [107959] at-3.1.8-77_FC4 -> [112026] at-3.1.8-78 - [108132] gtkhtml3-3.6.2-1 -> [117587] gtkhtml3-3.8.0-1 - [108304] ntp-4.2.0.a.20040617-8 -> [117060] ntp-4.2.0.a.20050816-1 - [108909] autofs-4.1.4-5 -> [112718] autofs-4.1.4-9 - [102923] automake-1.9.5-1 -> [114414] automake-1.9.6-1 - [108562] autorun-3.16-1 -> [118091] autorun-3.17-1 - [105321] awesfx-0.5.0d-2 -> [113536] awesfx-0.5.0d-3 - [105808] nut-2.0.1-1 -> [114509] nut-2.0.2-1 - [110344] bash-3.0-31 -> [118423] bash-3.0-34 - [110908] bind-9.3.1-4 -> [116915] bind-9.3.1-11 - [111486] binutils-2.15.94.0.2.2-2 -> [116754] binutils-2.16.91.0.2-4 - [105319] bootparamd-0.17-22.devel -> [116780] bootparamd-0.17-23.devel - [106988] bug-buddy-2.10.0-1 -> [117633] bug-buddy-2.12.0-1 - [111028] bzip2-1.0.2-16 -> [117182] bzip2-1.0.3-1 - [106470] pax-3.0-11 -> [116422] pax-3.4-1 - [109185] SysVinit-2.85-39 -> [113360] SysVinit-2.85-40 - [111393] control-center-2.10.1-6 -> [118105] control-center-2.12.0-2 - [111120] openldap-2.2.23-5 -> [111936] openldap-2.2.26-1 - [110745] cpio-2.6-7 -> [113389] cpio-2.6-8 - [106419] cracklib-2.8.2-1 -> [111862] cracklib-2.8.3-1 - [104496] bluez-hcidump-1.18-1 -> [115995] bluez-hcidump-1.24-1 - [104877] ctags-5.5.4-3 -> [115419] ctags-5.5.4-4 - [108614] cvs-1.11.19-8 -> [116935] cvs-1.11.19-10 - [108252] cyrus-sasl-2.1.20-5 -> [117833] cyrus-sasl-2.1.21-5 - [109650] pam-0.79-8 -> [118330] pam-0.80-8 - [109663] dhcp-3.0.2-12 -> [117972] dhcp-3.0.3-6 - [110743] apr-0.9.6-3 -> [118164] apr-0.9.6-6 - [110347] e2fsprogs-1.37-4 -> [117739] e2fsprogs-1.38-1 - [104668] diffstat-1.38-2 -> [116208] diffstat-1.38-4 - [107298] doxygen-1.4.2-1 -> [118248] doxygen-1.4.4-2 - [110505] dump-0.4b40-2 -> [113542] dump-0.4b40-4 - [110508] eject-2.0.13-15 -> [117061] eject-2.1.2-1 - [110262] parted-1.6.22-2 -> [117238] parted-1.6.24-1 - [110911] emacs-21.4-5 -> [114092] emacs-21.4-7 - [111808] esound-0.2.35-5 -> [114327] esound-0.2.36-1 - [105304] passwd-0.69-2 -> [112701] passwd-0.70-1 - [106286] fetchmail-6.2.5-7 -> [114678] fetchmail-6.2.5.2-1 - [109759] patch-2.5.4-24 -> [117794] patch-2.5.4-29 - [111272] filesystem-2.3.4-1 -> [116817] filesystem-2.3.5-1 - [106330] findutils-4.2.20-1 -> [117490] findutils-4.2.25-2 - [105012] finger-0.17-28 -> [113967] finger-0.17-29 - [105097] freetype-2.1.9-2 -> [116586] freetype-2.1.9-4 - [111401] ftp-0.17-26 -> [117241] ftp-0.17-29 - [104499] gawk-3.1.4-5 -> [118359] gawk-3.1.5-2 - [111099] gcc-4.0.0-8 -> [118294] gcc-4.0.1-14 - [108458] gd-2.0.33-2 -> [117628] gd-2.0.33-3 - [109684] gdb-6.3.0.0-1.21 -> [117661] gdb-6.3.0.0-1.65 - [106626] gettext-0.14.3-1 -> [116274] gettext-0.14.5-1 - [111402] gdm-2.6.0.8-16 -> [117776] gdm-2.8.0.4-1 - [108333] gedit-2.10.2-3 -> [117719] gedit-2.12.0-1 - [110935] perl-5.8.6-15 -> [117489] perl-5.8.7-0.3.fc5 - [107237] gok-1.0.3-1 -> [116496] gok-1.0.5-4 - [110356] php-5.0.4-10 -> [118097] php-5.0.5-3 - [110581] gimp-2.2.7-4 -> [116538] gimp-2.2.8-3 - [111654] gnome-applets-2.10.1-9 -> [117721] gnome-applets-2.12.0-1 - [111691] glibc-2.3.5-10 -> [117966] glibc-2.3.90-12 - [111104] gnome-games-2.10.0-5 -> [117724] gnome-games-2.12.0-1 - [111214] gnome-media-2.10.2-4 -> [117726] gnome-media-2.12.0-1 - [106508] kdeadmin-3.4.0-1 -> [118336] kdeadmin-3.4.2-2 - [110919] gnome-utils-2.10.0-3 -> [117738] gnome-utils-2.12.0-1 - [110246] gnupg-1.4.1-3 -> [116120] gnupg-1.4.2-3 - [104528] gnuplot-4.0.0-7 -> [117403] gnuplot-4.0.0-8 - [104506] gperf-3.0.1-6 -> [115552] gperf-3.0.1-7 - [104548] grep-2.5.1-48 -> [113236] grep-2.5.1-50 - [108057] xinitrc-4.0.18-1 -> [111974] xinitrc-4.0.19-1 - [104544] guile-1.6.7-2 -> [117402] guile-1.6.7-4 - [104475] hdparm-5.9-1 -> [112183] hdparm-6.1-1 - [111501] initscripts-8.11.1-1 -> [117977] initscripts-8.14-1 - [107880] inn-2.4.2-3 -> [115559] inn-2.4.2-4 - [106114] iproute-2.6.11-1 -> [118247] iproute-2.6.14-3 - [106499] iptables-1.3.0-2 -> [114287] iptables-1.3.2-1 - [107881] iputils-20020927-22 -> [117698] iputils-20020927-26 - [111656] isdn4k-utils-3.2-28 -> [115009] isdn4k-utils-3.2-32 - [105032] joe-3.1-8 -> [112056] joe-3.3-1 - [108237] kdebase-3.4.0-5 -> [118422] kdebase-3.4.2-5 - [106532] kdegames-3.4.0-1 -> [116019] kdegames-3.4.2-1 - [107198] kdegraphics-3.4.0-2 -> [117508] kdegraphics-3.4.2-3 - [104526] openobex-1.0.1-3 -> [111937] openobex-1.0.1-4 - [107226] kdemultimedia-3.4.0-2 -> [115553] kdemultimedia-3.4.2-1 - [106551] kdeutils-3.4.0-1 -> [117699] kdeutils-3.4.2-2 - [105322] minicom-2.00.0-21 -> [114175] minicom-2.1-1 - [112015] kernel-2.6.11-1.1369_FC4 -> [118394] kernel-2.6.13-1.1565_FC5 - [108707] libbtctl-0.4.1-7 -> [114382] libbtctl-0.4.1-8 - [107067] krb5-1.4-3 -> [118053] krb5-1.4.2-4 - [106252] krbafs-1.2.2-7 -> [115422] krbafs-1.2.2-8 - [111032] kudzu-1.1.116.2-2 -> [118290] kudzu-1.2.7-1 - [105596] lam-7.1.1-3 -> [115564] lam-7.1.1-7.FC5 - [105047] less-382-7 -> [117533] less-382-8 - [104599] libieee1284-0.2.9-2 -> [114409] libieee1284-0.2.9-3 - [106523] libtermcap-2.0.8-41 -> [115467] libtermcap-2.0.8-42 - [110440] libtiff-3.7.1-6 -> [113273] libtiff-3.7.2-1 - [109070] libtool-1.5.16.multilib2-1 -> [118098] libtool-1.5.20-3 - [104597] lm_sensors-2.8.8-5 -> [117365] lm_sensors-2.9.1-4 - [105199] lockdev-1.0.1-7 -> [118409] lockdev-1.0.1-9 - [107338] logrotate-3.7.1-10 -> [117629] logrotate-3.7.2-3 - [110353] lsof-4.74-7 -> [118297] lsof-4.76-1 - [108835] dovecot-0.99.14-4.fc4 -> [114740] dovecot-0.99.14-6.fc5 - [106781] make-3.80-7 -> [116850] make-3.80-8 - [104365] distcache-1.4.5-7 -> [115345] distcache-1.4.5-11 - [107530] man-pages-1.67-7 -> [118017] man-pages-2.07-5 - [93204] man-pages-cs-0.16-4 -> [115882] man-pages-cs-0.16-5 - [93194] man-pages-de-0.4-9 -> [115873] man-pages-de-0.4-10 - [108613] man-pages-ja-20050415-1 -> [116660] man-pages-ja-20050815-1 - [110081] mx4j-2.1.0-1jpp_7fc -> [114677] mx4j-3.0.1-1jpp_5fc - [109945] mc-4.6.1a-0.9 -> [118021] mc-4.6.1a-0.15 - [101562] desktop-file-utils-0.10-1 -> [117302] desktop-file-utils-0.10-3 - [111217] redhat-artwork-0.122-10 -> [116975] redhat-artwork-0.128-1 - [104435] mikmod-3.1.6-34 -> [112072] mikmod-3.1.6-35 - [110923] mkinitrd-4.2.15-1 -> [116471] mkinitrd-4.2.21-1 - [110244] gimp-print-4.2.7-7 -> [116481] gimp-print-4.2.7-12 - [111409] rhpl-0.167-1 -> [118384] rhpl-0.174-1 - [108728] glade2-2.10.0-1 -> [116544] glade2-2.10.0-2 - [107181] pyxf86config-0.3.19-4 -> [114209] pyxf86config-0.3.19-6 - [105582] arptables_jf-0.0.8-4 -> [116740] arptables_jf-0.0.8-6 - [108583] fontconfig-2.2.3-13 -> [114861] fontconfig-2.3.2-1 - [108241] oprofile-0.8.2-4 -> [114916] oprofile-0.9.1-2 - [104605] mtr-0.69-3 -> [117503] mtr-0.69-4 - [105384] mutt-1.4.2.1-2 -> [117134] mutt-1.4.2.1-3 - [106486] kdeedu-3.4.0-1 -> [118428] kdeedu-3.4.2-3 - [111281] httpd-2.0.54-10 -> [115215] httpd-2.0.54-12 - [109664] libwpd-0.8.1-1 -> [117298] libwpd-0.8.3-1 - [109161] ncurses-5.4-17 -> [115668] ncurses-5.4-18 - [109016] net-tools-1.60-52 -> [115663] net-tools-1.60-56 - [106997] rdesktop-1.4.0-2 -> [113322] rdesktop-1.4.1-1.fc5 - [106852] redhat-rpm-config-8.0.34-1 -> [116588] redhat-rpm-config-8.0.39-1 - [104517] compat-slang-1.4.5-10 -> [115421] compat-slang-1.4.5-11 - [111646] nfs-utils-1.0.7-8 -> [117732] nfs-utils-1.0.7-16 - [104611] rarpd-ss981107-20 -> [114929] rarpd-ss981107-22 - [111216] nss_ldap-234-4 -> [117936] nss_ldap-241-1 - [101793] squirrelmail-1.4.4-2 -> [117917] squirrelmail-1.4.6-0.cvs20050812.2.fc5 - - perl-Filter-1.30-7 - - perl-Filter-Simple-0.79-5 - [111400] libxslt-1.1.14-2 -> [117480] libxslt-1.1.15-1 - [111035] pam_krb5-2.1.7-3 -> [115747] pam_krb5-2.1.8-2 - [106493] file-roller-2.10.0-1 -> [117656] file-roller-2.12.0-1 - [106353] pyOpenSSL-0.6-1.p24.4 -> [117052] pyOpenSSL-0.6-1.p24.6 - [104627] rdist-6.1.5-40 -> [111944] rdist-6.1.5-41 - [110926] spamassassin-3.0.3-4.fc4 -> [118074] spamassassin-3.1.0-1.fc5 - [105950] pilot-link-0.12.0-0.pre2.0 -> [117233] pilot-link-0.12.0-0.pre4.5 - [106474] star-1.5a54-2 -> [117115] star-1.5a65-1 - [111515] net-snmp-5.2.1-12 -> [118322] net-snmp-5.2.1.2-3 - [96116] ppp-2.4.2-7 -> [115416] ppp-2.4.3-3 - [110366] vlock-1.3-19 -> [115661] vlock-1.3-20 - [110359] procps-3.2.5-6 -> [117548] procps-3.2.5-7 - [105210] psmisc-21.5-4 -> [117707] psmisc-21.6-1 - [105614] pvm-3.4.5-3_FC4 -> [111812] pvm-3.4.5-5 - [105105] bogl-0.1.18-7 -> [118318] bogl-0.1.18-10 - [108185] gnopernicus-0.10.6-1 -> [117638] gnopernicus-0.11.6-1 - [110883] qt-3.3.4-14 -> [118419] qt-3.3.5-2 - [104494] ksh-20050202-1 -> [111912] ksh-20050202-3 - [108083] quota-3.12-6 -> [116742] quota-3.12-7 - [101735] gnome-speech-0.3.6-1 -> [115904] gnome-speech-0.3.7-1 - [111387] openoffice.org-1.9.104-2 -> [118196] openoffice.org-1.9.130-1.2.fc5 - [105350] rp-pppoe-3.5-27 -> [116414] rp-pppoe-3.5-30 - [111410] rpm-4.4.1-21 -> [117156] rpm-4.4.2-4 - [110925] rsync-2.6.4-3 -> [115264] rsync-2.6.6-2 - [104630] rusers-0.17-43 -> [117620] rusers-0.17-45 - [109533] samba-3.0.14a-2 -> [117971] samba-3.0.20-2 - - sash-3.7-6 - [110268] sendmail-8.13.4-2 -> [118253] sendmail-8.13.5-1 - [111123] setup-2.5.44-1 -> [117568] setup-2.5.47-1.1 - [111408] shadow-utils-4.0.7-9 -> [117343] shadow-utils-4.0.12-2 - [106465] slang-1.4.9-17 -> [117492] slang-1.4.9-19 - [108441] slocate-2.7-22 -> [118067] slocate-2.7-27 - [105316] slrn-0.9.8.1-4 -> [114996] slrn-0.9.8.1-5 - [110665] squid-2.5.STABLE9-7 -> [117506] squid-2.5.STABLE10-4 - [106754] strace-4.5.11-1 -> [115667] strace-4.5.13-1 - [108145] sudo-1.6.8p8-1 -> [118285] sudo-1.6.8p9-4 - [93654] switchdesk-4.0.6-3 -> [114432] switchdesk-4.0.7-1 - [111041] sysklogd-1.4.1-30 -> [117045] sysklogd-1.4.1-33 - [112528] syslinux-3.08-2 -> [117044] syslinux-3.10-2 - [110362] sysreport-1.4.1-2 -> [112702] sysreport-1.4.1-4 - [105297] sysstat-5.0.5-9.fc -> [116738] sysstat-5.0.5-11.fc - [108370] tar-1.15.1-5 -> [117554] tar-1.15.1-10 - [109655] tcpdump-3.8.2-12 -> [116178] tcpdump-3.9.3-3 - [106994] tcsh-6.14-1 -> [115897] tcsh-6.14-5 - [106284] termcap-5.4-4 -> [118201] termcap-5.4-7 - [110274] tetex-3.0-4 -> [116781] tetex-3.0-6 - [106019] texinfo-4.8-4 -> [112242] texinfo-4.8-6 - [109641] jwhois-3.2.2-14 -> [115889] jwhois-3.2.3-2 - [110348] elfutils-0.108-1 -> [117517] elfutils-0.115-1 - [105286] expect-5.43.0-1 -> [111871] expect-5.43.0-2 - [105014] traceroute-1.4a12-26 -> [116290] traceroute-1.4a12-27 - [108240] subversion-1.1.4-3 -> [117737] subversion-1.2.3-3 - - schedutils-1.4.0-4 - [106314] umb-scheme-3.2-38 -> [117616] umb-scheme-3.2-39 - [104847] units-1.80-12 -> [114388] units-1.85-1 - [107560] quagga-0.98.3-2 -> [117222] quagga-0.98.5-2 - [105298] unzip-5.51-10 -> [115669] unzip-5.51-12 - [109681] util-linux-2.12p-9.3 -> [117509] util-linux-2.13-0.3.pre2 - [108550] uucp-1.07-9 -> [114161] uucp-1.07-11 - [109140] vim-6.3.071-3 -> [117700] vim-6.3.086-5 - [108347] vixie-cron-4.1-33 -> [113831] vixie-cron-4.1-36.FC5 - [106439] gtksourceview-1.2.0-1 -> [117747] gtksourceview-1.4.1-1 - [109142] vnc-4.1.1-10 -> [117547] vnc-4.1.1-17 - - w3c-libwww-5.4.0-13 - [104493] wget-1.9.1-22 -> [117731] wget-1.10.1-7 - [100923] wireless-tools-28-0.pre4.3 -> [117952] wireless-tools-28-0.pre9.5 - [104447] neon-0.24.7-6 -> [118267] neon-0.24.7-7 - [108529] desktop-printing-0.18-10 -> [116635] desktop-printing-0.19-2 - [109757] libselinux-1.23.10-2 -> [118218] libselinux-1.26-6 - [110975] xfig-3.2.4-11 -> [114406] xfig-3.2.4-13 - [106604] ttmkfdir-3.0.9-16 -> [115679] ttmkfdir-3.0.9-17 - [106293] ckermit-8.0.211-1 -> [117400] ckermit-8.0.211-3 - [111493] coreutils-5.2.1-48 -> [117826] coreutils-5.2.1-55 - [109668] gstreamer-0.8.10-1 -> [117857] gstreamer-0.8.11-1 - [110247] gstreamer-plugins-0.8.8-6 -> [117858] gstreamer-plugins-0.8.11-1 - [108260] gnome-icon-theme-2.10.1-4 -> [117725] gnome-icon-theme-2.12.0-1 - [111290] xpdf-3.00-19 -> [116734] xpdf-3.01-1 - [104699] xsane-0.95-3 -> [112799] xsane-0.95-4 - [110438] xscreensaver-4.21-4 -> [118219] xscreensaver-4.22-16 - [106575] nautilus-cd-burner-2.10.0-2 -> [117669] nautilus-cd-burner-2.12.0-1 - - hpoj-0.91-13 - [108081] ypserv-2.13-6 -> [114545] ypserv-2.13-7 - [108065] zlib-1.2.2.2-3 -> [117021] zlib-1.2.3-1 - [110759] gthumb-2.6.5-1 -> [117742] gthumb-2.6.7-1 - [110698] alsa-utils-1.0.9rc2-2 -> [116939] alsa-utils-1.0.9rf-5 - [111418] libgnomeprint22-2.10.3-1 -> [117675] libgnomeprint22-2.12.0-1 - [106542] libgnomeprintui22-2.10.1-1 -> [117676] libgnomeprintui22-2.12.0-1 - [106076] rhythmbox-0.8.8-2 -> [117443] rhythmbox-0.9.0.cvs20050902-1 - [104518] libgsf-1.11.1-2 -> [118324] libgsf-1.12.3-1 - [104645] libmng-1.0.9-1 -> [112902] libmng-1.0.9-2 - [104492] bluez-libs-2.15-1 -> [117512] bluez-libs-2.20-1 - [109626] bluez-utils-2.15-7 -> [117513] bluez-utils-2.20-1 - [109284] gnome-themes-2.10.1-2 -> [117637] gnome-themes-2.12.0-1 - [106333] lv-4.51-5 -> [113778] lv-4.51-6 - [106337] nkf-2.04-5 -> [113596] nkf-2.05-1 - - nvi-m17n-1.79-20040401.23 - [108025] ruby-1.8.2-7 -> [118404] ruby-1.8.3-1 - [109083] stunnel-4.08-2 -> [113854] stunnel-4.11-1 - [108440] 4Suite-1.0-8.b1 -> [112368] 4Suite-1.0-9.b1 - [106235] nss_db-2.2-31 -> [117271] nss_db-2.2-33 - [111212] eclipse-3.1.0_fc-0.M6.22 -> [115167] eclipse-3.1.0_fc-12 - [111394] dbus-0.33-3 -> [117773] dbus-0.50-1 - [106803] a2ps-4.13b-46 -> [111842] a2ps-4.13b-47 - [109643] libuser-0.53.7-1 -> [117997] libuser-0.54-1 - [109886] gtk-doc-1.3-2 -> [113533] gtk-doc-1.4-1 - [109144] perl-DBD-MySQL-2.9007-1 -> [117217] perl-DBD-MySQL-3.0002-1 - [111122] perl-DBD-Pg-1.41-2 -> [113244] perl-DBD-Pg-1.43-1 - [105244] kdbg-1.2.10-2 -> [114272] kdbg-2.0.0-1 - [106810] kdepim-3.4.0-4 -> [117234] kdepim-3.4.2-3 - [106772] xdelta-1.1.3-16 -> [117821] xdelta-1.1.3-17 - [107253] pkgconfig-0.15.0-6 -> [116158] pkgconfig-0.18.1-4 - [108628] kdesdk-3.4.0-3 -> [116008] kdesdk-3.4.2-1 - [106503] kde-i18n-3.4.0-1 -> [116284] kde-i18n-3.4.2-1 - [111302] hotplug-2004_09_23-7 -> [118092] hotplug-2004_09_23-10 - [112023] fedora-release-4-2 -> [113067] fedora-release-4-rawhide - [108436] xterm-200-6 -> [118082] xterm-200-9 - [106145] ppc64-utils-0.7-9 -> [118408] ppc64-utils-0.7-11 - [104559] htdig-3.2.0b6-5 -> [117484] htdig-3.2.0b6-6 - - libgal2-2.4.2-4 - [110442] gaim-1.3.0-1.fc4 -> [118167] gaim-1.5.0-5.fc5 - [108062] aspell-en-0.51-12 -> [114279] aspell-en-6.0-1 - [108357] freeradius-1.0.2-2 -> [114495] freeradius-1.0.4-2 - [110988] devhelp-0.10-1 -> [116721] devhelp-0.10-5 - [106525] kdebindings-3.4.0-1 -> [116107] kdebindings-3.4.2-1 - [110439] nautilus-2.10.0-4 -> [117668] nautilus-2.12.0-1 - [111391] boost-1.32.0-6 -> [116965] boost-1.33.0-3 - [104523] nano-1.3.5-0.20050302 -> [117495] nano-1.3.8-1 - [110577] epiphany-1.6.1-3 -> [117510] epiphany-1.8.0-1 - [111496] yum-2.3.2-7 -> [118230] yum-2.4.0-3 - [104625] GConf-1.0.9-16 -> [115534] GConf-1.0.9-17 - [105438] g-wrap-1.3.4-8 -> [113627] g-wrap-1.3.4-9 - [105029] pcre-5.0-4 -> [117019] pcre-6.3-1 - [103293] pychecker-0.8.14-3 -> [117907] pychecker-0.8.16-1 - [107295] gnome-bluetooth-0.5.1-12 -> [116637] gnome-bluetooth-0.5.1-14 - [110227] setarch-1.7-3 -> [113328] setarch-1.8-1 - [107662] kdeaddons-3.4.0-2 -> [116097] kdeaddons-3.4.2-1 - [105264] MyODBC-2.50.39-24 -> [116340] MyODBC-2.50.39-25 - [108719] nmap-3.81-3 -> [118008] nmap-3.93-1 - [107878] glib2-2.6.4-1 -> [116932] glib2-2.8.1-1 - [106280] m2crypto-0.13-2 -> [117174] m2crypto-0.15-1 - [105135] pango-1.8.1-2 -> [116700] pango-1.10.0-1 - [106004] atk-1.9.1-1 -> [117631] atk-1.10.3-1 - [110350] gtk2-2.6.7-4 -> [117200] gtk2-2.8.3-1 - [110963] logwatch-6.0.1-2 -> [118256] logwatch-6.1.2-4 - [107440] libxml2-2.6.19-1 -> [117989] libxml2-2.6.22-1 - [107238] gnome-mag-0.12.0-2 -> [116495] gnome-mag-0.12.1-2 - [109656] tzdata-2005i-2 -> [117537] tzdata-2005m-2 - [105136] ddd-3.3.10-2 -> [112263] ddd-3.3.11-1 - [111516] ethereal-0.10.11-2 -> [118418] ethereal-0.10.12-7 - [105946] mrtg-2.11.1-3 -> [117906] mrtg-2.12.2-2 - [109779] curl-7.13.1-3 -> [112559] curl-7.14.0-1 - [110585] mozilla-1.7.8-2 -> [118143] mozilla-1.7.11-5 - [104474] cdrdao-1.1.9-9 -> [114286] cdrdao-1.2.0-1 - [111152] policycoreutils-1.23.10-2 -> [118399] policycoreutils-1.27.1-1 - [108677] selinux-doc-1.19.5-1 -> [118233] selinux-doc-1.22-1 - [108338] checkpolicy-1.23.1-1 -> [118421] checkpolicy-1.27.2-1 - [107547] sound-juicer-2.10.1-1 -> [116671] sound-juicer-2.11.91-1 - [104852] mod_auth_mysql-2.6.1-4 -> [112597] mod_auth_mysql-2.9.0-1 - [106515] kdeartwork-3.4.0-1 -> [116101] kdeartwork-3.4.2-1 - [111390] setools-2.1.0-5 -> [118333] setools-2.1.2-1 - [111060] grub-0.95-13 -> [114871] grub-0.95-15 - [110652] openssh-4.0p1-3 -> [117588] openssh-4.2p1-1 - [108233] gnucash-1.8.11-3 -> [117839] gnucash-1.8.11-4 - [108697] MySQL-python-1.2.0-1 -> [115666] MySQL-python-1.2.0-2 - [106774] PyQt-3.14.1-1 -> [117928] PyQt-3.15-1 - [106773] sip-4.2.1-1 -> [117925] sip-4.3.1-1 - [109146] jpilot-0.99.8-0.pre8.4 -> [116645] jpilot-0.99.8-0.pre10.2 - [108932] lftp-3.1.3-1 -> [117026] lftp-3.3.0-1 - [107870] cdrtools-2.01.1-9 -> [117294] cdrtools-2.01.1-10 - - apel-10.6-6 - [107986] mysql-4.1.11-2 -> [116941] mysql-4.1.12-3 - [108427] tmpwatch-2.9.3-1 -> [112807] tmpwatch-2.9.4-1 - [107682] kdenetwork-3.4.0-3 -> [116293] kdenetwork-3.4.2-1 - [111395] fedora-logos-1.1.31-1 -> [117762] fedora-logos-1.1.31-2 - [100527] junit-3.8.1-3jpp_4fc -> [112932] junit-3.8.1-3jpp_5fc - [105492] xmlsec1-1.2.7-4 -> [118326] xmlsec1-1.2.9-1 - [104606] openCryptoki-2.1.5-9 -> [117535] openCryptoki-2.1.5-10 - [110363] system-config-bind-4.0.0-16_FC4 -> [116458] system-config-bind-4.0.0-30_FC5 - [110056] system-config-date-1.7.18-1 -> [115786] system-config-date-1.7.99.0-1 - [109174] system-config-keyboard-1.2.6-2 -> [118188] system-config-keyboard-1.2.6-3 - [109127] system-config-kickstart-2.5.22-2 -> [118045] system-config-kickstart-2.5.24-1 - - system-config-mouse-1.2.11-1 - [108705] system-config-netboot-0.1.14-1 -> [116895] system-config-netboot-0.1.30-1_FC5 - [110270] system-config-nfs-1.3.10-1 -> [113615] system-config-nfs-1.3.11-1 - [110775] system-config-printer-0.6.131-1 -> [117714] system-config-printer-0.6.142-1 - [110889] system-config-securitylevel-1.5.8-1 -> [116959] system-config-securitylevel-1.6.4-1 - [110271] system-config-services-0.8.25-1 -> [116537] system-config-services-0.8.26-1 - [111388] system-config-soundcard-1.2.11-5 -> [116656] system-config-soundcard-1.2.12-5 - [111429] system-config-display-1.0.29-1 -> [117812] system-config-display-1.0.31-1 - [111664] alsa-lib-1.0.9rc4-2 -> [114503] alsa-lib-1.0.9rf-3 - [105652] tcl-8.4.9-3 -> [113371] tcl-8.4.11-1 - [105658] tk-8.4.9-3 -> [113372] tk-8.4.11-1 - [109302] lvm2-2.01.08-2.1 -> [118142] lvm2-2.01.14-2 - [110929] device-mapper-1.01.02-1.0 -> [115634] device-mapper-1.01.04-1.0 - [108262] libgnomecups-0.2.0-2 -> [117671] libgnomecups-0.2.1-1 - [109132] tvtime-0.9.15-7 -> [117915] tvtime-1.0.1-1 - - hpijs-1.7.1-3 - [111138] shared-mime-info-0.16-3 -> [112690] shared-mime-info-0.16-4 - [110914] evolution-data-server-1.2.2-3 -> [118144] evolution-data-server-1.4.0-2 - [106495] gnome-keyring-0.4.2-1 -> [117659] gnome-keyring-0.4.4-1 - [111218] udev-058-1 -> [118405] udev-069-4 - - pcmcia-cs-3.2.8-4.12 - - iiimf-le-xcin-0.1.10-1 - [109118] gnome-netstatus-2.10.0-4 -> [116639] gnome-netstatus-2.11.90-2 - [110265] perl-XML-NamespaceSupport-1.08-7 -> [117865] perl-XML-NamespaceSupport-1.09-1 - [107102] memtest86+-1.55.1-1 -> [113262] memtest86+-1.60-1 - [100526] antlr-2.7.4-2jpp_1fc -> [112867] antlr-2.7.4-2jpp_2fc - [111283] jakarta-commons-beanutils-1.7.0-1jpp_4fc -> [114381] jakarta-commons-beanutils-1.7.0-2jpp_2fc - [111285] jakarta-commons-collections-3.1-1jpp_4fc -> [114380] jakarta-commons-collections-3.1-2jpp_2fc - [101451] jakarta-commons-dbcp-1.2.1-3jpp_1fc -> [112880] jakarta-commons-dbcp-1.2.1-3jpp_2fc - [111286] jakarta-commons-digester-1.6-2jpp_4fc -> [114394] jakarta-commons-digester-1.6-2jpp_6fc - [111288] jakarta-commons-logging-1.0.4-2jpp_4fc -> [114180] jakarta-commons-logging-1.0.4-2jpp_6fc - [111289] jakarta-commons-modeler-1.1-3jpp_4fc -> [114487] jakarta-commons-modeler-1.1-4jpp_2fc - [101447] jakarta-commons-pool-1.2-2jpp_1fc -> [112885] jakarta-commons-pool-1.2-2jpp_2fc - [101435] jakarta-commons-validator-1.1.3-1jpp_1fc -> [112887] jakarta-commons-validator-1.1.3-1jpp_2fc - [100530] jdepend-2.6-2jpp_3fc -> [112928] jdepend-2.6-2jpp_4fc - [111423] log4j-1.2.8-7jpp_4fc -> [112933] log4j-1.2.8-7jpp_5fc - [96312] oro-2.0.8-1jpp_2fc -> [113162] oro-2.0.8-1jpp_3fc - [109898] regexp-1.3-1jpp_5fc -> [114182] regexp-1.3-2jpp_3fc - [100606] xalan-j2-2.6.0-2jpp_1fc -> [114410] xalan-j2-2.6.0-3jpp_3fc - [109899] xerces-j2-2.6.2-4jpp_5fc -> [114312] xerces-j2-2.6.2-5jpp_2fc - [109900] xml-commons-1.0-0.b2.6jpp_12fc -> [114196] xml-commons-1.0-0.b2.7jpp_3fc - [96303] xml-commons-resolver-1.1-1jpp_4fc -> [113163] xml-commons-resolver-1.1-1jpp_5fc - [101437] jakarta-commons-lang-2.0-2jpp_1fc -> [112883] jakarta-commons-lang-2.0-2jpp_2fc - [96300] java_cup-0.10-0.k.1jpp_2fc -> [114395] java_cup-0.10-0.k.1jpp_5fc - [100540] avalon-logkit-1.2-2jpp_4fc -> [113428] avalon-logkit-1.2-3jpp_1fc - [101462] cryptix-3.2.0-4jpp_1fc -> [112869] cryptix-3.2.0-4jpp_2fc - [101463] cryptix-asn1-20011119-4jpp_1fc -> [112873] cryptix-asn1-20011119-4jpp_2fc - [101464] gnu.getopt-1.0.9-4jpp_1fc -> [112875] gnu.getopt-1.0.9-4jpp_2fc - [110589] xorg-x11-6.8.2-31 -> [115364] xorg-x11-6.8.2-45 - [108218] aspell-is-0.51.1-1 -> [114361] aspell-is-0.51.1-2 - [106231] pyparted-1.6.9-3 -> [117327] pyparted-1.6.9-4 - [110354] mod_auth_kerb-5.0-6 -> [118413] mod_auth_kerb-5.0-7 - [106186] iprutils-2.0.13.7-2 -> [115548] iprutils-2.0.15.3-1 - [110365] tomcat5-5.0.30-5jpp_6fc -> [118323] tomcat5-5.0.30-8jpp_3fc - [110776] xchat-2.4.3-3 -> [118268] xchat-2.4.5-1 - [111287] jakarta-commons-el-1.0-2jpp_3fc -> [114396] jakarta-commons-el-1.0-4jpp_2fc - - GFS-6.1-0.pre22.6 - [107882] k3b-0.11.23-3 -> [114095] k3b-0.12.2-1 - [111251] hal-0.5.2-2 -> [117285] hal-0.5.4-3 - [107343] gnome-volume-manager-1.3.1-1 -> [117761] gnome-volume-manager-1.5.1-1 - [106242] pam_passwdqc-0.7.6-1 -> [118214] pam_passwdqc-1.0.2-1 - [106603] libidn-0.5.15-1 -> [118283] libidn-0.5.19-1 - [110913] evolution-connector-2.2.2-5 -> [118165] evolution-connector-2.4.0-2 - [111158] selinux-policy-targeted-1.23.16-6 -> [118397] selinux-policy-targeted-1.27.1-4 - [111157] selinux-policy-strict-1.23.16-6 -> [118396] selinux-policy-strict-1.27.1-4 - - ecj-3.1-0.M4.9 - [104920] diskdumputils-1.0.1-6 -> [116910] diskdumputils-1.1.9-2 - [108918] module-init-tools-3.1-3 -> [117811] module-init-tools-3.2-0.pre7.3 - [104418] numactl-0.6.4-1.18 -> [113672] numactl-0.6.4-1.23 - [104522] libwmf-0.2.8.3-8 -> [115159] libwmf-0.2.8.4-1 - [107934] authd-1.4.3-4.devel -> [113028] authd-1.4.3-5.devel - [112018] gamin-0.1.0-1.1 -> [118342] gamin-0.1.6-2 - [111127] vino-2.10.0-4 -> [117670] vino-2.12.0-1 - [109620] HelixPlayer-1.0.4-4 -> [116508] HelixPlayer-1.0.5-2 - [110936] totem-1.0.2-1 -> [116504] totem-1.1.4-1 - - gnbd-kernel-2.6.11.2-20050420.133124.FC4.35 - [108039] aspell-de-0.50-10 -> [114277] aspell-de-0.50-11 - [109112] eclipse-changelog-2.0.1_fc-21 -> [114192] eclipse-changelog-2.0.1_fc-22 - [111405] eclipse-cdt-3.0.0_fc-0.M6.7 -> [116981] eclipse-cdt-3.0.0_fc-1 - - iiimf-le-chinput-0.3-19 - [106138] synaptics-0.14.0-2 -> [115769] synaptics-0.14.3-3 - [110766] libsepol-1.5.9-2 -> [118331] libsepol-1.9.4-1 - [108031] aspell-af-0.50-2 -> [114179] aspell-af-0.50-4 - [103800] aspell-bg-0.50-9 -> [114176] aspell-bg-0.50-11 - [108032] aspell-br-0.50-2 -> [114181] aspell-br-0.50-4 - [108037] aspell-cy-0.50-2 -> [114274] aspell-cy-0.50-4 - [108040] aspell-el-0.50-2 -> [114278] aspell-el-0.50-4 - [108043] aspell-fo-0.51-2 -> [114281] aspell-fo-0.51-4 - [108045] aspell-ga-0.50-2 -> [114288] aspell-ga-0.50-4 - [108047] aspell-gd-0.50-2 -> [114357] aspell-gd-0.50-4 - [108048] aspell-gl-0.50-2 -> [114358] aspell-gl-0.50-4 - [108049] aspell-hr-0.51-2 -> [114359] aspell-hr-0.51-4 - [108050] aspell-id-0.50.1-2 -> [114360] aspell-id-0.50.1-4 - [105301] busybox-1.00-4 -> [111857] busybox-1.00-5 - [104570] sysfsutils-1.2.0-4 -> [113812] sysfsutils-1.3.0-1 - - rgmanager-1.9.31-3 - [109173] openswan-2.3.1-2 -> [118022] openswan-2.4.0-1 - [110687] NetworkManager-0.4-15.cvs20050404 -> [118005] NetworkManager-0.4.1-2.cvs20050912 - [112106] java-1.4.2-gcj-compat-1.4.2.0-40jpp_31rh -> [118416] java-1.4.2-gcj-compat-1.4.2.0-40jpp_51rh - [106674] gnome-keyring-manager-0.0.4-3 -> [117662] gnome-keyring-manager-2.12.0-1 - [105646] evolution-webcal-2.2.0-1 -> [118166] evolution-webcal-2.4.0.1-2 - [106722] krb5-auth-dialog-0.2-5 -> [116572] krb5-auth-dialog-0.2-6 - [107396] dhcpv6-0.10-13 -> [116466] dhcpv6-0.10-14 - [106006] dasher-3.2.15-1 -> [117634] dasher-3.2.18-1 - [111497] firefox-1.0.4-4 -> [118182] firefox-1.5-0.5.0.beta1 - [110588] thunderbird-1.0.2-6 -> [116773] thunderbird-1.0.6-5 - - valgrind-callgrind-0.9.11-1 - [106256] pam_ccreds-1-6 -> [112255] pam_ccreds-1-7 - [100966] createrepo-0.4.2-2 -> [114098] createrepo-0.4.3-1 - [111205] audit-0.8.2-1 -> [116925] audit-1.0.3-1 - [109751] kdewebdev-3.4.0-3 -> [116306] kdewebdev-3.4.2-1 - [98989] slib-3a1-2 -> [117769] slib-3a1-5 - [105026] webalizer-2.01_10-28 -> [118412] webalizer-2.01_10-29 - [108536] ipv6calc-0.48-5 -> [118194] ipv6calc-0.50-1 - [100524] classpathx-mail-1.0-3jpp_1fc -> [111780] classpathx-mail-1.0-4jpp_2fc - [111648] gnu-crypto-2.0.1-1jpp_5fc -> [114171] gnu-crypto-2.0.1-1jpp_7fc - [107249] OpenIPMI-1.4.11-5 -> [117704] OpenIPMI-1.4.14-9 - [100864] zsh-4.2.1-2 -> [113141] zsh-4.2.5-1 - [104688] sane-backends-1.0.15-9 -> [116782] sane-backends-1.0.16-1 - - lvm2-cluster-2.01.09-3.0 - - struts11-1.1-1jpp_7fc - [107376] gkrellm-2.2.4-4 -> [117540] gkrellm-2.2.7-3 - [108839] cpufreq-utils-0.2-1.1.14 -> [115418] cpufreq-utils-0.3-1.1.16 - [108362] dmidecode-2.6-1.14 -> [117909] dmidecode-2.7-1.15 - [109300] hardlink-1.0-1.13 -> [117099] hardlink-1.0-1.14 - [111037] readahead-1.1-1.14 -> [115793] readahead-1.1-1.17 - [104427] smartmontools-5.33-1.5 -> [115762] smartmontools-5.33-1.7 - [108364] x86info-1.13-1.10 -> [117440] x86info-1.15-1.13 - - python-twisted-1.3.0-4 - [111505] evince-0.3.1-1 -> [118030] evince-0.4.0-2 - [109178] gnome-doc-utils-0.2.0-2 -> [117722] gnome-doc-utils-0.4.0-1 - [108845] gnome-menus-2.10.1-3 -> [117531] gnome-menus-2.12.0-1 - [107103] gnome-python2-extras-2.10.0-2.1 -> [116816] gnome-python2-extras-2.11.4-9 - [109933] gjdoc-0.7.4-5 -> [114163] gjdoc-0.7.5-4 - [109753] kdelibs-3.4.0-6 -> [115465] kdelibs-3.4.2-1 - [106258] kdeaccessibility-3.4.0-1 -> [116016] kdeaccessibility-3.4.2-1 - [108603] fonts-korean-1.0.11-4 -> [116512] fonts-korean-1.0.11-6 - [108601] fonts-japanese-0.20050222-3 -> [116488] fonts-japanese-0.20050222-7 - [108604] fonts-chinese-2.15-2 -> [117399] fonts-chinese-3.00.pre2-1 - [111507] poppler-0.3.2-1 -> [117476] poppler-0.4.2-1 - [111030] eclipse-bugzilla-0.1.0_fc-16 -> [114650] eclipse-bugzilla-0.1.1_fc-5 - [109095] eclipse-pydev-0.9.3_fc-7 -> [115587] eclipse-pydev-0.9.3_fc-11 - [108005] sqlite-3.1.2-3 -> [117898] sqlite-3.2.5-1 - [105636] python-urlgrabber-2.9.6-1 -> [118139] python-urlgrabber-2.9.6-3 - [107161] cryptsetup-luks-1.0-1 -> [116857] cryptsetup-luks-1.0.1-2 - [108817] jsch-0.1.18-1jpp_1fc -> [114185] jsch-0.1.18-1jpp_2fc - [109747] latex2html-2002.2.1-3 -> [112874] latex2html-2002.2.1-4 - [110960] openssl-0.9.7f-7 -> [116949] openssl-0.9.7f-9 - - iiimf-12.2-4 - [108246] kdevelop-3.2.0-2 -> [116301] kdevelop-3.2.2-1 - - Canna-3.7p3-13 - - VFlib2-2.25.6-28 - [108287] perl-Archive-Zip-1.14-1 -> [117218] perl-Archive-Zip-1.16-1 - [108275] pm-utils-0.01-1 -> [116385] pm-utils-0.04-1 - [109632] foomatic-3.0.2-19 -> [118014] foomatic-3.0.2-28 - [108982] perl-DateManip-5.42a-4 -> [117863] perl-DateManip-5.44-1 - - perl-libxml-enno-1.02-31 - [104653] s390utils-1.3.2-4 -> [112864] s390utils-1.3.2-5 - [107373] m4-1.4.3-1 -> [118239] m4-1.4.3-2 - [110355] ORBit2-2.12.1-3 -> [117666] ORBit2-2.12.4-1 - [110242] GConf2-2.10.0-4 -> [117717] GConf2-2.12.0-1 - [106017] libgnomecanvas-2.10.0-1 -> [117642] libgnomecanvas-2.12.0-1 - [102603] libbonobo-2.8.1-1 -> [117820] libbonobo-2.10.1-2 - [109591] gnome-vfs2-2.10.0-5 -> [117664] gnome-vfs2-2.12.0-1 - [109285] libgnome-2.10.0-3 -> [117751] libgnome-2.12.0-1 - [109171] libbonoboui-2.8.1-4 -> [117749] libbonoboui-2.10.1-1 - [104650] librsvg2-2.9.5-2 -> [117304] librsvg2-2.11.1-1 - [107485] eel2-2.10.0-2 -> [117651] eel2-2.12.0-1 - [106316] tn5250-0.16.5-5 -> [113112] tn5250-0.16.5-6 - [106143] yaboot-1.3.12-9 -> [118141] yaboot-1.3.13-0.16 - [107969] libgnomeui-2.10.0-1 -> [117980] libgnomeui-2.12.0-2 - [104629] libglade2-2.5.1-2 -> [116545] libglade2-2.5.1-3 - [105166] libIDL-0.8.5-2 -> [117667] libIDL-0.8.6-1 - [110521] usermode-1.80-1 -> [116503] usermode-1.81-1 - [102961] docbook-style-xsl-1.68.1-1 -> [116354] docbook-style-xsl-1.69.1-1 - [104584] intltool-0.33-2 -> [115810] intltool-0.34.1-1 - [110237] evolution-2.2.2-5 -> [118148] evolution-2.4.0-2 - [104652] xmltex-20020625-5 -> [118338] xmltex-20020625-6 - [105333] pygtk2-2.6.0-2 -> [117772] pygtk2-2.8.0-1 - [105908] gnome-python2-2.10.0-1 -> [116511] gnome-python2-2.11.3-2 - [104649] libpng10-1.0.18-2 -> [115463] libpng10-1.0.18-3 - [96234] aspell-pt-0.50-9 -> [114369] aspell-pt-0.50-10 - [106303] stardict-2.4.4-3 -> [118242] stardict-2.4.5-1 - [108452] glibc-kernheaders-2.4-9.1.94 -> [111898] glibc-kernheaders-2.4-9.1.95 - [105250] wordtrans-1.1pre13-10 -> [115775] wordtrans-1.1pre13-11 - [104417] microcode_ctl-1.11-1.21 -> [118068] microcode_ctl-1.12-1.23 - [109638] gnome-pilot-2.0.13-2 -> [116547] gnome-pilot-2.0.13-7.fc5 - [106005] at-spi-1.6.3-1 -> [117632] at-spi-1.6.6-1 - [110915] gail-1.8.3-2 -> [117635] gail-1.8.5-1 - [106768] vsftpd-2.0.3-1 -> [117823] vsftpd-2.0.3-10 - [108150] authconfig-4.6.12-1 -> [117485] authconfig-5.0.1-1 - [104665] linuxdoc-tools-0.9.21-5 -> [113333] linuxdoc-tools-0.9.21-6 - [111809] gphoto2-2.1.5-10 -> [115052] gphoto2-2.1.6-2 - [104555] xmlto-0.0.18-6 -> [116003] xmlto-0.0.18-9 - - perl-Time-HiRes-1.65-1 - [108948] db4-4.3.27-3 -> [118387] db4-4.3.28-2 - [107533] openmotif-2.2.3-10 -> [117413] openmotif-2.2.3-11 - [101890] docbook-dtds-1.0-26 -> [111825] docbook-dtds-1.0-27 - [111495] firstboot-1.3.42-1 -> [118187] firstboot-1.3.47-2 - [107310] cups-1.1.23-15 -> [117439] cups-1.1.23-17 - [108639] postfix-2.2.2-2 -> [117702] postfix-2.2.5-1 - [110444] booty-0.53-1 -> [118032] booty-0.57-1 - [106326] cdicconf-0.2-11 -> [113538] cdicconf-0.2-12 - [110352] libwnck-2.10.0-3 -> [117752] libwnck-2.12.0-1 - [110575] crypto-utils-2.2-5 -> [111863] crypto-utils-2.2-6 - [107303] perl-Compress-Zlib-1.34-2 -> [117468] perl-Compress-Zlib-1.37-1.fc5 - [109590] libgtop2-2.10.1-1 -> [117665] libgtop2-2.12.0-1 - [110990] yelp-2.10.0-1 -> [117757] yelp-2.12.0-1 - [110693] hwdata-0.158-1 -> [117804] hwdata-0.169-1 - [106407] rhnlib-1.8-6.p24.1 -> [116200] rhnlib-1.8-6.p24.11 - [106361] arts-1.4.0-1 -> [115461] arts-1.4.2-1 - [107873] dia-0.94-11 -> [116485] dia-0.94-13 - [106665] gnome-system-monitor-2.10.0-2 -> [117663] gnome-system-monitor-2.12.0-1 - [106473] pwlib-1.8.4-1 -> [117530] pwlib-1.8.7-1 - [106475] openh323-1.15.3-1 -> [117538] openh323-1.15.6-1 - [106477] gnomemeeting-1.2.1-1 -> [118169] gnomemeeting-1.2.2-2 - [93048] fonts-KOI8-R-1.0-7 -> [113604] fonts-KOI8-R-1.0-8 - [104596] patchutils-0.2.30-4 -> [114399] patchutils-0.2.31-2 - [107936] man-1.5p-4 -> [111925] man-1.5p-6 - [110750] elinks-0.10.3-3 -> [112404] elinks-0.10.3-3.1 - [107263] netatalk-2.0.2-3 -> [114554] netatalk-2.0.3-2 - [107736] netdump-0.7.7-6 -> [115481] netdump-0.7.10-4 - [111279] ant-1.6.2-3jpp_8fc -> [115662] ant-1.6.2-3jpp_14fc - [109158] openmotif21-2.1.30-14 -> [116779] openmotif21-2.1.30-17.1 - [109640] gnutls-1.0.25-1 -> [115978] gnutls-1.2.6-1 - [104487] privoxy-3.0.3-7 -> [117709] privoxy-3.0.3-9 - [107117] eog-2.10.0-1 -> [117654] eog-2.12.0-1 - [109172] gconf-editor-2.10.0-5 -> [117718] gconf-editor-2.12.0-1 - [111105] gtk2-engines-2.6.3-2 -> [117640] gtk2-engines-2.6.5-1 - [111267] gnome-desktop-2.10.0-5 -> [117723] gnome-desktop-2.12.0-1 - [110510] gnome-panel-2.10.1-10 -> [118149] gnome-panel-2.12.0-2 - [108570] gnome-session-2.10.0-2 -> [117729] gnome-session-2.12.0-1 - [109748] gnome-terminal-2.10.0-2 -> [117730] gnome-terminal-2.12.0-1 - [107500] metacity-2.10.0-1 -> [117759] metacity-2.12.0-1 - [107193] valgrind-2.4.0-2 -> [117903] valgrind-3.0.1-1 - [111389] vte-0.11.13-2.fc4 -> [117756] vte-0.11.15-1.fc5 - [105809] ghostscript-7.07-40 -> [116480] ghostscript-8.15-0.rc4.3 - [108033] file-4.13-4 -> [118257] file-4.15-3 - [108940] mgetty-1.1.33-1 -> [115032] mgetty-1.1.33-3_FC5 - [111301] xen-2-20050522 -> [118168] xen-3.0-0.20050912.fc5.1 - [106289] libraw1394-1.1.0-3 -> [114765] libraw1394-1.2.0-1.fc5 - [108526] mod_perl-2.0.0-0.rc5.3 -> [112776] mod_perl-2.0.1-1.fc5 - [103976] radvd-0.7.3-1_FC4 -> [114404] radvd-0.8-2.FC5 - [111033] ncpfs-2.2.4-8 -> [115462] ncpfs-2.2.4-9 - [106079] prelink-0.3.4-3 -> [117615] prelink-0.3.6-1 - [110767] netpbm-10.27-3 -> [116518] netpbm-10.29-1 -
- ????????????????????? - ???????????????????????? &FC;??? - scim-anthy-0.6.1-1.fc5 - struts-1.2.4-2jpp_3fc - jonas-4.3.3-1jpp_10fc - nspr-4.6-4 - scim-1.4.2-3 - anthy-6829-3 - system-config-cluster-0.9.69-1.0 - axis-1.2.1-1jpp_1fc - bsf-2.3.0-6jpp_2fc - bsh-1.3.0-5jpp_1fc - concurrent-1.3.2-2jpp_1fc - dtdparser-1.21-2jpp_1fc - jakarta-commons-discovery-0.3-1jpp_1fc - jdom-1.0-1jpp_2fc - wsdl4j-1.5.1-1jpp_1fc - javacc-3.2-1jpp_3fc - jakarta-commons-httpclient-3.0-0.rc2.0jpp_1fc - castor-0.9.5-1jpp_1fc - adaptx-0.9.6-1jpp_1fc - amtu-1.0.2-1 - xdoclet-1.2.2-2jpp_1fc - xjavadoc-1.1-1jpp_1fc - jgroups-2.2.6-1jpp_1fc - hsqldb-1.80.1-1jpp_1fc - jonathan-core-4.1-1jpp_4fc - jonathan-jeremie-4.2-1jpp_4fc - jrefactory-2.8.9-3jpp_1fc - mockobjects-0.09-12jpp_2fc - monolog-1.8.6-1jpp_5fc - oldkilim-1.1.3-2jpp_3fc - p6spy-1.3-2jpp_3fc - fractal-2.2-2jpp_1fc - velocity-1.4-3jpp_1fc - werken.xpath-0.9.4-0.beta.9jpp_1fc - gnu.regexp-1.1.4-7jpp_1fc - nanoxml-2.2.3-3jpp_3fc - asm-1.5.3-1jpp_1fc - cairo-1.0.0-1 - objectweb-anttask-1.2-1jpp_1fc - objectweb-deploysched-0.2-1jpp_1fc - carol-1.8.9.3-1jpp_5fc - jacorb-2.2-3jpp_3fc - jakarta-commons-cli-1.0-6jpp_1fc - tanukiwrapper-3.1.1-4jpp_3fc - tog-pegasus-2.4.1-4.FC5 - joram-4.1.5-1jpp_5fc - jotm-2.0.5-1jpp_3fc - lucene-1.4.3-1jpp_1fc - geronimo-specs-1.0-0.M2.2jpp_4fc - jakarta-commons-codec-1.3-2jpp_1fc - howl-logger-0.1.8-1jpp_3fc - dhcdbd-1.8-1 - aspell-ru-0.99f7-2 - hplip-0.9.5-3 - gpart-0.1h-1 - iso-codes-0.47-1 - gif89encoder-0.90-0.b.1jpp_1fc - jonathan-rmi-3.1-5 - pup-0.0.2-1 - jorm-2.4.3-1jpp_2fc - jorm-rdb-adapter-2.6-1jpp_1fc - medor-1.4.4-1jpp_1fc - medor-expression-1.4.2-1jpp_1fc - perseus-cache-1.3.4-1jpp_1fc - perseus-concurrency-1.4-1jpp_1fc - perseus-dependency-1.4-1jpp_1fc - perseus-distribution-1.3.2-1jpp_1fc - perseus-fos-1.3.1-1jpp_1fc - perseus-persistence-1.3.4-1jpp_1fc - perseus-pool-1.3.3-1jpp_1fc - systemtap-0.4.1-2 - pcmciautils-007-1 - scim-tables-0.5.3-4 - libsemanage-1.3.2-1 - scim-hangul-0.2.0-5.fc5 - scim-pinyin-0.5.91-1 - scim-chewing-0.2.1-1 - scim-qtimm-0.9.4-1 - libchewing-0.2.7-1 - kasumi-0.9-3.fc5 - kexec-tools-1.101-2 - libsetrans-0.1.7-1 - icu-3.4-4 - libiec61883-1.0.0-8.fc5 -
-
- ????????????????????? - ?????????????????????????????? - ccs-0.25-0.17 - cman-1.0-0.pre33.15 - cman-kernel-2.6.11.5-20050601.152643.FC4.2 - dlm-1.0-0.pre21.10 - dlm-kernel-2.6.11.5-20050601.152643.FC4.2 - fence-1.27-16 - GFS-kernel-2.6.11.8-20050601.152643.FC4.2 - gnbd-1.0-0.pre14.6 - gulm-1.0-0.pre30.1 - iddev-1.9-21 - magma-1.0-0.pre21.7 - magma-plugins-1.0-0.pre18.3 -
-
-
- ?????? - system-config-monitor ???????????????????????????????????? synaptic ?????????????????????????????????????????????????????????????????????????????? - ??????????????????????????????????????????????????????????????????????????????????????? -???????????????gnome-screensaver ??????????????? xscreensaver ???????????? - +
+ Packages Added + These packages have been added to &FC; for this release notes. + scim-anthy-0.6.1-1.fc5 + struts-1.2.4-2jpp_3fc + jonas-4.3.3-1jpp_10fc + nspr-4.6-4 + scim-1.4.2-3 + anthy-6829-3 + system-config-cluster-0.9.69-1.0 + axis-1.2.1-1jpp_1fc + bsf-2.3.0-6jpp_2fc + bsh-1.3.0-5jpp_1fc + concurrent-1.3.2-2jpp_1fc + dtdparser-1.21-2jpp_1fc + jakarta-commons-discovery-0.3-1jpp_1fc + jdom-1.0-1jpp_2fc + wsdl4j-1.5.1-1jpp_1fc + javacc-3.2-1jpp_3fc + jakarta-commons-httpclient-3.0-0.rc2.0jpp_1fc + castor-0.9.5-1jpp_1fc + adaptx-0.9.6-1jpp_1fc + amtu-1.0.2-1 + xdoclet-1.2.2-2jpp_1fc + xjavadoc-1.1-1jpp_1fc + jgroups-2.2.6-1jpp_1fc + hsqldb-1.80.1-1jpp_1fc + jonathan-core-4.1-1jpp_4fc + jonathan-jeremie-4.2-1jpp_4fc + jrefactory-2.8.9-3jpp_1fc + mockobjects-0.09-12jpp_2fc + monolog-1.8.6-1jpp_5fc + oldkilim-1.1.3-2jpp_3fc + p6spy-1.3-2jpp_3fc + fractal-2.2-2jpp_1fc + velocity-1.4-3jpp_1fc + werken.xpath-0.9.4-0.beta.9jpp_1fc + gnu.regexp-1.1.4-7jpp_1fc + nanoxml-2.2.3-3jpp_3fc + asm-1.5.3-1jpp_1fc + cairo-1.0.0-1 + objectweb-anttask-1.2-1jpp_1fc + objectweb-deploysched-0.2-1jpp_1fc + carol-1.8.9.3-1jpp_5fc + jacorb-2.2-3jpp_3fc + jakarta-commons-cli-1.0-6jpp_1fc + tanukiwrapper-3.1.1-4jpp_3fc + tog-pegasus-2.4.1-4.FC5 + joram-4.1.5-1jpp_5fc + jotm-2.0.5-1jpp_3fc + lucene-1.4.3-1jpp_1fc + geronimo-specs-1.0-0.M2.2jpp_4fc + jakarta-commons-codec-1.3-2jpp_1fc + howl-logger-0.1.8-1jpp_3fc + dhcdbd-1.8-1 + aspell-ru-0.99f7-2 + hplip-0.9.5-3 + gpart-0.1h-1 + iso-codes-0.47-1 + gif89encoder-0.90-0.b.1jpp_1fc + jonathan-rmi-3.1-5 + pup-0.0.2-1 + jorm-2.4.3-1jpp_2fc + jorm-rdb-adapter-2.6-1jpp_1fc + medor-1.4.4-1jpp_1fc + medor-expression-1.4.2-1jpp_1fc + perseus-cache-1.3.4-1jpp_1fc + perseus-concurrency-1.4-1jpp_1fc + perseus-dependency-1.4-1jpp_1fc + perseus-distribution-1.3.2-1jpp_1fc + perseus-fos-1.3.1-1jpp_1fc + perseus-persistence-1.3.4-1jpp_1fc + perseus-pool-1.3.3-1jpp_1fc + systemtap-0.4.1-2 + pcmciautils-007-1 + scim-tables-0.5.3-4 + libsemanage-1.3.2-1 + scim-hangul-0.2.0-5.fc5 + scim-pinyin-0.5.91-1 + scim-chewing-0.2.1-1 + scim-qtimm-0.9.4-1 + libchewing-0.2.7-1 + kasumi-0.9-3.fc5 + kexec-tools-1.101-2 + libsetrans-0.1.7-1 + icu-3.4-4 + libiec61883-1.0.0-8.fc5 +
+
+ Packages Removed + These packages have been removed: + ccs-0.25-0.17 + cman-1.0-0.pre33.15 + cman-kernel-2.6.11.5-20050601.152643.FC4.2 + dlm-1.0-0.pre21.10 + dlm-kernel-2.6.11.5-20050601.152643.FC4.2 + fence-1.27-16 + GFS-kernel-2.6.11.8-20050601.152643.FC4.2 + gnbd-1.0-0.pre14.6 + gulm-1.0-0.pre30.1 + iddev-1.9-21 + magma-1.0-0.pre21.7 + magma-plugins-1.0-0.pre18.3
-
- Index: package-notes-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/package-notes-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package-notes-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ package-notes-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,6 +1,5 @@ - - -
??????????????????????????????????????? &DISTRO; &DISTROVER; ?????????????????????????????????????????????????????????????????????????????? Anaconda ???????????????????????????????????????????????????????????????????????? &DISTRO; &DISTROVER; ?????????
????????????????????????????????????????????????????????????
&FEX; ??????&FEX; ???????????? &FP; ???????????????????????????????????????????????????????????????????????????????????? &FC; ?????????&FEX; ????????? &FC; &LOCALVER; ???????????????????????????????????????????????????????????????????????? &FEX; ????????????http://fedoraproject.org/wiki/Extras???????????? &FEX; ????????????????????????????????? yum ????????? -yum install <packagename> -?????????<packagename> ?????????????????????????????????????????????????????????????????? abiword ???????????????????????? yum install abiword ?????????????????????????????????????????????
Audit ???????????? <command>auditd</command> ??????????????????Audit ???????????? auditd ????????????????????? auditd ????????????????????? audit ??????????????? /var/log/audit/audit.log ?????????????????????????????? /etc/auditd.conf ????????????&SEL; ??? AVC ???????????? audit ????????????????????????????????? /var/log/audit/audit.log ????????? autitd ??????????????????????????? audit ??????????????? syslog?????????????????????????????? /var/log/messages ????????????????????? dmesg ???????????????Audit ??????????????????????????? PAM ?????????????????????????????????????????????????????????????????????????????? audit ???????????????????????????????????????????????????????????? audit=1 ??????????????????????????????????????????????????????????????????????????? -auditctl -e 1 -
LinuxThreads ??? NPTL????????????????????? LinuxThreads ???????????????????????? &FC; &LOCALVER; ????????????????????????????????????????????? NPTL ????????????????????????????????????????????? &RHL; 9 ????????????????????????????????? LinuxThreads?????????????????????????????????NPTL ??????????????????????????????????????????????????? (?????? -fexception ????????????????????? C ?????????)????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ?????????????????? lib{,64} ??????????????? lib64???????????????????????? DSO ???????????? lib64/ ?????????????????? &FC; &LOCALVER; ??????????????????????????? LinuxThreads ????????????????????????????????? linuxthreads-devel ?????????????????? - -??????????????????????????????????????????????????????????????????????????????????????? glibc ?????????????????? libpgthread DSH?????????????????????????????????????????????????????? -LD_LIBRARY_PATH=/lib{,64}/obsolete/linuxthreads -??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DT_RPATH (??????????????? LD_LIBRARY_PATH ??????)???????????????????????????????????? LinuxThreads ?????????????????????????????????????????????????????????FC5 ???????????? LinuxThreads ?????????????????????????????????????????????????????? NPTL??????????????? NPTL ???????????????????????????
?????? <filename>slocate</filename> ??????????????? locate ???????????????????????????????????????????????????????????? locate ?????????????????? /etc/updatedb.conf ?????? DAILY_UPDATE ????????? ???
<filename>openssh</filename> ??????????????????! ???&FC; &LOCALVER; ?????? OpenSSH ?????? OpenSSH 3.9?????????????????????????????? ~/.ssh/config ???????????????????????????????????????????????????????????????????????????????????????ssh ?????????????????? ~/.ssh/config ??????????????? ~/ ????????????????????????????????? 600??? +-->
+ ??????????????? + ???????????????????????? &DISTRO; &DISTROVER; ?????????????????????????????????????????????????????????????????????????????? Anaconda ?????????????????????????????? +
+ ???????????? + ???????????????????????????????????????????????? +
+ &FEX; ?????? + &FEX; ???????????? &FP; ???????????????????????????????????????????????????????????????????????????????????? &FC; ?????????&FEX; ????????? &FC; &LOCALVER; ??????????????????????????????????????? + ????????????????????????????????? &FEX; ???????????? + + http://fedoraproject.org/wiki/Extras + + ???????????? &FEX; ????????????????????????????????? yum ????????? + + yum install <packagename> + + ?????????<packagename> ?????????????????????????????????????????????????????????????????? abiword ???????????????????????? yum install abiword ????????????????????????????????????????????? +
+
+ Audit ???????????? <command>auditd</command> ?????????????????? + Audit ???????????? auditd ????????????????????? auditd ????????????????????? audit ??????????????? /var/log/audit/audit.log ?????????????????????????????? /etc/auditd.conf ???????????? + &SEL; ??? AVC ???????????? audit ????????????????????????????????? /var/log/audit/audit.log ?????? + ??? autitd ??????????????????????????? audit ??????????????? syslog?????????????????????????????? /var/log/messages ????????????????????? dmesg ??????????????? + Audit ??????????????????????????? PAM ?????????????????????????????????????????????????????????????????????????????? audit ????????? + ??????????????????????????????????????????????????? audit=1 ??????????????????????????????????????????????????????????????????????????? + + auditctl -e 1 + +
+
+ ?????? <filename>slocate</filename> ????????? + ?????? locate ???????????????????????????????????????????????????????????? locate ?????????????????? /etc/updatedb.conf ?????? DAILY_UPDATE ????????? ??? +
+
+ + <filename>openssh</filename> ????????????????????? + &FC; &LOCALVER; ?????? OpenSSH ?????? OpenSSH 3.9?????????????????????????????? ~/.ssh/config ???????????????????????????????????????????????????????????????????????????????????????ssh ???????????? + ?????? ~/.ssh/config ??????????????? ~/ ????????????????????????????????? 600??? + ls -l ~/.ssh/config -rw------- 1 username username 400 May 5 18:44 /home/username/.ssh/config -?????? ~/ ?????????????????????????????????????????????????????????????????? /home/username/????????????????????????????????????OpenSSH ??????????????????????????? X11 ?????????????????? X11 ????????????????????? ??? ?????????????????? ~/.ssh/config ????????? ??????????????? ????????????ssh ???????????????????????????????????? OpenSSH 3.8 ???????????????X11 ???????????????????????????????????????????????????????????????????????????X11 ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ?????????????????? ~/.ssh/config ????????! ? ?????????
Perl ?????????????????????????????? perl-5.8.0, perl-5.8.1 ??? perl-5.8.2 ?????????????????????????????????????????????????????????????????? perl ???????????????????????? perl ???????????????????????? &FC; &LOCALVER; ????????? perl-5.8.6 ???????????????
&SERVER-TOOLS; &JAVA-PACKAGE;
????????????????????? &DISTRO; ????????????????????????????????????
yumyum ???????????? sqllite ?????????????????????????????????????????????????????? Fedora Extras ?????????
&KERNEL; &SECURITY;
&DEVELOPMENT-TOOLS; &I18N; &PRINTING; &MULTIMEDIA; &ENTERTAINMENT; &WEB-SERVERS; &SAMBA; &XORG; &ENTERTAINMENT;
- + + ?????? ~/ ?????????????????????????????????????????????????????????????????? /home/username/??? + ?????????????????????????????????OpenSSH ??????????????????????????? X11 ?????????????????? X11 ????????????????????? ??? ?????????????????? ~/.ssh/config ????????? ????????? + ?????? ????????????ssh ???????????????????????????????????? OpenSSH 3.8 ???????????????X11 ???????????????????????????????????????????????????????????????????????????X11 ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ?????????????????? ~/.ssh/config ????????? ????????? +
&JAVA-PACKAGE;
+
+ ?????? + ??????????????? &DISTRO; ???????????????????????????????????? &KERNEL; &SECURITY;
&DEVELOPMENT-TOOLS; &I18N; &PRINTING; &MULTIMEDIA; &WEB-SERVERS; &SAMBA; &XORG; &ENTERTAINMENT;
Index: project-overview-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/project-overview-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project-overview-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ project-overview-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,44 +1,46 @@
- &PROJ; ????????? - &PROJ; ??????????????? Linux ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&PROJ; ?????????????????????????????? &DISTRO;??????????????? 2-3 ???????????????????????????????????????&RH; ???????????????????????????????????? &DISTRO; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - ????????????????????????????????? &PROJ; ????????? + &PROJ; ????????? + &PROJ; ??????????????? Linux ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&PROJ; ?????????????????????????????? &DISTRO;??????????????? 2-3 ???????????????????????????????????????&RH; ???????????????????????????????????? &DISTRO; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????? &PROJ; ????????? + + http://fedora.redhat.com/ + + ?????????????????????????????????????????????????????? + + + fedora-list at redhat.com — ?????? &DISTRO; ?????????????????? + + + fedora-test-list at redhat.com — ?????? &DISTRO; ?????????????????????????????? + + + fedora-devel-list at redhat.com — ??????????????????????????????????????? + + + fedora-docs-list at redhat.com — ???????????????????????? + + + fedora-ambassadors-list at redhat.com — ???????????????????????? &PROJ; ?????????????????? + + + ????????????????????????????????????????????? <listname>-request (?????? <listname> ????????????????????????????????????)???????????? "subscribe"??? + ??????????????????????????? Web ??????????????? + + http://www.redhat.com/mailman/listinfo/ + + + --> + &PROJ; ??????????????? IRC (Internet Relay Chat) ?????????IRC ??????????????????????????????????????????????????? IRC??????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????? &PROJ; ??????????????? IRC ????????????????????? freenode IRC ?????????????????????????????? irc.freenode.net ?????? IRC ????????????????????????????????????????????????????????????????????????????????? freenode ?????? (http://www.freenode.net/) ??????????????????&PROJ; ?????????????????? #fedora ??????????????? &PROJ; ????????????????????? #fedora-devel ???????????????????????????????????????????????????????????????????????????????????????????????????????????? + ????????? #fedora ?????????????????????????????????????????? (nick)?????????????????? /join ???????????????????????????????????? + + ?????? + &RH; ?????? &PROJ; IRC ???????????????????????????????????? + +
Index: RELEASE-NOTES-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/RELEASE-NOTES-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RELEASE-NOTES-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ RELEASE-NOTES-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,45 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %FEDORA-ENTITIES-EN; - - - - - - - - + + + + + + + + + ]> -
&DISTRO; &DISTROVER; ????????????2005&FORMAL-RHI; &LEGALNOTICE-RELNOTES; &SPLASH; &LEGALNOTICE-SECTION; &INTRO; &HARDWARE-REQS; &OVERVIEW; &INSTALL-NOTES; &PACKAGE-NOTES; &LEGACY; &PACKAGE-MOVEMENT; &PROJECT-OVERVIEW;
+
+ + &DISTRO; &DISTROVER; ????????????(??????) + + 2005 + &FORMAL-RHI; + &LEGALNOTICE-RELNOTES; &SPLASH; &LEGALNOTICE-SECTION; &INTRO; &HARDWARE-REQS; &OVERVIEW; &INSTALL-NOTES; &PACKAGE-NOTES; &LEGACY; &PACKAGE-MOVEMENT; &PROJECT-OVERVIEW;
Index: samba-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/samba-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- samba-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ samba-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,13 +1,9 @@
Samba (Windows ?????????????????????) - ?????????????????? Samba ??????????????????Samba ?????? Linux ????????? Microsoft Windows ????????????????????????????????? - ?????? Windows ?????? (???????????? SMB ??????) ???????????? &DISTRO; &DISTROVER; ??????????????????????????????????????????????????????????????????????????????????????? - ???????????????????????????????????? SMB ???????????????????????????????????????????????? - ???????????????????????? WINS ??????????????? smb.conf ????????? "wins server" ????????? WINS ????????????????????? @@ -16,22 +12,12 @@ ?????????????????? - - ?????????????????????????????????????????????????????? + ?????????????????????????????????????????????????????? ??????????????????????????????????????????????????? - ??????????????????????????????????????????????????? - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=133478
- Index: security-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/security-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- security-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ security-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -2,26 +2,45 @@
?????? ??????????????? &FC; ?????????????????? - Pam_stack ????????????????????????????????????????????? fedora-test-list (http://www.redhat.com/mailman/listinfo/fedora-test-list + + Pam_stack ??????????????????Linux-PAM 0.78 ??????????????????????????????????????? pam_stack ?????????pam_stack ????????????????????????????????????????????????????????????????????????????????????????????????
???????????? ??????????????? &FC; ?????????????????? - ?????????????????????????????? /etc/pki/ ???????????????????????????????????????????????????????????????????????? - OpenSSL: /usr/share/ssl/ ???????????????????????? /etc/pki/tls/ ??? /etc/pki/CA/??? - Dovecot: ???????????? dovecot-openssl.cnf ??????????????????????????? /etc/pki/dovecot/??? + + + Buffer Overflow (???????????????)??????????????????????????? + + ??????????????????????????? &FC; ??? &FEX; ??????????????????????????????????????????????????????????????????????????? fstack-protecter???fstack-protector ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? GCC 4.1 ????????? &FC; &LOCALVER; GCC ???????????????????????????????????? + ???????????? &FC;4 ??????????????? FORTIFY_SOURCE ???????????? + + + + ???????????? + + ?????????????????????????????? /etc/pki/ ???????????????????????????????????????????????????????????????????????? + + + + OpenSSL + + ?????? OpenSSL???/usr/share/ssl/ ???????????????????????? /etc/pki/tls/ ??? /etc/pki/CA/??? + + + + Dovecot + + + dovecot-openssl.cnf ???????????????????????? /etc/pki/dovecot/ ????????? + + +
SELinux ????????? - MCS SELinux ????????????????????????????????????????????????????????????????????????????????? + Mult-Category Security (MCS) SELinux ????????? &FC; &LOCALVER; ????????????????????????????????????????????????????????? - http://post-office.corp.redhat.com/archives/rhselinux-project/2005-June/msg00001.html + http://www.livejournal.com/users/james_morris/5583.html
- Index: server-tools-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/server-tools-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- server-tools-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ server-tools-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -7,14 +7,9 @@ ????????????????????? &FC; ?????????????????????????????????/?????????????????????????????????
- <application>system-config-lvm</application> + + <application>system-config-lvm</application> + ?????? LVM ?????? system-config-lvm ???????????????????????????
- Index: splash-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/splash-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- splash-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ splash-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,17 +1,19 @@
???????????? &FC; &LOCALVER; + &FC; ??????????????????????????????????????????????????????????????????????????? Linux???????????????????????????????????????????????????????????????????????????????????????&FP; ??????????????????????????????????????????????????????????????? &RH; ???????????? &FED; ?????????????????? - ?????????????????? - ???????????????????????? &DISTRO; &DISTROVER; ????????? + ????????????????????????????????????????????? + ?????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????? fedora-test ??? fedora-devel ???????????????????????????????????????????????????????????????????????????????????????&FP; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + http://fedoraproject.org/wiki/BugsAndFeatureRequests. - &FC; ???????????????????????????????????????????????????????????? Linux ?????????&FP; ???????????????????????????????????????????????????????????? &RH; ??????????????? &FED; ??????????????? ???????????????????????????????????? ???????????????????????????????????????????????? http://fedora.redhat.com/docs/release-notes/ ?????????????????? &DISTRO; &DISTROVER; ??????????????? - - ??????????????????????????????????????? &FED; ???????????? - - — ?????????????????? + + — ?????????????????? + + + + Fedora FAQ (????????????) + ??????????????? (http://fedora.redhat.com/participate/communicate/) @@ -46,6 +52,44 @@ ?????? &FP; (http://fedora.redhat.com/about/) +
+ &FC; &LOCALVER; ???????????? + + + Xen ?????????????????? yum ??????????????????????????????????????? &FED; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? + + + + Pup????????? yum ???????????????????????????????????? rhn-applet??? + + + GNOME 2.12 ??? KDE 3.4 ??????????????????????????? + + + GNOME Power Manager ??? GNOME Screensaver ??????????????????????????????????????????????????? + + + OpenOffice.org 2.0 ???????????????????????????OpenOffice.org ????????????????????????????????????????????????????????????????????? + + + Xorg X11R7 ???????????? rc2 ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + + + Kernel 2.6.14 ????????????????????????????????????????????????????????? + + + SCIM ??????????????????????????? IIIMF??? + + + ?????????????????????????????????????????? + + + &FP; ???????????? logo (??????)??? + + + ?????????????????? Fedora ??????????????????????????? http://fedoraproject.org/wiki/RoadMap??? +
+
- Index: web-servers-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/web-servers-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- web-servers-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ web-servers-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -3,22 +3,18 @@ ??????????????? ?????????????????? Web ??????????????????????????????
- <command>httpd</command> - ?????? httpd ??????????????????????????? + + <command>httpd</command> + + + httpd ????????????????????????????????? - ?????????????????? mod_cern_meta ??? mod_asis ????????? + ?????????????????? mod_cern_meta ??? mod_asis ????????? - ???????????? mod_ext_filter??? + ???????????? mod_ext_filter ?????????
- Index: xorg-zh_CN.xml =================================================================== RCS file: /cvs/docs/release-notes/xorg-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-zh_CN.xml 31 Oct 2005 10:48:40 -0000 1.1 +++ xorg-zh_CN.xml 10 Dec 2005 17:54:50 -0000 1.2 @@ -1,108 +1,62 @@
X ???????????? (????????????) - - ?????????????????? - ???????????????????????? &DISTRO; &DISTROVER; ????????? - - ?????????????????? &DISTRO; ??? X ???????????????????????????????????? -
- <filename>xorg-x11</filename> - ?????? X.org ??? X11?????????????????????????????? &RH; ??? &FED; ???????????????????????? XFree86.org ????????? X11 ????????????????????????????????????????????????????????????????????? - X ??????????????????????????? - - - XFree86 X11: XFree86 - - - X.org X11: Xorg - - - X ???????????????????????? - - - XFree86 X11: /etc/X11/XF86Config - - - X.org X11: /etc/X11/xorg.conf - - - X ???????????????????????? - - - XFree86 X11: /var/log/XFree86.$DISPLAY.log - - - X.org X11: /var/log/Xorg.$DISPLAY.log - - - ???????????????????????? X ???????????????????????????????????????????????????????????? - ???????????? &DISTRO; ???????????? X ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? - - - ????????? (??? 15 ????????????) ?????????????????? X ??????????????????????????????????????????????????????????????????????????? X ???????????????????????????????????????-misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1??? - - - ????????????????????????????????? fontconfig????????????????????????????????????????????????Fontconfig ????????? Xft ??????????????????????????????????????????????????? fontconfig ????????????????????????????????????Fontconfig ?????????????????????????????????????????????Luxi Sans-10??? - - - ??????????????????fontconfig ??? Xft ????????? X ??????????????????????????????????????? Qt 3 ??? GTK 2 ??????????????? (?????? KDE ??? GNOME ??????????????????) ????????? fontconfig ??? Xft ??????????????????????????????????????? X ???????????????????????? - ?????????&FC; ???????????? fontconfig/Xft????????? XFS ????????????????????????????????????????????????????????? - - ?????? - ?????????????????????????????????????????????????????????OpenOffice.org ???????????????????????????????????? - - ??? &DISTRO; &DISTROVER; ????????????????????????????????????????????????????????????????????????????????????????????????????????? X ??????????????????????????????????????? - - - - ?????? /usr/share/fonts/local ?????? (????????????????????????)??? - -mkdir /usr/share/fonts/local/ - - - - ??????????????????????????? /usr/share/fonts/local/ - - - ????????????????????????????????????????????? (???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????)??? - -ttmkfdir -d /usr/share/fonts/local/ -o /usr/share/fonts/local/fonts.scale -mkfontdir /usr/share/fonts/local/ - - - - ????????????????????? /usr/share/fonts/local/ ????????????????????????????????? X ??????????????? (xfs) ??????????????? - -chkfontpath --add /usr/share/fonts/local/ - - - - ??? fontconfig ??????????????????????????????????????????????????????????????????????????? /usr/share/fonts/ ?????? (???????????????????????????????????? ~/.fonts/ ???????????????????????????????????????)??? - ????????????????????????????????? fc-cache ???????????????????????????????????? - -fc-cache <directory> - - (?????? <directory> ??? /usr/share/fonts/ ?????? ~/.fonts/ ?????????) - ??????????????????????????????????????????????????????????????? Nautilus ????????? fonts:///???????????????????????????????????????????????? - - ?????? - ???????????????????????? ".gz" ???????????????????????? gzip ??????????????????????????? (?????? gunzip ??????) ??????????????? fontconfig ???????????????????????? - - ???????????????????????? fontconfig/Xft ??????????????????????????????????????? ???????????????????????? GTK+ 1.2 ???????????????????????????????????????????????????????????????????????????????????????????????? ~/.gtkrc.mine ????????????????????? - -style "user-font" { -fontset = "<font-specification>" -} -widget_class "*" style "user-font" - - (?????? <font-specification> ?????????????????????????????????????????? X ????????????????????????????????????????????? "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*".) +
+ X ???????????? (????????????) + ????????????????????? &FED; ??? X ???????????????????????????????????? +
+ xorg-x11 + X.org X11 ??? X ???????????????????????????????????????????????????????????????????????????????????????????????? (GUIs) ?????? GNOME ??? KDE ??????????????? + ???????????? Xorg ?????????????????? http://xorg.freedesktop.org/wiki/ + ???????????? ApplicationsSystem SettingsDisplay ????????? system-config-display ??????????????????Xorg ?????????????????? /etc/X11/xorg.conf??? + Modular (????????????) X.Org X11R7 RC2 ??? 2005 ??? 11 ??? 16 ????????? &FED; ???????????? (rawhide)????????? Xorg ?????????????????????????????????????????????????????????????????????????????? Xorg ???????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????? Xorg ????????????????????????????????? http://fedoraproject.org/wiki/Xorg/Modularization +
+
+ Xorg X11R7 ??????????????? + X11R7 RC2 ????????????????????????????????????????????? &FED; ?????????????????????????????????????????????????????????????????????????????????????????????????????? X11R7 ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+ + <filename>/usr/X11R6</filename> ???????????? + X11R7 ????????????????????? /usr ????????????????????? /usr/X11R6 ?????????????????????????????????????????? /usr/X11R6 ??????????????????????????????????????????????????????????????? PATH (????????????)?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+
+ + <command>Imake</command> + + + Imake ?????????????????? X?????????????????????????????????Imake, xmkmf ???????????????????????? X ?????????????????????????????? X11R7 ???????????? X.Org ????????????????????? Imake ??????????????? GNU autotools ??? pkg-config??????????????? X ??????????????? imake ????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+
+ ??????????????? app-defaults ?????? + ??????????????? Xresource ??????????????????????????????????????? %{_datadir}/X11/app-defaults????????? &FC; &LOCALVER; ?????????????????? &RHEL; ?????????????????? /usr/share/X11/app-defaults??? +
+
+ ???????????? <filename>xft-config</filename>??? + Modular X ???????????? GNU autotools???pkg-config ???????????????????????????xft-config ????????????????????????????????????????????? pkgconfig*.pc ????????????????????????????????? xft-config ????????? ??? libs ?????????????????????????????????????????????????????? pkg-config??? +
+
+
+ Xorg X11R7 ??????????????? + ???????????????????????????????????????/?????????????????? X11R7 ????????????????????? + + + ????????????????????? Imake ?????? GNU autotools ????????? + + + ??????????????????????????? pkgconfig*.pc ??????????????????????????????????????????????????????????????????????????? /usr/X11R6/lib ???????????????????????? + + + ?????????????????????????????? /usr ??????????????? /usr/X11R6???????????????????????? /usr/X11R6 ????????????????????????????????????????????????????????????????????????????????? X11R7 ??????????????????????????????????????????????????????????????????????????????????????????????????? + + + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? -devel ??????????????? + ?????????????????? BuildRequires: + (XFree86-devel|xorg-x11-devel) ????????? X ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? virtual (??????)????????????????????????????????? Xorg ??????????????????????????????????????? + ??????????????????????????????BuildRequires: + libXft-devel ????????????BuildRequires: xorg-x11-Xft-devel??????????????????????????????????????? X.Org X11 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? xorg-x11--devel ???????????????????????????????????????/???????????????????????????????????????????????????????????????????????????????????? + + +
- From fedora-docs-commits at redhat.com Sat Dec 10 18:54:23 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 13:54:23 -0500 Subject: install-guide fedora-install-guide-diskpartitioning-zh_CN.xml, 1.2, 1.3 fedora-install-guide-intro-zh_CN.xml, 1.3, 1.4 fedora-install-guide-networkconfig-zh_CN.xml, 1.1, 1.2 fedora-install-guide-other-instmethods-zh_CN.xml, 1.3, 1.4 Message-ID: <200512101854.jBAIsNIx012125@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12103 Modified Files: fedora-install-guide-diskpartitioning-zh_CN.xml fedora-install-guide-intro-zh_CN.xml fedora-install-guide-networkconfig-zh_CN.xml fedora-install-guide-other-instmethods-zh_CN.xml Log Message: sync, sync Index: fedora-install-guide-diskpartitioning-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-diskpartitioning-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-diskpartitioning-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 +++ fedora-install-guide-diskpartitioning-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.3 @@ -41,7 +41,7 @@ ??????????????????????????????????????? Next ????????? ???????????? - ????????????????????????????????????????????? Network Devices?????? ???????????? ?????????????????? Create custom layout ??? Review and modify partitioning layout??? ????????????????????????????????? + ??????????????? Network Devices?????? ????????????????????????????????????????????????????????????????????? Create custom layout (?????????????????????)??? Review and modify partitioning layout (???????????????????????????)??????????????? ???
????????????????????? Index: fedora-install-guide-intro-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-zh_CN.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-intro-zh_CN.xml 10 Dec 2005 14:38:36 -0000 1.3 +++ fedora-install-guide-intro-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.4 @@ -7,4 +7,4 @@ &FC; ???????????????????????????????????????????????????????????????&FC; ????????????????????????????????????????????????????????? ????????????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????? Linux ??????????????????????????????????????????????????????????????????????????????????????????&FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? - ????????????????????????????????????????????????????????? &BUG-REPORTING;
??????&FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ????????????????????????????????????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ??????????????????????????????????????????????????????
?????? i386 ????????????????????????&FP; ?????? &FC; ???????????????????????? PC ???????????????????????????????????????????????????????????? &FC; ????????????????????? architecture (????????????)???????????? ?????? 32 ?????? PC ????????? i386 ???????????????????????? &FC; ??????????????? x86_64 ??? ppc ??????????????????????????????????????????????????????????????????i386Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? SempronppcPowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ??????????????????x86_6464-bit AMD ?! ?????? ???????? Athlon64, Turion64, Opteron; ?????? Intel 64-bit ????????? EM64T
????????????????????? &FC; ?????????????????????????????????????????????????????????(????????? ?????????????????????)???????????????????????????????????? &IG; ??????????????????????????? &FC; ??????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ?????????
??????</tit! le><para>??????????????????&FC; ?????????????????? <indexterm><primary>DHCP (Dynamic Host Configuration Protocol)</primary></indexterm><firstterm>DHCP</firstterm> (????????????????????????) ???????????????????????????????????????????????????????????? DHCP ????????????????????????????????????????????????DHCP ?????????????????????????????????????????????????????????????????????????????????????????????</para><para>?????????????????????????????????????????????????????????????????????????????????????????? <xref linkend="sn-installing-networkinstallation"/> ??? <xref linkend="sn-installing-managed-network"/> ????????????????????????</para><note><title>Modem ??????&FC; ??????????????????????????????????????????????????????????????????????????? modem????????????????????????????????????????????????
?????????????????????????????????????????????????????? mirror (??????)??????????????????????????????????????????????????! ?????? ??????? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????? (FTP, HTTP ?????? NFS)???????????????????????????????????????????????????????????????????????? &FC;??????????????????????????????????????????????????????&FP; ??????????????????????????????????????????????????? HTTP ??? FTP ????????????????????????????????????????????????????????????????????????????????????????????????????????? /&FCLOCALVER;/architecture/os/?????????????????????????????????????????????????????????????????????????????? ??????????????????????????? &FED; ??????????????????????????????????????????????????????????????? &FED; ??????????????????????????????????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????????????????? DVD ????????????????????? CD ?????????????????????????????? boot: ?????????????????? linux askmethod???????????????????????????????????????????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment????????????????????????)??????????????????PXE (???????????? netboot ????????????)???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ????????????
????????????????????????????????? &FC;??! ????????????????????????? directory service ? ????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ???????????????????????????????????????&FC; ??????????????? LDAP ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????&FED; ??????????????????????????????CD ??? DVD ?????? (??????????????????????????????????????????????????????????????????????????????)USB ?????????????????? (?????? PXE)&FED; ???????????????????????????CD ??? DVD ??????????????????????????????????????? HTTP, FTP, ??? NFS????????????????????????????????????????????? &FC;????????????????????? &FC;???????????????????????? CD????????? DVD ????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC;????????????????????????????????????????????????????????????????????????&FC; ??????????????? CD???DVD ??? USB ???????????????????????? image files(????????????)???????????????????????????????????????????????????????????????????????? Linux ?????????????????????????????????????????????????????????????????????????????? &FC; ????????????????????? CD ??? DVD ?????????????????????????????????????????????????????? CD ??? DVD ???????????! ?????????????????????? ???
?????? CD ??? DVD ??????&FC; ??????????????????????????? images/boot.iso ???????????? CD ??? DVD ???????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ???????????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ??????cdrecord --device=cdwriter-devi! ce -tao -eject image-file.iso
?????? USB ?????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????????????????????? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ?????????????????????????????! ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????dd if=diskboot.img of=/dev/sda
+ ????????????????????????????????????????????????????????? &BUG-REPORTING;
??????&FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ????????????????????????????????????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ??????????????????????????????????????????????????????
?????? i386 ?????????????????????????????????&FP; ?????? &FC; ???????????????????????? PC ???????????????????????????????????????????????????????????? &FC; ??????????????? architecture (????????????)???????????? ?????? 32 ?????? PC ????????? i386 ???????????????????????? &FC; ??????????????? x86_64 ??? ppc ????????????????????????????????????????????????????????????i386Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? SempronppcPowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ??????????????????x86_6464-bit AMD ????! ?????? ????? Athlon64, Turion64, Opteron; ?????? Intel 64-bit ????????? EM64T
????????????????????? &FC; ?????????????????????????????????????????????????????????(????????? ?????????????????????)???????????????????????????????????? &IG; ??????????????????????????? &FC; ??????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ?????????
??????! ??????????????????&FC; ?????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ???????????????????????????????????????????????????????????? DHCP ????????????????????????????????????????????????DHCP ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ????????????????????????Modem ??????&FC; ??????????????????????????????????????????????????????????????????????????? modem????????????????????????????????????????????????
?????????????????????????????????????????????????????? mirror! (??????)?????????????????????????????????????????????????????! ?????? ???? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????? (FTP, HTTP ?????? NFS)???????????????????????????????????????????????????????????????????????? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FP; ??????????????? HTTP ??? FTP ???????????????????????????????????????????????????????????????????????????????????? /&FCLOCALVER;/architecture/os/ ?????????????????????????????????????????????????????????????????? ??????????????????????????? &FED; ???????????????????????????! ???????????????????????????????????? &FED; ??????????????????????????????????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????????????????? DVD ????????????????????? CD ?????????????????????????????? boot: ?????????????????? linux askmethod???????????????????????????????????????????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment????????????????????????)??????????????????PXE (???????????? netboot ????????????)???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ??????????????????????????????????????????????????????????????????????????????????????? &FC;????????????????! ?????????????????
????????????????????????????????? &FC;??????????????????????????? directory service ????????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ???????????????????????????????????????&FC; ??????????????? LDAP ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????? &FC; ????????????????????? CD ??? DVD ?????????????????????????????????????????????????????? CD ??? DVD ????????????????????????????????? ?????????????????????! ???????????? &FC; ?????????????????????????????? ????????????????????? &FC;???????????????????????? CD????????? DVD ????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC;????????????????????????????????????????????????????????????????????????&FC; ??????????????? CD???DVD ??? USB ???????????????????????? image files(????????????)???????????????????????????????????????????????????????????????????????? Linux ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FED; ???????????????????????????CD ??? DVD ??????????????????????????? USB ??????????????????????????????????????????????????????????????????????????? ! HTTP, , ??? NFS???????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????? CD ??? DVD ???????????????????????????????????? &FC;???????????? USB ?????????????????????????????????????????????????????????????????????&FED; ????????????????????????????????????CD ??? DVD ?????? (??????????????????????????????????????????????????????????????????????????????)USB ?????????????????? (?????? PXE)?????????????????????????????????????????????????????? &FC;???
?????? CD ??? DVD ??????&FC; ??????????????????????????? images/boot.iso ???????????? CD ??? DVD ???????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????! ???????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ??????cdrecord --device=cdwriter-device -tao -eject image-file.iso
?????? USB ?????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ???????????????????????????????????????! ??????????????????????????????????????????????????????????????! ?????? ???????????????????????????????????????????????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????????????????????? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????dd if=diskboot.img of=/dev/sda
Index: fedora-install-guide-networkconfig-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-networkconfig-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-networkconfig-zh_CN.xml 4 Nov 2005 13:38:41 -0000 1.1 +++ fedora-install-guide-networkconfig-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.2 @@ -3,7 +3,6 @@ ???????????? ??????????????????????????? &FED; ??????????????????????????? ?????????????????? &FED; ?????????????????????????????????????????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ????????????????????????????????????????????????????????????????????????&FC; ????????????????????????????????????????????????????????? DHCP??? - ?????? DHCP ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????? Index: fedora-install-guide-other-instmethods-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-zh_CN.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-other-instmethods-zh_CN.xml 10 Dec 2005 14:38:36 -0000 1.3 +++ fedora-install-guide-other-instmethods-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.4 @@ -87,7 +87,8 @@
??????????????? - ????????????????????? &FED; ???????????????????????????????????????????????????????????????????????? USB ?????????????????????????????? ISO ???????????????????????? ext2file systemsfile systemsext2ext2, ext3file systemsfile systemsext3ext3 ?????? vfatfile systemsfile systemsvfatvfat ?????????????????????????????? &FED; ??????vfat ?????????????????????????????????????????? FAT-16 ??? FAT-32??????????????????????????????????????????????????????????????????????????? vfat (FAT-32) ????????????????????? Microsoft Windows ?????????????????????????????????????????? vfat ??????????????? + ??????????????????????????????????????? &FED; ????????? ISO ????????????????????????????????????ISO ???????????????????????? USB ???????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ??? DVD ?????????????????????????????? &FC;??? + ??????????????????????????? ISO ???????????????????????????????????? ext2file systemsfile systemsext2ext2, ext3file systemsfile systemsext3ext3 ??? vfatfile systemsfile systemsvfatvfat ????????????????????? &FED;???vfat ???????????????????????????????????? FAT-16 ??? FAT-32????????????????????????????????????????????????????????????????????????????????? vfat (FAT-32) ????????????????????? Microsoft Windows ??????????????? vfat ????????????????????????????????????????????????????????? FAT-16, FAT-32, ??? <systemitem class="filesystem">vfat</systemitem> ?????????????????????????????????????????????????????????????????? &FED; ??????????????????????????? Windows ??????????????????????????????????????? Disk Management ??????????????? Linux ??????????????????????????????????????? fdisk ??????????????? From fedora-docs-commits at redhat.com Sat Dec 10 19:11:25 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 14:11:25 -0500 Subject: docs-common/images watermark-zh_CN.png,1.3,1.4 Message-ID: <200512101911.jBAJBPuA013790@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13773 Modified Files: watermark-zh_CN.png Log Message: correct one, generated using rsvg From fedora-docs-commits at redhat.com Sat Dec 10 20:21:12 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 15:21:12 -0500 Subject: documentation-guide Makefile,1.9,1.10 Message-ID: <200512102021.jBAKLCwQ015642@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624 Modified Files: Makefile Log Message: add zh_CN to build target Index: Makefile =================================================================== RCS file: /cvs/docs/documentation-guide/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 18 Sep 2005 22:45:54 -0000 1.9 +++ Makefile 10 Dec 2005 20:21:04 -0000 1.10 @@ -7,7 +7,7 @@ # Copyright 2003 Tammy Fox, Red Hat, Inc. ############################################################################### -LANGUAGES = en +LANGUAGES = en zh_CN DOCBASE = documentation-guide XMLEXTRAFILES-en = From fedora-docs-commits at redhat.com Sat Dec 10 21:40:44 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 10 Dec 2005 16:40:44 -0500 Subject: docs-common/images watermark-zh_CN.png,1.4,1.5 Message-ID: <200512102140.jBALeiqe017715@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/docs-common/images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17696 Modified Files: watermark-zh_CN.png Log Message: feel this one is even better, 1024x768 using rsvg From fedora-docs-commits at redhat.com Sat Dec 10 22:54:41 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 10 Dec 2005 17:54:41 -0500 Subject: install-guide fedora-install-guide-intro-en.xml, 1.22, 1.23 fedora-install-guide-other-instmethods-en.xml, 1.17, 1.18 Message-ID: <200512102254.jBAMsfTQ019489@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19469 Modified Files: fedora-install-guide-intro-en.xml fedora-install-guide-other-instmethods-en.xml Log Message: Trivial style edits Index: fedora-install-guide-intro-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fedora-install-guide-intro-en.xml 10 Dec 2005 17:51:38 -0000 1.22 +++ fedora-install-guide-intro-en.xml 10 Dec 2005 22:54:33 -0000 1.23 @@ -293,8 +293,9 @@ netboot) is a standard that enables PCs to use files on a server as a boot device. &FC; includes utilities that allow it to function as a PXE server for other - computers. This option enables you to install &FC; entirely over - the network connection, using no physical media at all. + computers. You can use this option to install &FC; on a + PXE-enabled computer entirely over the network connection, using + no physical media at all.
@@ -396,7 +397,7 @@ - This facility enables you to install &FC; on machines without + You can use this facility to install &FC; on machines without using installation discs. For example, you may install &FC; on a laptop with no CD or DVD drive by booting the machine with a USB pen drive, and then using a hard drive as an installation source. Index: fedora-install-guide-other-instmethods-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-en.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fedora-install-guide-other-instmethods-en.xml 10 Dec 2005 17:51:39 -0000 1.17 +++ fedora-install-guide-other-instmethods-en.xml 10 Dec 2005 22:54:33 -0000 1.18 @@ -156,9 +156,9 @@ Once you have booted your computer, you may use ISO image files of the &FED; discs to continue the installation process. The ISO files must be located on a hard drive that is either internal to - the computer, or attached to the machine by USB. This option - enables you to install &FC; on computers that have neither a - network connection, nor CD or DVD drives. + the computer, or attached to the machine by USB. You can use this + option to install &FC; on computers that have neither a network + connection nor CD or DVD drives. From fedora-docs-commits at redhat.com Sun Dec 11 03:26:24 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Sat, 10 Dec 2005 22:26:24 -0500 Subject: docs-common/bin copy-figs,NONE,1.1 Message-ID: <200512110326.jBB3QOGR028112@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28079/bin Added Files: copy-figs Log Message: Allow a document 'figs/' directory to contain its own subdirectory structure. Copy the directory tree, but only populate it with files which pass the '-f glob' filter(s). If no filters are given, "*" is used as a default. --- NEW FILE copy-figs --- #!/bin/bash ######################################################################## # Copy a file system hierarchy to a destination tree, copying only # files that are either: language neutral, or specific to a particular # language. ######################################################################## # We assume the following naming convention, because that is what the # docs currently seem to use. # # -. is a language-specific file, such as # "foo-en.png". # # . is a language-neutral file, such as "foo.png". # # What makes this complicated is that some files already have embedded # dashes that have nothing to do with locales, thus we have an ambiguous # filename grammar. ######################################################################## targetLang=en bnFilter= DEBUG=no VERBOSE=no die() { printf "${ME}: %s\n" "$@" >&2 exit 1 } glob2sed() { s="" i=1 while true do c=$(echo "${1}" | cut -c$i) if [ -z "${c}" ]; then break fi case "${c}" in '.' ) s="${s}[.]" ;; '*' ) s="${s}.*" ;; '?' ) s="${s}." ;; * ) s="${s}${c}" ;; esac i=$(expr $i + 1) done echo "${s}" } ME=$(/bin/basename $0) USAGE="usage: ${ME} [-D] [-f glob] [-l lang] [-V] /path/to/source/dir /path/to/dest/dir" while getopts Df:l:v c do case "${c}" in D) DEBUG='';; f) sedFilter=$(glob2sed "${OPTARG}") bnFilter="${bnFilter} -e /^${sedFilter}$/p" ;; l) targetLang="${OPTARG}";; v) VERBOSE='';; *) echo "${USAGE}" >&2; exit 1;; esac done shift $(expr ${OPTIND} - 1) if [ $# -ne 2 ]; then echo "${USAGE}" >&2 exit 1 fi SRC="$1" DST="$2" shift 2 case "${SRC}" in /* ) ;; ~/* ) SRC=${HOME}/$(echo "${SRC}" | cut -c2,-) ;; * ) SRC="$(/bin/pwd)/${SRC}" ;; esac case "${DST}" in /* ) ;; ~/* ) DST=${HOME}/$(echo "${DST}" | cut -c2,-) ;; * ) DST="$(/bin/pwd)/${DST}" ;; esac if [ -z "${bnFilter}" ]; then bnFilter="-e /^.*$/p" fi [ "${DEBUG}" ] || echo >&2 "bnFilter=|${bnFilter}|" leadin=$(/usr/bin/dirname "${SRC}") [ "${DEBUG}" ] || echo >&2 "leadin=|${leadin}|" find "${SRC}" -print | while read fn do # Skip anything that even looks like CVS or SVN case "${fn}" in *CVS* | *svn* ) continue ;; esac # Figure out the relative path for this pathname chunk rp=$( echo $(/usr/bin/dirname "${fn}")/$(/bin/basename "${fn}") | /bin/sed "s;^${leadin}/*;;" ) [ "${DEBUG}" ] || echo >&2 "rp=|${rp}|" # Copy directories, even if they are going to be empty. # Inodes are cheap, as long as you have enough. if [ -d "${fn}" ]; then [ "${VERBOSE}" ] || echo >&2 "Creating ${rp}" /bin/mkdir -p "${DST}"/"${rp}" continue fi # May not want this file under any circumstances bn=$(/bin/basename "${rp}") filteredBn=$(echo "${bn}" | sed -n ${bnFilter}) if [ -z "${filteredBn}" ]; then [ "${DEBUG}" ] || echo >&2 "Filter rejects |${fn}|" continue fi # We want this file if the language matches or if it is # language neutral copyIt=no case "${bn}" in *-${LANG}.* ) # Has matching language copyIt=yes ;; *-* ) # Doesn't match target language ;; * ) # Assume language neutral file copyIt=yes ;; esac [ "${DEBUG}" ] || echo >&2 "copyIt=${copyIt}" # Copy file if we like it if [ "${copyIt}" = "yes" ]; then [ "${VERBOSE}" ] || echo >&2 "Copying file |$fn|" cp "${fn}" "${DST}/${rp}" else [ "${VERBOSE}" ] || echo >&2 "Rejecting file |$fn|" fi done From fedora-docs-commits at redhat.com Sun Dec 11 03:26:18 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Sat, 10 Dec 2005 22:26:18 -0500 Subject: docs-common Makefile.common,1.19,1.20 Message-ID: <200512110326.jBB3Qmus028118@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28079 Modified Files: Makefile.common Log Message: Allow a document 'figs/' directory to contain its own subdirectory structure. Copy the directory tree, but only populate it with files which pass the '-f glob' filter(s). If no filters are given, "*" is used as a default. Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.common 10 Dec 2005 02:53:07 -0000 1.19 +++ Makefile.common 11 Dec 2005 03:26:10 -0000 1.20 @@ -73,11 +73,8 @@ # cp ${HTMLCSS} mydoc-en/fedora.css # cp ${HTMLCSSEXTRA} mydoc-en/watermark.png # cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/ -# mkdir -p mydoc-en/figs -# cp -p figs/*-${LANG}.* mydoc-en/figs +# ${FDPDIR}/docs-common/bin/copy-figs -f '*.png' figs mydoc-en/ # but we do avoid copying EPS files since they are nonsense to the HTML world. -# Also, we create the figs directory only if the document dir has a "figs/". -# I don't think we need to do this for a nochunks output, though. # define HTML_template ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) @@ -87,13 +84,9 @@ cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css [ -z "${HTMLCSSEXTRA}" ] || \ cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png - [ ! -d figs ] || ( \ - mkdir -p ${DOCBASE}-$(1)/figs; \ - find figs -type f -iname '*.*' -print | \ - egrep -vi '*.eps' | \ - egrep '(.*-$(1)..*)|([^-]*[.][^-]*)' | \ - while read x; do cp -f $$$${x} ${DOCBASE}-$(1)/figs; done \ - ) && exit 0 + [ ! -d figs ] || \ + ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ + figs $(DOCBASE)-$(1) endef # html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html) From fedora-docs-commits at redhat.com Mon Dec 12 02:22:03 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Sun, 11 Dec 2005 21:22:03 -0500 Subject: install-guide fedora-install-guide-adminoptions-en.xml, NONE, 1.1 Makefile, 1.14, 1.15 fedora-install-guide-en.xml, 1.30, 1.31 fedora-install-guide-intro-en.xml, 1.23, 1.24 fedora-install-guide-nextsteps-en.xml, 1.9, 1.10 Message-ID: <200512120222.jBC2M3KI009190@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9167 Modified Files: Makefile fedora-install-guide-en.xml fedora-install-guide-intro-en.xml fedora-install-guide-nextsteps-en.xml Added Files: fedora-install-guide-adminoptions-en.xml Log Message: - Added "Management Options" section to cover boot options, and various other oddments. - Amended URL tagging to XML-style. --- NEW FILE fedora-install-guide-adminoptions-en.xml --- Appendix: Management Options The &FED; installation system includes a range of options and functions for administrators.
Boot Options To use boot options, enter linux option at the boot: prompt. If you specify more than one option, separate each of the options by a single space. For example: linux option1 option2
Booting Your Computer with Rescue Mode You may use installation disc #1 to boot a command-line Linux system without installing &FED; on the computer. This rescue system may access the drives on your computer. Rescue mode enables you to use the utilities and functions of a running system to modify or repair an installed system. To load the rescue mode, enter: linux rescue Specify the language, keyboard layout and network settings for the rescue system with the screens that follow.
Installing &FC; with Expert Mode The expert mode enables you to run the installation process with additional options for hardware configuration. To run the installation process in expert mode, enter: linux expert This is untested.
Automating the Installation Kickstart.
Networking Options VNC, remote syslog, and options for network settings.
Interface Options To run the installation process in text mode, enter: linux text Add information on enabling serial console.
Hardware Compatibility Options Most of these options turn off configuring or using certain systems. Consider a table to summarise them.
Performing a Memory (RAM) Test Faults in memory modules may cause your system to freeze or crash unpredictably. In some cases, memory faults may only cause errors with particular combinations of software. For this reason, you should test the memory of a computer before you install &FED; for the first time, even if it has previously run other operating systems. To load the memtest86 memory test utility, enter memtest86 at the boot: . The utility immediately starts the first test. By default, memtest86 carries out a total of ten tests. To halt testing and reboot your computer, enter Esc at any time.
Accessing the Consoles In addition to the main interface, or console, the installation process provides three other consoles. The shell console enables you to access the command-line of the installation system. The two other consoles display events as the installation proceeds. You may find these consoles useful for diagnosing errors in the installation process. To switch between the consoles of installation process, press the key combinations shown below: Installation Consoles Console Key Combination Main Console CtrlAltF7 Shell Console CtrlAltF2 Main Log Console CtrlAltF3 Boot Log Console CtrlAltF4
Aborting the Installation To abort the installation process at any time before the Installing Packages screen, either press CtrlAltDel or power off the computer with the power switch. &FED; makes no changes to your computer until package installation begins.
Index: Makefile =================================================================== RCS file: /cvs/docs/install-guide/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile 4 Dec 2005 23:15:24 -0000 1.14 +++ Makefile 12 Dec 2005 02:21:54 -0000 1.15 @@ -14,7 +14,7 @@ DOCBASE = fedora-install-guide define XMLEXTRAFILES_template -XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml +XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-adminoptions-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml endef $(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG}))) Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fedora-install-guide-en.xml 10 Dec 2005 17:51:38 -0000 1.30 +++ fedora-install-guide-en.xml 12 Dec 2005 02:21:54 -0000 1.31 @@ -6,8 +6,8 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -33,6 +33,7 @@ + ]> @@ -174,6 +175,16 @@ + + 1.0.7 + 2005-12-12 + StuartEllis + + + Added Management Options section. + + + @@ -207,6 +218,8 @@ &NEXTSTEPS; + &ADMINOPTIONS; + &ACKNOWLEDGEMENTS; Index: fedora-install-guide-intro-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fedora-install-guide-intro-en.xml 10 Dec 2005 22:54:33 -0000 1.23 +++ fedora-install-guide-intro-en.xml 12 Dec 2005 02:21:54 -0000 1.24 @@ -339,32 +339,31 @@ Preparing Media - You may use the first CD or DVD installation disc from the - complete &FC; distribution to boot your computer. For instructions - to download and prepare this CD or DVD installation media, refer + To install &FC; from discs, you need five installation CDs, or the + installation DVD. There are separate disc sets for each supported + architecture. + + + + For instructions to download and prepare this CD or DVD installation media, refer to . If you already have the full set of &FC; installation media, skip to . - - To install &FC; from discs, you need five installation CDs, or the - installation DVD. There are separate disc sets for each supported - architecture. - - Architecture-Specific Distributions - To install &FC; you need the boot or installation media that is + To install &FC;, you must use the boot and installation media that is particular to your architecture. - The &FC; distribution also includes image + You may use the first CD or DVD installation disc from the + complete &FC; distribution to boot your computer. The &FC; distribution also includes image files for boot-only CD or DVD media and USB media. These files can be converted into bootable media using standard Linux utilities or third-party programs on other operating Index: fedora-install-guide-nextsteps-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-nextsteps-en.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fedora-install-guide-nextsteps-en.xml 8 Dec 2005 00:27:16 -0000 1.9 +++ fedora-install-guide-nextsteps-en.xml 12 Dec 2005 02:21:54 -0000 1.10 @@ -153,7 +153,7 @@ http://fedora.redhat.com/docs/ + url="http://fedora.redhat.com/docs/"/> @@ -163,7 +163,7 @@ http://www.tldp.org/ + url="http://www.tldp.org/"/> @@ -173,7 +173,7 @@ http://www.redhat.com/docs/manuals/enterprise/ + url="http://www.redhat.com/docs/manuals/enterprise/"/> @@ -184,7 +184,7 @@ http://www.google.com/linux/ + url="http://www.google.com/linux/"/>
@@ -201,7 +201,7 @@ http://forums.fedoraforum.org/ + url="http://forums.fedoraforum.org/"/>
@@ -221,7 +221,7 @@ http://fedora.redhat.com/participate/ + url="http://fedora.redhat.com/participate/"/>
From fedora-docs-commits at redhat.com Mon Dec 12 16:32:23 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Mon, 12 Dec 2005 11:32:23 -0500 Subject: docs-common Makefile.common,1.20,1.21 Message-ID: <200512121632.jBCGWNbD003237@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3219 Modified Files: Makefile.common Log Message: Dolt! Pass the desired language to the script that needs to look at it! Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile.common 11 Dec 2005 03:26:10 -0000 1.20 +++ Makefile.common 12 Dec 2005 16:32:16 -0000 1.21 @@ -85,8 +85,8 @@ [ -z "${HTMLCSSEXTRA}" ] || \ cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png [ ! -d figs ] || \ - ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ - figs $(DOCBASE)-$(1) + ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ + -l ${LANG} figs $(DOCBASE)-$(1) endef # html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html) From fedora-docs-commits at redhat.com Mon Dec 12 16:35:09 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Mon, 12 Dec 2005 11:35:09 -0500 Subject: docs-common/bin copy-figs,1.1,1.2 Message-ID: <200512121635.jBCGZ9Ic003281@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3253 Modified Files: copy-figs Log Message: Always copy files with multiple dashes, as a courtesy to legacy files. Added check for a "figs/Manifest-${LANG}" file. If found, get the filenames to copy from that, else search the source tree by name. Index: copy-figs =================================================================== RCS file: /cvs/docs/docs-common/bin/copy-figs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- copy-figs 11 Dec 2005 03:26:16 -0000 1.1 +++ copy-figs 12 Dec 2005 16:35:02 -0000 1.2 @@ -114,20 +114,47 @@ leadin=$(/usr/bin/dirname "${SRC}") [ "${DEBUG}" ] || echo >&2 "leadin=|${leadin}|" -find "${SRC}" -print | +haveManifest=$( + [ "${DEBUG}" ] || echo >&2 "Checking ${SRC}/Manifest-${targetLang}" + if [ -f "${SRC}/Manifest-${targetLang}" ]; then + echo yes + else + echo no + fi +) +[ "${DEBUG}" ] || echo >&2 "haveManifest=|${haveManifest}|" + +( + if [ "${haveManifest}" = "yes" ]; then + # We have a manifest file, so get the list of + # RELATIVE filenames from there. Generate the + # "Manifest-${targetLang}" file like this: + # cd figs; find * -print >"Manifest-${targetLang}" + # or something similar + cat "${SRC}/Manifest-${targetLang}" + else + # No manifest, resort to a search + find "${SRC}" -print + fi +) | while read fn do # Skip anything that even looks like CVS or SVN case "${fn}" in - *CVS* | *svn* ) + *CVS* | *.svn* ) continue ;; esac # Figure out the relative path for this pathname chunk - rp=$( - echo $(/usr/bin/dirname "${fn}")/$(/bin/basename "${fn}") | - /bin/sed "s;^${leadin}/*;;" - ) + if [ "${haveManifest}" = "yes" ]; then + rp="${fn}" + fn="${SRC}/${rp}" + else + rp=$( + echo $(/usr/bin/dirname "${fn}")/$(/bin/basename "${fn}") | + /bin/sed "s;^${leadin}/*;;" + ) + fi [ "${DEBUG}" ] || echo >&2 "rp=|${rp}|" # Copy directories, even if they are going to be empty. # Inodes are cheap, as long as you have enough. @@ -139,18 +166,22 @@ # May not want this file under any circumstances bn=$(/bin/basename "${rp}") filteredBn=$(echo "${bn}" | sed -n ${bnFilter}) - if [ -z "${filteredBn}" ]; then + if [ "${haveManifest}" = "no" -a -z "${filteredBn}" ]; then [ "${DEBUG}" ] || echo >&2 "Filter rejects |${fn}|" continue fi # We want this file if the language matches or if it is # language neutral - copyIt=no + copyIt=${haveManifest} case "${bn}" in - *-${LANG}.* ) + *-${targetLang}.* ) # Has matching language copyIt=yes ;; + *-*-* ) + # Multiple dashes imply ambiguous filename + copyIt=yes + ;; *-* ) # Doesn't match target language ;; From fedora-docs-commits at redhat.com Mon Dec 12 22:02:41 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Mon, 12 Dec 2005 17:02:41 -0500 Subject: release-notes security-it.xml,1.2,1.3 Message-ID: <200512122202.jBCM2fM3015589@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15571/release-notes Modified Files: security-it.xml Log Message: updated url www.livejournal.com Index: security-it.xml =================================================================== RCS file: /cvs/docs/release-notes/security-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- security-it.xml 25 Nov 2005 21:12:13 -0000 1.2 +++ security-it.xml 12 Dec 2005 22:02:18 -0000 1.3 @@ -80,8 +80,8 @@ &LOCALVER;. Per maggiori informazioni, leggete questo articolo informativo: - http://post-office.corp.redhat.com/archives/rhselinux-project/2005-June/msg00001.html + http://www.livejournal.com/users/james_morris/5583.html
From fedora-docs-commits at redhat.com Mon Dec 12 23:24:30 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Mon, 12 Dec 2005 18:24:30 -0500 Subject: selinux-apache selinux-apache-it.xml,1.1,1.2 Message-ID: <200512122324.jBCNOUcx017449@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/selinux-apache In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17431 Modified Files: selinux-apache-it.xml Log Message: Last part of italian translation - draft Index: selinux-apache-it.xml =================================================================== RCS file: /cvs/docs/selinux-apache/selinux-apache-it.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- selinux-apache-it.xml 4 Dec 2005 16:40:02 -0000 1.1 +++ selinux-apache-it.xml 12 Dec 2005 23:24:22 -0000 1.2 @@ -114,10 +114,11 @@ Come ulteriore controllo, usa il comando ps axZ | grep - httpd. Lo dovresti vedere in esecuzione sotto il + httpd. Dovresti vederlo in esecuzione sotto il security context root_u:system_r:httpd_t. - La parte pi?? importante ?? la terza componente, il + La parte pi?? importante ?? + la terza componente, il type httpd_t. Nota che molti altri processi sul tuo sistema sono in esecuzione sotto il tipo unconfined_t. Essendo eseguito @@ -150,15 +151,15 @@ Servizio HTTPD, eliminate il contrassegno a fianco delle voci Permetti il supporto HTTPD cgi e - Permetti ad HTTPD di leggere le home directory. In alternativa, puoi eseguire questi - comandi da un terminale: + Permetti ad HTTPD di leggere le home directory. In alternativa, + puoi eseguire questi comandi da un terminale: setsebool httpd_enable_cgi false setsebool httpd_enable_homedirs false - SELinux e le booleane sono discusse in . @@ -282,10 +283,10 @@ user_home_t. - To relabel the file and allow &APACHE; to read it, you can use - the chcon utility: chcon -t + Per rietichettare il file e permettere ad &APACHE; di leggerlo, puoi usare + l'utilit?? chcon: chcon -t httpd_sys_content_t /var/www/html/about.html. - Verify the context on the file is correct: + Verifica che il contesto del file sia corretto: ls -aZ /var/www/html/ @@ -295,79 +296,79 @@ -rw-r--r-- walters walters system_u:object_r:httpd_sys_content_t about.html - The chcon utility is similar in style to the - UNIX command chmod. For example, if you - wanted to recursively change the types of a directory and all - the files it contains, you could use this command: - chcon -R -h -t httpd_sys_content_t /path/to/directory. - The switch means to operate recursively, - and the option means to not follow - symlinks (which is almost always what you want). + L'utilit?? chcon ?? similare in stile al + comando UNIX chmod. Per esempio, se + volevi cambiare ricorsivamente i tipi di una directory e tutti + i files che essa contiene, potevi usare questo comando: + chcon -R -h -t httpd_sys_content_t /path/to/directory. + Lo switch fa operare ricorsivamente, + e l'opzione serve a non far seguire + i collegamenti (che ?? quasi sempre quello che vuoi). <command>chcon</command> vs. <command>restorecon</command> - There is another command available for changing file labels, - called restorecon. This command is - useful if you want to revert back to the default labels - on files. For example, you can run - restorecon -v -R /var/www/ to reset - all the file labels in the /var/www/ - directory. Internally, restorecon reads the - /etc/selinux/targeted/contexts/files/file_contexts - file, which has a set of regular expressions mapping file - paths to security contexts. + C'?? un altro comando a disposizione per cambiare le etichette di files, + chiamato restorecon. Questo comando ?? + utile se vuoi ripristinare le etichette dei files nella loro condizione + predefinita. Per esempio, puoi eseguire + restorecon -v -R /var/www/ per resettare + tutte le etichette dei files nella directory /var/www/. + Internamente, restorecon legge il file + /etc/selinux/targeted/contexts/files/file_contexts, + che possiede un insieme di espressioni regolari che mappa i percorsi + dei files ai contesti di sicurezza.
- Adding Per-User Content + Aggiungere contenuto su base Per-User - This section discusses per-user - ~/public_html directories. You need to do - three things: + Questa sezione discute la configurazione directory + ~/public_html per-user. Hai bisogno di fare + tre cose: - Edit /etc/httpd/conf/httpd.conf. - Comment out the line UserDir disable - and change the UserDir option - to public_html. + Edita /etc/httpd/conf/httpd.conf. + Commenta la linea UserDir disable + e cambia l'opzione UserDir + a public_html. - Execute service httpd reload. + Esegui service httpd reload. - Start system-config-securitylevel. In - the &SEL; tab, open the Apache - menu under Modify SELinux Policy. Switch - the Boolean Allow httpd to read home - directories back on. Alternatively, use - setsebool httpd_enable_homedirs true from a - terminal. + Avvia system-config-securitylevel. Nel + tab &SEL;, apri il menu Apache + sotto Modifica la Policy di SELinux. Cambia + la booleana Permette ad httpd di leggere le home + directories attivandola. In alternativa, usa + setsebool httpd_enable_homedirs true da un + terminale. - The rest of this process is from the perspective of a user - wanting to maintain your own website. + Il resto di questo processo ?? dalla prospettiva di un utente + che vuole mantenere il suo sito web. - Remember normal Linux permissions + Ricorda i normali permessi Linux - Make sure that you have your home directory set up with the - normal Linux permissions for this: in particular, you may need - to run chmod a+x ~. + Sii sicuro di avere la tua home directory impostata con i + normali permessi Linux per questo: in particolare, avrai bisogno + di eseguire chmod a+x ~. - In your home directory, execute mkdir - public_html. Examine the security context of the new + Nella tua home directory, esegui mkdir + public_html. Esamina il contesto di sicurezza della nuova directory: @@ -375,169 +376,169 @@ drwxrwxr-x walters walters user_u:object_r:user_home_t public_html/ - Note that it has the type - user_home_t, because &SEL; has - a rule that says new files created in a user's home directory - (user_home_dir_t), get assigned - the type user_home_t by - default. A process running as - httpd_t (i.e., &APACHE;) can't - read a file with this type. To change the file's type and allow - &APACHE; to read the file, execute: + Nota che ha il tipo + user_home_t, poich?? &SEL; ha + a regola che dice che i nuovi files creati nella home directory di un utente + (user_home_dir_t), per impostazione predefinita + dovranno avere assegnato il tipo user_home_t + Un processo eseguito come + httpd_t (es., &APACHE;) non pu?? + leggere un file con questo tipo. Per cambiare il tipo del file e permettere ad + &APACHE; di leggere il file, esegui: chcon -t httpd_sys_content_t public_html Targeted versus strict - In the strict policy, normal users have to use the type - httpd_user_content_t; the - _sys_ means it is reserved - for the system administrator by default. Using separate types - like this allows stronger separation between the system and - the user. + Nella policy strict, gli utenti normali devono usare il tipo + httpd_user_content_t; per impostazione + predefinita il _sys_ ?? inteso essere riservato + agli amministratori di sistema. L'uso di tipi separati + come questi permette una pi?? forte separazione fra il sistema + l'utente. - Now, create some content in your new - public_html (perhaps - index.html). Test that you can browse to - , and see - the expected data. Try relabeling the file back: chcon - -t user_home_t index.html. When you reload the page, - the Web server will not have permission to read it any more. - - - One key idea is that there are actually two - independent layers of security involved. There is the normal Unix - permissions (which you modify with chmod), - and the &SEL; file labels, which you modify with - chcon. Simply making a file world-readable - with the Unix command chmod a+r - filename will not, with - &SEL;, in general allow any process to read the file. Each - process must be explicitly authorized in the &SEL; policy for - access to a particular file type. + Ora crea qualche contenuto nella nuova + public_html (almeno + index.html). Prova che puoi navigare verso + , ed osserva + i risultati attesi. Prova a rietichettare il file come in precedenza: chcon + -t user_home_t index.html. Quando ricaricherai la pagina, + il Web server non avr?? pi?? il permesso di leggerla. + + + Un idea chiave ?? che attualmente sono coinvolti due + livelli di sicurezza indipendenti. Ci sono i normail permessi Unix + (che modifichi con chmod), + e le etichette dei files di &SEL;, che modifichi con + chcon. Rendere semplicemente un file world-readable + con il comando Unix chmod a+r + filename non sar??, con + &SEL;, in generale permesso a qualsiasi processo di leggere il file. Ogni + processo dovr?? essere esplicitamente autorizzato nella policy &SEL; per + accedere ad un particolare tipo di file.
- Discussion of Overall Security + Discussione sulla sicurezza in generale - Having gained an understanding of some basic &SEL; concepts, it - is useful to step back and see what you have achieved so far, and - examine some of the philosophy behind &SEL;. - - - Running &APACHE; as httpd_t - does ensure that even if the part of &APACHE; that is running as - root is compromised or misconfigured, it is isolated from the - rest of the system, and cannot delete or deface your website. - - - This mention of misconfiguration is useful to elaborate on. At - a fundamental level, a hostile attacker trying to break into - &APACHE; is not very different from a webmaster misconfiguring - it. Given &APACHE;'s extremely complex configuration file, all - it takes is a one-line mistake such as the following to cause - serious problems on your system: + Avendo ottenuto e compreso alcuni concetti base di &SEL;, ?? + utile fare un passo indietro e vedere cosa hai ottenuto alla fine, ed + esaminare alcune delle filosofie dietro &SEL;. + + + Eseguire &APACHE; come httpd_t + assicura che anche se la parte di &APACHE; che viene eseguita come + root ?? compromessa o misconfigurata, ?? isolata dal + resto del sistema, e non pu?? cancellare o defacciare il tuo sito web. + + + Sulla menzione di misconfigurazione sar?? utile tornarci sopra. + Fondamentalmente, un attacker ostile che prova ad irrompere in + &APACHE; non ?? molto differente da un webmaster che lo misconfiguri. + Dato che il file di configurazione di &APACHE; ?? estremamente complesso, + basterebbe una sola linea sbagliata come la seguente per causare + seri problemi al sistema: PidFile /etc/passwd - And there are plenty of other easier to make mistakes in your - Apache configuration. + E ci sono molti altri semplici modi di fare errori nella + configurazione Apache. - &SEL; lets you separate your security policy (&APACHE; should - never have direct access to /etc/passwd) - from the rest of all the complexity in - /etc/httpd/conf/httpd.conf. Having - specific labels for your Web content and &APACHE; also ensures a - compromised or misconfigured name server - (named_t) cannot read the - website at all (which is useful if some parts of the website are - password-protected by &APACHE;, for example). + &SEL; ti permette di separare la tua policy di sicurezza (&APACHE; non dovrebbe + mai avere accesso diretto a /etc/passwd) + dal resto della complessit?? di + /etc/httpd/conf/httpd.conf. Avendo + specifiche etichette per i tuoi contenuti Web ed &APACHE; assicura che + un server dei nomi compromesso o misconfigurato + (named_t) non possa leggere + affatto il sito web (che ?? utile se alcune parti del sito sono + state protette con password da &APACHE;, per esempio). - For a much more thorough discussion of the philosophy behind - &SEL;, refer to The Inevitability Of + Per un maggior approfondimento sulla discussione sulla filosofia dietro + &SEL;, fa referimento a The Inevitability Of Failure (http://www.nsa.gov/selinux/papers/inevit-abs.cfm.)
- Virtual Hosting, CGI scripts and suEXEC + Hosting viryuale, CGI scripts e suEXEC - Most installations of &APACHE; have some sort of dynamic - content; in particular, CGI scripts are very common. This - section examines a much more complicated use case for - &SEL;: A website that has a number of users, each of whom owns - a virtual host, out of which they are allowed to run CGI - content. + La maggior parte delle installazioni di &APACHE; hanno qualche sorta di contenuto + dinamico; in particolare, gli scripts CGI sono molto comuni. Questa + sezione esamina un caso molto pi?? complicato per + &SEL;: Un sito web che ha un numero di utenti, ognuno dei quali ha il proprio + host virtuale, nel quale gli ?? permesso eseguire contenuti + CGI. - In this situation, we have a number of security goals: + In questa situazione, abbiamo un certo numero di obiettivi di sicurezza: - Protect the system from the users + Proteggere il sistema dagli utenti - Protect the users from each other + Proteggere gli utenti gli uni dagli altri - Protect the user's home directory from their own CGI scripts + Proteggere la home directory degli utenti dai propri scripts CGI - One common method for approaching the first two goals on a - non-&SEL; setup is to use an &APACHE; module called suEXEC. - You can read more about suEXEC at suEXEC. + Puoi leggere di pi?? su suEXEC su http://httpd.apache.org/docs-2.0/suexec.html. - Using suEXEC protection, user CGI scripts run under their own -uid. This - ensures that user CGI scripts cannot interfere with the system - &APACHE; daemon (since it runs under its own uid), nor with - each other (since each user has their own uid). - - - However, when CGI scripts are run via suEXEC using standard - Linux security, a compromised, misconfigured, or simply buggy - user CGI script has complete access to any other file the user - owns, such as their home directory. It also has access to any - process running under the same uid, and so forth. Given the - security track record of Web software, protecting the user's - personal data from CGI programs they may install is very - desirable. - - - The &SEL; policy specifies that when a user CGI script is - executed by suEXEC, a domain transition - occurs to change the script's security label to the - httpd_sys_script_t type. This - means the user's CGI scripts run in their own confined domain - (but still the same uid). In the default &FC; setup, the - httpd_sys_script_t domain can read - and write to files and directories that - have the httpd_sys_content_t - type. But they still cannot access files with type - user_home_t, in other words the - user's home directory. - - - To illustrate this, here are example user names, file names, - and websites involved. In this example, the virtual hosting - provider has each user store their website in + Usando la protezione suEXEC, gli scripts CGI degli utenti vengono eseguiti sotto la loro propria + uid. Questo + assicura che gli scripts CGI degli utenti non possano interferire con il demone + di sistema &APACHE; (poich?? ?? eseguito sotto la propria uid), e neanche + l'uno con l'altro (poich?? ogni utente possiede la propria uid). + + + Comunque, quando gli scripts CGI vengono eseguiti via suEXEC usando la normale + sicurezza di Linux, uno script CGI di un utente, compromesso, + misconfigurato, o semplicemente bacato ha completo accesso ad ogni altro file + posseduto dall'utente, tipo la loro home directory. Esso ha anche accesso a ogni + processo che viene eseguito sotto lo stesso uid, e cos?? via. Dare + traccia della sicurezza del software Web, proteggendo i dati personali + degli utenti dai programmi CGI che essi possono installare ?? molto + desiderabile. + + + La policy &SEL; specifica che quando uno script CGI utente ?? + eseguito da suEXEC, avviene una transizione di dominio + per cambiare l'etichetta di sicurezza dello script al + tipo httpd_sys_script_t. Questo + vuol dire che lo script CGI dell'utente viene eseguito nel proprio confinato dominio + (ma ancora sotto la stessa uid). Nelle normali installazioni &FC;, il + dominio httpd_sys_script_t pu?? leggere + e scrivere nei files e directories che + hanno il tipo httpd_sys_content_t. + Ma non possono ancora accedere ai files con il tipo + user_home_t, in altre parole + la home directory utente. + + + Per illustrarvi questo, ecco un esempio di nomi utente, nomi di files, + e siti web coinvolti. In questo esempio, il fornitore + dell'host virtuale ha ogni utente con il proprio sito web in /var/www/sitename, - and the content is all owned by the user. CGI scripts are - allowed, and they can be installed anywhere in the user's site; - the filename just has to end in .cgi. Here - is an overview of the filesystem layout: + ed il contenuto ?? completamente di propriet?? dell'utente. Gli scripts sono + permessi, e possono essere installati ovunque nel sito web dell'utente; + il nome del file devono solo terminare in .cgi. Ecco + una descrizione della conformazione del sistema: ls -Z /var/www/ @@ -548,10 +549,10 @@ drwxr-xr-x sam sam system_u:object_r:httpd_sys_content_t sammy.net - Here is a sample of how the &APACHE; configuration for the - example.com domain might look. - Note particularly that &APACHE; has been configured to run CGI - scripts as the user bob. + Ecco un esempio di come la configurazione di &APACHE; per il + dominio example.com potrebbe essere. + Nota in particolare che &APACHE; ?? stato configurato per eseguire gli scripts + CGI come l'utente bob. NameVirtualHost 10.23.54.2:80 @@ -572,42 +573,42 @@ </VirtualHost> - By using the normal &APACHE; suEXEC mechanism, together with - &SEL;, you have achieved the major security goals set out at the - beginning of this section. However, this is still only a - fraction of &SEL;'s power. + Usando il normale meccanismo suEXEC &APACHE;, insieme a + &SEL;, hai ottenuto l'obiettivo di sicurezza principale descritto + all'inizio di questa sezione. Comunque, questa ?? solo + una frazione del potere di &SEL;.
- Using Other Types To Lock Down CGI Scripts + Usare altri Tipi per bloccare gli scripts CGI - In the section you - saw that a user's CGI script running in the - httpd_sys_script_t domain can - read and write all Web content. In many scenarios, this is - undesirable. For example, the Pyblosxom blog software (http://roughingit.subtlehints.net/pyblosxom/) - reads in a number of plain text blog entry files, and renders - them to HTML on the fly to the client. For this, it only needs - read access to the blog entry files. Ideally, if Pyblosxom was - compromised or had a bug, it would not have the ability to - modify or delete your Web log entries. - - - &SEL; allows you to achieve this by defining more types. You - grant httpd_sys_script_t the - access to those types that you desire. The default &APACHE; - policy defines a number of other types by default. + Nella sezione hai + visto che uno script CGI eseguito nel + dominio httpd_sys_script_t pu?? + leggere e scrivere tutto il contenuto Web. In molti scenari, ci?? + ?? indesiderato. Per esempio, il software di blog Pyblosxom (http://roughingit.subtlehints.net/pyblosxom/) + legge da un certo numero di file di semplice testo, e li renderizza + in HTML al volo per il client. Per questo, ha solo bisogno + di accesso in lettura ai file di contenuto del blog. Idealmente, se Pyblosxom fosse + compromesso o avesse un errore, esso non avrebbe la capacit?? di + modificare o cancellare le tue immissioni Web. + + + &SEL; ti permette di ottenere questo con la definizione di pi?? tipi. Tu + garantirai ad httpd_sys_script_t di + accedere ai quei tipi che desideri. La policy predefinita di &APACHE; + definisce gi?? un certo numero di tipi diversi. - User-controllable types defined by the &SEL; - policy + Tipi definiti dalla policy di &SEL; controllabili + dall'utente httpd_sys_script_ro_t - A CGI script may only read files and directories with this - type. + Uno script CGI pu?? solo leggere files e directories con questo + tipo. @@ -615,8 +616,8 @@ httpd_sys_script_ra_t - Like the previous type, except a CGI script may also - append more data (useful for log files, etc). + Come il tipo precedente, eccettuato che uno script CGI pu?? anche + appendere dati (utile per i files di log, etc). @@ -624,8 +625,8 @@ httpd_sys_script_rw_t - Content that a CGI script may change in any way, including - deletion. + Contentenuti che uno script CGI pu?? cambiare in qualsiasi modo, inclusa + la cancellazione. @@ -633,7 +634,7 @@ httpd_sys_content_t - See below. + Vedi sotto. @@ -641,41 +642,41 @@ httpd_sys_script_exec_t - The type for CGI executables. - httpd_t cannot execute - other types such as + Il tipo per gli eseguibili CGI. + httpd_t non pu?? eseguire + altri tipi come httpd_sys_script_rw_t. - The &FC; &LOCALVER; release introduces a new policy - boolean called - httpd_unified. If this boolean - is enabled, it means that - httpd_sys_content_t (the type - used for everything up until this point) is treated as the - union of all the other types above. If - this boolean is disabled, it means that (for example) in order - for a CGI script to be executed by - httpd_t, it must be labeled - with the - httpd_sys_script_exec_t type. - And it also means that in order for a CGI script to write data, - the target file must be labeled with - httpd_sys_script_rw_t, as - above. - - - The httpd_unified boolean - was introduced so that one could, for the most part, use - a typical &APACHE; installation without a good grasp on file labeling - and security contexts. However, disabling this boolean grants - far greater security, and is highly recommended. + La versione &FC; &LOCALVER; introduce una nuova policy + booleana chiamata + httpd_unified. Se questa booleana + ?? abilitata, questo vuol dire che + httpd_sys_content_t (ol tipo + usato per ogni cosa fino a questo punto) ?? trattato come + l'unione di tutti gli altri tipi succitati. Se + questa booleana ?? disabilitata, vuol dire che (per esempio) un CGI script + per poter essere eseguito da + httpd_t, deve essere etichettato + con il tipo + httpd_sys_script_exec_t. + E vuol dire anche che un CGI script per poter scrivere dati, + il file destinazione deve essere etichettato con + httpd_sys_script_rw_t, come + sopra. + + + La booleana httpd_unified + ?? stata introdotta affinch?? chiunque possa, per la maggior parte, usare + una installazione tipica di &APACHE; senza conoscenza stretta sull'etichettatura + dei files e dei contesti di sicurezza. Comunque, disabilitando questa boleana si garantisce + una sicurezza di gran lunga superiore, ed ?? caldamente raccomandato. - Now, examine how Bob might set up a Pyblosxom installation: + Ora, esaminiamo come Bob potrebbe configurare un installazione Pyblosxom: # cd /var/www/example.com @@ -696,124 +697,124 @@ -rw-r--r-- bob bob user_u:object_r:httpd_sys_script_ro_t firstpost.txt ... - Note that the index.cgi executable is marked as - httpd_sys_script_exec_t, and - the rest of the data is marked as - httpd_sys_script_ro_t. This - protects all the blog data from a compromised, misconfigured, or - buggy Pyblosxom. - - - One other important thing to note about these types is that by - default, httpd_t - cannot access any of them except for - httpd_sys_content_t. In other - words, by default &APACHE; cannot directly access content - intended for your CGI scripts. - - - Consider the case of a small intranet, accessed via a CGI - script, which has some public content, and some - password-protected content. It stores its data in a large - database file. In this case, you would label the database file - as httpd_sys_script_rw_t so - that the intranet CGI could write to it. But if you allow - httpd_t access to - httpd_sys_script_rw_t, then if - &APACHE; was compromised or simply misconfigured, it could gain - access to the database directly, bypassing the access control - that the CGI script was doing for the password-protected - content. + Nota che l'eseguibile index.cgi ?? marcato come + httpd_sys_script_exec_t, ed + il resto dei dati ?? marcato come + httpd_sys_script_ro_t. Questo + protegge tutti i dati del blog da un compromesso, misconfigurato, o + bacato Pyblosxom. + + + Un altra cosa importante da notare su questi tipi ?? che per + impostazione predefinita, httpd_t + non pu?? accedere a nessuno di loro eccettuato + httpd_sys_content_t. In altre + parole, di base &APACHE; non pu?? accedere direttamente al contenuto + inteso per i tuoi script CGI. + + + Considera il caso di una piccola intranet, a cui si pu?? accedere via CGI + script, che ha qualche contenuto pubblico e qualche + contenuto protetto da password. Essa registra i dati in un grande + file database. In questo caso, vorrai etichettare il file database + come httpd_sys_script_rw_t affinch?? + lo script CGI possa scriverci su. Ma se permetti + ad httpd_t l'accesso a + httpd_sys_script_rw_t, allora se + &APACHE; venisse compromesso o semplicemente misconfigurato, esso potrebbe ottenere + l'accesso diretto al database, bypassando il controllo d'accesso + che lo script CGI faceva per il contenuto protetto da + password.
Debugging Problems and Customizing the Policy - When first deploying &SEL; and &APACHE;, if your &APACHE; - configuration varies far from the &FC; or &RHEL; defaults, you - will likely encounter issues related to the &SEL; policy. This - section discusses analyzing policy denials, and doing simple - customizations of the policy. + Quando applichi per la prima volta &SEL; e &APACHE;, se la tua configurazione + &APACHE; varia molto da quella predefinita di &FC; o &RHEL;, potrai + incorrere in alcuni problemi con la policy &SEL;. Questa + sezione discute analizzando i dinieghi della policy, e facendo semplici + personalizzazioni della policy.
- Simple Customization + Semplice personalizzazione - The first major tool for policy customization is - system-config-securitylevel. It - has a number of policy booleans: + Il primo principale strumento per la personalizzazione delle policy ?? + system-config-securitylevel. Esso + possiede un certo numero di policy boolene: - Boolean options for &APACHE; - httpd_enable_cgi (Allow httpd cgi support) + Opzioni booleane per &APACHE; + httpd_enable_cgi (Permette ad httpd il supporto cgi) - Whether or not to allow CGI scripts to run at all. + Quando o no permettere agli script CGI di essere eseguiti. - httpd_enable_homedirs (Allow httpd to read home directories) + httpd_enable_homedirs (Permette ad httpd di leggere le home directories) - Whether or not to allow &APACHE; to access top-level home - directories. This does not allow for reading of the - content of home directories + Quando o no permettere ad &APACHE; di accedere alle home + directories. Questo non consente la lettura del + contenuto delle home directories (user_home_t). - httpd_ssi_exec (Allow httpd to run SSI executables in the same domain as system CGI scripts) + httpd_ssi_exec (Permette ad httpd di eseguire gli eseguibili SSI nello stesso dominio dei CGI scripts di sistema) - If enabled, this boolean causes &APACHE; to transition to the - httpd_sys_script_t when - executing a shell. + Se abilitata, questa booleana causa la transizione di &APACHE; verso + httpd_sys_script_t quando + esegue una shell. - httpd_unified (Unify httpd handling of all content files) + httpd_unified (Unifica il modo in cui httpd manipola tutti i files dei contenuti) - This boolean controls whether - httpd_sys_content_t is - treated as the union of all the other types such as - httpd_sys_script_exec_t. See + Questa booleana controlla quando + httpd_sys_content_t ?? + trattata come l'unione di tutti gli altri tipi come + httpd_sys_script_exec_t. Vedi - In addition, you can disable &SEL; enforcement for &APACHE; - entirely with system-config-securitylevel. + Inoltre, con system-config-securitylevel, + puoi interamente disabilitare il &SEL; enforcement per &APACHE;. - First, click the &SEL; tab. + Primo, clicca il tab &SEL;. - Click on the Transition tree. + Clicca sull'albero Transizioni. - Check Disable &SEL; protection for + Controlla Disabilita la protezione &SEL; per &APACHE; - Execute /etc/init.d/httpd restart + Esegui /etc/init.d/httpd restart
- Policy Debugging + Debugging della Policy - It is very important to monitor - /var/log/messages for any denials due to - the &SEL; policy. Suppose that you see the following denial: + E' importantissimo controllare + /var/log/messages per ogni diniego causato dalla + policy &SEL;. Supponi di vedere il seguente diniego: Oct 19 17:54:59 hostname kernel: audit(1098050626.859:0): avc: denied { write } \ @@ -822,72 +823,72 @@ tcontext=user_u:object_r:httpd_sys_script_ro_t tclass=dir - The { write } is telling you - that the denial involves writing to an object. The - tclass=dir says that the object - in question is a directory. The two most crucial parts are the - scontext and - tcontext, which contain the - types of the subject - (httpd_sys_script_t) and the - object (httpd_sys_script_ro_t). - Notice there is other auxilliary information as well; since the - object is a file, there is its name - (pyblosxom) and inode number + La { write } ti dice + che il diniego riguarda la scrittura di un oggetto. La + tclass=dir ti dice che l'oggetto + in questione ?? una directory. Le due parti pi?? cruciali sono + l'scontext e + tcontext, che contengono i + tipi del soggetto + (httpd_sys_script_t) e + l'oggetto (httpd_sys_script_ro_t). + Nota che c'?? un'altra informazione ausiliaria comunque; poich?? + l'oggetto ?? un file, c'?? il suo nome + (pyblosxom) ed il suo numero di inode (4374593). - In other words, the Python CGI script is trying to write to - a directory that is marked read-only. There are many reasons this could - happen; perhaps the script was misconfigured or buggy, for - example. But in this particular case, it turns out that the - Python interpreter normally tries to generate - .pyc files for each - .py file it encounters. If the directory - is marked as - httpd_sys_script_ro_t, then it - will not be able to create new files in it, and you will see the - denial. This is a very common problem with Python CGI scripts. + In altre parole, il CGI script in Python sta provando a scrivere in + una directory che ?? contrassegnata di sola lettura. Ci sono diverse ragioni percui ci?? pu?? + accadere; potrebbe essere che lo script sia misconfigurato o bacato, per + esempio. Ma in questo caso particolare, viene fuori che + l'interprete Python normalmente usa generare + files .pyc per ogni file + .py che incontra. Se questa directory + ?? marcata come + httpd_sys_script_ro_t, allora + non avr?? la possibilit?? di creare nuovi files, e vedrai + il diniego. Questo ?? un problema molto comune con gli script CGI in Python.
- Simple Changes to Policy Sources + Semplici cambiamenti al sorgente della Policy - The issue with Python mentioned in is not an issue with &SEL;, - since it is Python that is trying to write to a directory of - supposedly read-only objects. To deal with these spurious - errors that don't affect the functionality of the CGI script, - you can direct &SEL; to ignore them. &SEL; supports a - dontaudit directive in the - policy sources, but you must rebuild a policy from the source. - To install the policy sources, use up2date or - yum to install the - selinux-policy-targeted-sources - package. - - - To get the rule syntax you need, you can use a - audit2allow, which will generate the SELinux - policy to allow a set of logged denials. For example, you - could invoke audit2allow -i /var/log/messages - -l. This generates allow rules for every denial since - a policy was last loaded. The output for the denial in would look like this: + Il problema con Python menzionato nella non ?? un problema di &SEL;, + poich?? ?? Python che prova a scrivere in una directory di + supposti oggetti di sola lettura. Per risolvere questi errori + spuri, che non hanno effetto sulla funzionalit?? dello script CGI, + puoi direttamente dire a &SEL; di ignorarli. &SEL; supporta una + direttiva dontaudit nei + sorgenti delle policy, ma devi ricompilare la policy dai sorgenti. + Per installare i sorgenti della policy, usa il tool up2date o + yum per installare il + pacchetto + selinux-policy-targeted-sources. + + + Per avere la sintassi della regola di cui hai bisogno, puoi usare un + audit2allow, che generer?? la policy + SELinux per permettere un gruppo di dinieghi loggati. Per esempio, puoi + invocare audit2allow -i /var/log/messages + -l. Questo generer?? regole di consenso per ogni diniego finch?? + una policy verr?? alla fine caricata. L'output per il diniego nella sar?? come questo: audit2allow -i /var/log/messages -l allow httpd_sys_script_t httpd_sys_script_ro_t:dir { write }; - However, in this case you don't want to actually - allow this operation, you simply want to - avoid audit messages from it. &SEL; supports a directive called - dontaudit instead of - allow. Now your generated - policy is dontaudit httpd_sys_script_t - httpd_sys_script_ro_t:dir { write };. To - add this to the system policy, follow these steps: + Comunque, in questo caso, non vorrai attualmente + permettere questa operazione, semplicemente vorrai + evitare di avere ulteriori messaggi di audit. &SEL; supporta una direttiva chiamata + dontaudit da usare al posto di + allow. Ora la tua policy generata + ?? dontaudit httpd_sys_script_t + httpd_sys_script_ro_t:dir { write };. Per + aggiungerla alla policy di sistema, seguite i seguenti passi: @@ -897,9 +898,9 @@ - Use your favorite editor to create the file - domains/misc/local.te, and - add the rule above to it (or echo "dontaudit httpd_sys_script_t httpd_sys_script_ro_t:dir { write };" > domains/misc/local.te). + Usa il tuo editor di testi preferito per creare il file + domains/misc/local.te, ed + aggiungi la regola succitata (oppure echo "dontaudit httpd_sys_script_t httpd_sys_script_ro_t:dir { write };" > domains/misc/local.te). @@ -909,128 +910,128 @@ - Analyze <command>audit2allow</command> output carefully + Analizza l'output di <command>audit2allow</command> con attezione - You should not simply place all of the output from - audit2allow in your - domains/misc/local.te. It is very easy to - compromise the security of your system that way; for example, - using allow instead of - dontaudit above would have - rendered the security from the - httpd_sys_script_ro_t type - useless. - - - For more information about policy debugging and customization - in general, refer to the Red Hat &SEL; Policy - Guide, available online at audit2allow nel tuo + domains/misc/local.te. E' molto facile + compromettere la sicurezza del sistema in questo modo; per esempio, + usando allow invece di + dontaudit si render?? + inusabile la sicurezza + fornita dal tipo + httpd_sys_script_ro_t. + + + Per maggiori informazioni sul debugging e la personalizzazione + in generale, fa riferimento alla Red Hat &SEL; Policy + Guide, disponibile online su http://www.redhat.com/docs.
- Differences Between Strict and Targeted Policy + Differenze fra policy Strict e Targeted - The fundamental difference with the strict policy is that it - restricts every process, including user logins, instead of just - a few selected daemons. This has important ramifications for - &APACHE;, because ordinary users are often involved in providing - and controlling Web content. + La differenza fondamentale con la policy strict ?? che questa + restringe ogni processo, inclusi i login utente, invece di soli + pochi demoni selezionati. Questo ha importanti ramificazioni per + &APACHE;, perch?? gli utenti ordinari sono spesso coinvolti nel fornire + e controllare il contenuto Web. - In the default strict policy, there are two user login types, - user_t and - staff_t. The strict Apache - policy defines an additional set of types for each user login - type, replacing + Nella policy strict predefinita, ci sono due tipi di login utente, + user_t e + staff_t. La policy strict + di Apache definisce un ulteriore gruppo di tipi per ogni tipo + di login utente, sostituendo _sys_ - with _user_ and - _staff_. For example, this gives - httpd_user_script_ro_t and + con _user_ e + _staff_. Per esempio, questo ti da + httpd_user_script_ro_t e httpd_staff_script_exec_t. - This provides for a stronger, mandatory separation between - users, administrators, and the system. An ordinary user is - prevented from reading system Web content directly, and a - compromised or misconfigured system CGI script is prevented from - reading a user's content. + Questo fornisce una pi?? forte, mandatoria separazione tra gli + utenti, administratori, ed il sistema. Un utente ordinario ?? + prevenuto dal leggere il contenuto Web di sistema direttamente, ed un + compromesso o misconfigurato script CGI di sistema ?? prevenuto dal + leggere il contenuto di un utente.
- Further Approaches for Stronger Security + Ulteriori approcci per una maggior sicurezza - For some, the default &APACHE; policy may actually not be - expressive enough. This section discusses extending - and fundamentally rewriting the &APACHE; policy for even - stronger security. It is assumed that you are familiar with - the concepts discussed earlier. This section will generally - only outline solutions, instead of going into step-by-step - detail. + Per alcuni, la policy predefinita per &APACHE; pu?? attualmente non + sembrare abbastanza espressiva. Questa sezione discute l'estensione + e fondamentalmente la riscrittura della policy &APACHE; per ottenere + una sicurezza pi?? forte. Si da per assunto che hai familiarit?? con + i concetti discussi prima. Questa sezione generalmente indicher?? + soluzioni a grandi linee, invece di scendere nel dettaglio + passo passo.
- Individual Domains for Particular CGI Scripts + Domini individuali per particolari scripts CGI - Using the default policy, a compromise of one CGI script means - a compromise of all of them. This is - because they all run in the same domain - (httpd_sys_script_t) with - access to the same other types (e.g. - httpd_sys_script_rw_t). Put a - different way, types are security equivalence classes. - - - Most of the type definitions and permissions regarding CGI - scripts are in - /etc/selinux/policyname/src/policy/macros/program/apache_macros.te. - Open that file up in your favorite editor. This entire file - is definining an m4 macro called - apache_domain. + Usando la policy predefinita, la compromissione di uno script CGI vuol dire + comprometterli tutti. Questo perch?? + vengono eseguiti tutti sotto lo stesso dominio + (httpd_sys_script_t) con + accesso agli stessi altri tipi (es. + httpd_sys_script_rw_t). Mettiamola + in un altro modo, i tipi sono classi di sicurezza equivalente. + + + Molte delle definizioni e dei permessi che riguardano gli scripts + CGI sono in + /etc/selinux/policyname/src/policy/macros/program/apache_macros.te. + Aprite il file con il vostro editor di testi preferito. Questo intero file + definisce una macro m4 chiamata + apache_domain. - Understanding <command>m4</command> in one paragraph + Comprendere <command>m4</command> in un paragrafo - The + La define(`apache_domain',` - begins the macro definition. Inside the definition, the - $1 represents the parameter - passed to the macro. + cominica la definizione della macro. All'interno della definizione, il + $1 rappresenta il parametro + passato alla macro. - If you then look in + Se quindi dai uno sguardo in /etc/selinux/policyname/src/policy/domains/program/apache.te, - you'll see the following invocation: + vedrai la seguente invocazione: apache_domain(sys) - This single line then generates a large set of types and - rules, substituting sys for - every $1. Suppose that you - have two CGI programs you want to protect: a blog - installation, and a wiki installation. Because these domains - will be largely similar, you will create a macro. Open up the - file you are using for local policy, + Questa singola linea quindi genera un gran numero di tipi e + regole, sostituendo sys per + ogni $1. Supponi che + hai due programmi CGI che vuoi proteggere: una installazione + blog, ed una installazione wiki. Siccome questi domini + sono molto similari, creerai una macro. Apri il + file che stai usando per la policy locale, /etc/selinux/policyname/src/policy/domains/misc/local.te. - In order to separate the blog and the wiki, you need to create - separate types (domains) for them, allow - httpd_t the ability to - transition to those domains, and create new derived types to - label their data. This is very similar to what most of - apache_domain already does, - but unfortunately that macro does too much for your simple - needs. However, you can use that macro as a guide for creating - your macro. + Per poter separare il blog dalla wiki, avrai bisogno di creare + per loro tipi separati (domini), permettere ad + httpd_t la capacit?? di + transitare verso questi domini, e creare nuovi tipi derivati per + etichettare i loro dati. Tutto ci?? ?? abbastanza simile a quello che + il dominio apache_domain gi?? fa, + ma sfortunatamente quella macro fa fin troppo per le tue semplici + esigenze. Comunque, puoi usare questa macro come guida per crearne + una tua. - Start with the macro skeleton: + Comincia con lo scheletro della macro: define(`apache_script_domain',` @@ -1042,13 +1043,13 @@ - Define types for the CGI script executables (similar to - httpd_sys_script_exec_t), - and domains for the script processes (similar to - httpd_sys_script_t). You - also need to authorize the - system_r role for the - type. + Definisci i tipi per gli script eseguibili CGI (similmente ad + httpd_sys_script_exec_t), + ed i domini per i processi degli scripts (similmente a + httpd_sys_script_t). Hai + anche bisogno di autorizzare il + ruolo system_r per il + tipo. type httpd_sys_$1_exec_t, file_type, sysadmfile; @@ -1058,9 +1059,9 @@ - Allow &APACHE; to execute the script, and cause it to - transition to the script domain. You also want it to be - able to signal your CGI script. + Permetti ad &APACHE; di eseguire lo script, e provocane la + transizione verso il dominio dello script. Vorrai altres?? che sia + capace di segnalare il tuo script CGI. domain_auto_trans(httpd_t, httpd_sys_$1_exec_t, httpd_sys_$1_t) @@ -1069,11 +1070,11 @@ - Define new types for content. The following demonstrates - a read-only type and a read-write type, but you can easily - define different, more refined types. After defining - them, grant your CGI domain the access to them that you - want. + Definisci nuovi tipi per i contenuti. Cio che segue mostra + un tipo sola-lettura ed un tipo sola scrittura, ma puoi facilmente + definirne differenti, tipi pi?? raffinati. Dopo averli + definiti, garantisci al tuo dominio CGI l'accesso a quelli che + vuoi. type httpd_sys_$1_ro_t, file_type, sysadmfile; @@ -1085,18 +1086,18 @@ User domains in strict policy - On a strict policy system, you also need to allow the - user domain to manage files with your new types. See + Su un sistema con policy strict, devi anche permettere al + dominio utente di manipolare i files con i nuovi tipi. Vedi apache_domain. - Now at this point, you need to give your new domain - permissions. There are a lot of permissions defined in - apache_domain. You can - copy the core of those. + Adesso a questo punto, devi fornire i permessi al nuovo + dominio. Ci sono molti permessi definiti nel dominio + apache_domain. Puoi + copiarne il cuore. # Copied from apache_macros, more is needed @@ -1113,85 +1114,85 @@ ... - There are actually more permissions likely to be - necessary; they have been omitted for brevity. + Attualmente ci sono ancora permessi che potrebbero essere + necessari; sono stati omessi per brevit??. - You can now use your new macro to create the actual types: + Adesso puoi usare la nuova macro per creare i tipi attuali: apache_script_domain(wiki) apache_script_domain(blog) - Looking at your macro definition, you can mentally - substitute wiki and - blog for - $1 and see what has - happened. You can easily define quite a bit of policy, - having built the macro. + Osservando le definizioni della tua macro, puoi mentalmente + sostituire wiki e + blog con + $1 e vedere cos'?? + successo. Puoi facilmente definire che specie di policy, + ha costruito la macro. - Execute a make reload in the source - directory. Debug any problems that occur. + Eseguite un make reload nella directory + dei sorgenti. Esegui il debug di ogni problema che occorre. - Finally, you need to label your data. Use the - chcon command to do this. For example, - the wiki CGI executable should be labeled as - httpd_sys_wiki_exec_t, - its read-only data as - httpd_sys_wiki_ro_t, and - its database as - httpd_sys_wiki_rw_t, etc. - Similarly for the blog. + In fine, dovrai rietichettare i tuoi dati. Usa il + comando chcon per farlo. Per esempio, + gli eseguibili del CGI wiki dovranno essere etichettati come + httpd_sys_wiki_exec_t, + ed i suoi dati di sola lettura come + httpd_sys_wiki_ro_t, ed + il suo database come + httpd_sys_wiki_rw_t, etc. + In modo simile per il blog.
- Multiple HTTP Subdomains + Sottodomini HTTP multipli - In the virtual hosting setup outlined in , a compromise or - misconfiguration of the main &APACHE; - (httpd_t) means all sites are - affected. It would be nice if you could actually have - multiple &APACHE; servers, each running in their own domain; - for example, - httpd_site_t. - This subsection simply discusses the problems and outlines - possible solutions. - - - Looking at the current policy, it is fairly obvious that in - order to accomplish this goal, you will need to essentially - rewrite it from scratch. The entire policy is predicated on a - single httpd_t. The main - idea would be to change it into a macro, along the lines of what you did - with apache_script_domain in + Nell'installazione hosting virtuale descritta in , una compromisione o + misconfigurazione del server principale &APACHE; + (httpd_t) significa che tutti i siti sono + affetti. Sarebbe bello se tu potessi attalmente avere + servers &APACHE; multipli, ogniuno eseguito nel proprio dominio; + per esempio, + httpd_site_t. + Questa sottosezione discute semplicemente i problemi e ne delinea + le possibili soluzioni. + + + Osservando la policy corrente, sembra abbastanza ovvio che per + conseguire un simile obbiettivo, hai bisogno essenzialmente + di riscriverla da capo. L'intera policy ?? impostata su un + singolo httpd_t. L'idea + principale potrebbe essere di trasformarla in una macro, sulla falsa riga di quello che + hai fatto con apache_script_domain in . - In fact, if you also want to have individual domains on - CGI scripts, you will end up with types of the form: - httpd_vhost_sys_script_t. - For example, - httpd_examplecom_sys_wiki_t would be - a wiki CGI for example.com. + Infatti, se vuoi anche avere domini individuali sugli + scripts CGI, dovrai finire con tipi nella seguente forma: + httpd_vhost_sys_script_t. + Per esempio, + httpd_examplecom_sys_wiki_t sar?? + un CGI wiki per example.com. - Assuming that you have a macro - apache_server_domain which - defines all of the desired types and rules. If you are - fortunate enough that you have an IP address per domain, one - approach is simply to copy the - /usr/sbin/httpd binary - multiple times, but label each one differently: + Assumendo che tu abbia una macro + apache_server_domain che + definisca tutti i tipi e le regole che desideri. Se sei + abbastanza fortunato da avere un indirizzo ip per dominio, un + approccio ?? semplicemente di copiare il + binario /usr/sbin/httpd + tutte le volte, ma rietichettando ogniuno differentemente: ls -aZ /usr/sbin/httpd.* @@ -1199,54 +1200,54 @@ -rwxr-xr-x root root system_u:object_r:httpd_barorg_exec_t /usr/sbin/httpd.barorg - Next, have your init scripts give each one a separate - configuration, for example /usr/sbin/httpd.foocom -f + Successivamente, daremo a ciascuno dei nostri init scripts una configurazione + separata, per esempio /usr/sbin/httpd.foocom -f foocom.com. - If you have to serve multiple virtual sites from one IP - address, one approach might be to modify the &APACHE; source - code so that once it has read the desired domain from a - requesting client, it passes off the request to a child which - is running in the domain for that site. + Se devi servire molteplici siti virtuali da un singolo indirizzo + IP, un approccio potrebbe essere quello di modificare il codice + sorgente di &APACHE; affinch?? una volta letto il dominio desiderato da un + client richiedente, passi la richiesta ad un figlio che + corra nel dominio per quel sito.
- Defining a Webmaster Role + Definizione del ruolo Webmaster - This guide has posited that, from a security point of view, a - misconfigured &APACHE; is no different from a compromised one. - &SEL; deliberately separates the security policy from the - configuration of every daemon on the system. One neat - consequence of this is that it allows you to actually create a - webmaster role that is allowed to - modify the &APACHE; configuration file - /etc/httpd/conf/httpd.conf, restart the - daemon, etc. But no matter how the webmaster changes the - configuration, httpd is still restricted by - the security policy. - - - In order to do this, you would need to use the strict policy. - The overall approach is to create a new account with a uid of - 0, but only allowed to log in with the - webmaster_r role, which is - only authorized for the - webmaster_t type. You could - create webmaster_t with - full_user_role(webmaster), - and then proceeed to add a few permissions, such as: + Questa guida ha supposto che, dal punto di vista della sicurezza, un + &APACHE; misconfigurato non ?? differente da uno compromesso. + &SEL; separa deliberatamente la policy di sicurezza dalla + configurazione di ogni demone sul sistema. Una netta + conseguenza di ci??, ?? che attualmente ti permette di creare un + ruolo webmaster a cui ?? permesso di + modificare il file di configurazione di &APACHE; + /etc/httpd/conf/httpd.conf, riavviare il + demone, etc. Ma non ha importanza come il webmaster cambi la + configurazione, httpd ?? ancora ristretto dalla + policy di sicurezza. + + + Per far questo, avrai bisogno di usare la policy strict. + L'approccio generale ?? quello di creare un nuovo account con uid pari a + 0, ma a cui sia consentito il login esclusivamente + con il ruolo webmaster_r, che ?? + solo autorizzato per il + tipo webmaster_t. Potresti + creare webmaster_t con + full_user_role(webmaster), + e quindi procedere all'aggiunta di un po di permessi, tipo: create_dir_file(webmaster_t, httpd_config_t) - Since you are giving uid 0 - (root) access to the - webmaster, in this setup you are entirely relying on the &SEL; - policy. There is more to do here (making init scripts work - will be slightly tricky), but this outlines the general idea. - The remainder is left as an exercise for you. + Poich?? stai dando accesso uid 0 + (root) al + webmaster, in questo tipo di installazione stai contando interamente sulla policy + &SEL;. C'?? molto altre da fare qui (rendere gli init scripts funzionanti + sar?? un po macchinoso), ma questo delinea l'idea generale. + Il resto ti ?? lasciato come un esercizio.
From fedora-docs-commits at redhat.com Tue Dec 13 16:39:09 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Tue, 13 Dec 2005 11:39:09 -0500 Subject: docs-common/bin copy-figs,1.2,1.3 Message-ID: <200512131639.jBDGd9Ow022723@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22692 Modified Files: copy-figs Log Message: Correctly documented how to build the "Manifest-${LANG}" file. Removed extra "/figs/" path component if a manifest was used. Index: copy-figs =================================================================== RCS file: /cvs/docs/docs-common/bin/copy-figs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- copy-figs 12 Dec 2005 16:35:02 -0000 1.2 +++ copy-figs 13 Dec 2005 16:39:01 -0000 1.3 @@ -11,10 +11,27 @@ # "foo-en.png". # # . is a language-neutral file, such as "foo.png". +######################################################################## +# How Do We Choose Which Images Get Copied? +# +# We use two methods: one manual, the other automatic. If all your +# image files conform to the above filename conventions, then we will +# choose the appropriate image files automatically. If you name your +# image files using another method, then you will need to list the +# files to be copied in a "figs/Manifest-${LANG}" file. +# +# Before copying anything, we try to read the file "figs/Manifest-${LANG}" +# for the list of files. If this file is missing, we will choose the +# files based on the above naming convention. +# +# An easy way of generating the Manifest is like this: +# +# rm -f figs/Manifest-${LANG} +# find figs -print >/tmp/Manifest-${LANG} && +# mv /tmp/Manifest-${LANG} figs/ # -# What makes this complicated is that some files already have embedded -# dashes that have nothing to do with locales, thus we have an ambiguous -# filename grammar. +# Then manually edit that file to remove anything you don't want copied. +# Files matching "*/CVS/*" or "*/.svn/*" are ignored automatically. ######################################################################## targetLang=en @@ -127,10 +144,7 @@ ( if [ "${haveManifest}" = "yes" ]; then # We have a manifest file, so get the list of - # RELATIVE filenames from there. Generate the - # "Manifest-${targetLang}" file like this: - # cd figs; find * -print >"Manifest-${targetLang}" - # or something similar + # RELATIVE filenames from there. cat "${SRC}/Manifest-${targetLang}" else # No manifest, resort to a search @@ -139,6 +153,7 @@ ) | while read fn do + [ "${DEBUG}" ] || echo >&2 "Considering '${fn}'" # Skip anything that even looks like CVS or SVN case "${fn}" in *CVS* | *.svn* ) @@ -148,7 +163,7 @@ # Figure out the relative path for this pathname chunk if [ "${haveManifest}" = "yes" ]; then rp="${fn}" - fn="${SRC}/${rp}" + fn="${leadin}/${rp}" else rp=$( echo $(/usr/bin/dirname "${fn}")/$(/bin/basename "${fn}") | From fedora-docs-commits at redhat.com Tue Dec 13 16:45:55 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Tue, 13 Dec 2005 11:45:55 -0500 Subject: docs-common/bin copy-figs,1.3,1.4 Message-ID: <200512131645.jBDGjtmV022775@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22747 Modified Files: copy-figs Log Message: Create necessary "figs/*" subdirectory paths automatically if the Manifest-${LANG} file doesn't contain them. This invokes an extra "mkdir -p" for every image, but we don't that many images, on average. Index: copy-figs =================================================================== RCS file: /cvs/docs/docs-common/bin/copy-figs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- copy-figs 13 Dec 2005 16:39:01 -0000 1.3 +++ copy-figs 13 Dec 2005 16:45:47 -0000 1.4 @@ -209,7 +209,8 @@ # Copy file if we like it if [ "${copyIt}" = "yes" ]; then [ "${VERBOSE}" ] || echo >&2 "Copying file |$fn|" - cp "${fn}" "${DST}/${rp}" + /bin/mkdir -p $(/usr/bin/dirname "${DST}/${rp}") + /bin/cp "${fn}" "${DST}/${rp}" else [ "${VERBOSE}" ] || echo >&2 "Rejecting file |$fn|" fi From fedora-docs-commits at redhat.com Tue Dec 13 21:56:32 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Tue, 13 Dec 2005 16:56:32 -0500 Subject: documentation-guide Makefile, 1.10, 1.11 acknowledgments-en.xml, 1.8, 1.9 docs-getting-files-en.xml, 1.8, 1.9 documentation-guide-en.xml, 1.21, 1.22 docs-converting-en.xml, 1.1, NONE docs-converting-zh_CN.xml, 1.1, NONE Message-ID: <200512132156.jBDLuWni001385@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1242 Modified Files: Makefile acknowledgments-en.xml docs-getting-files-en.xml documentation-guide-en.xml Removed Files: docs-converting-en.xml docs-converting-zh_CN.xml Log Message: Added documentation about the document building system. Dropped the one-line "converting" chapter by creating a "Prerequisites" section in the "getting-files" section. Index: Makefile =================================================================== RCS file: /cvs/docs/documentation-guide/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 10 Dec 2005 20:21:04 -0000 1.10 +++ Makefile 13 Dec 2005 21:56:24 -0000 1.11 @@ -1,15 +1,19 @@ -############################################################################### +####################################################################### # Makefile for RHLP docs project # Created by: Tammy Fox # Last edited by: Tammy Fox # WARNING: need passivetex 1.24 for pdf generation to work # License: GPL # Copyright 2003 Tammy Fox, Red Hat, Inc. -############################################################################### +####################################################################### LANGUAGES = en zh_CN DOCBASE = documentation-guide -XMLEXTRAFILES-en = +XMLEXTRAFILES-en=acknowledgments-en.xml docs-emacs-en.xml \ + docs-emacs-nxml-en.xml docs-getting-files-en.xml \ + docs-intro-en.xml docs-rh-guidelines-en.xml docs-style-en.xml \ + docs-tutorial-en.xml docs-vim-en.xml docs-xml-tags-en.xml \ + documentation-guide-en.xml ###################################################### include ../docs-common/Makefile.common Index: acknowledgments-en.xml =================================================================== RCS file: /cvs/docs/documentation-guide/acknowledgments-en.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- acknowledgments-en.xml 13 Sep 2004 02:14:06 -0000 1.8 +++ acknowledgments-en.xml 13 Dec 2005 21:56:24 -0000 1.9 @@ -37,4 +37,9 @@ linkend="s1-xml-tags-screen">. + + A patch from Tommy Reynolds (Tommy.Reynolds at MegaCoder.com) has been + applied to more fully explaing the document building system. + + Index: docs-getting-files-en.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-getting-files-en.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- docs-getting-files-en.xml 19 Sep 2005 00:00:31 -0000 1.8 +++ docs-getting-files-en.xml 13 Dec 2005 21:56:24 -0000 1.9 @@ -1,83 +1,389 @@ - Getting the Files + Prerequisites + + Before you being working with the &FED; documents, you must have certain tools and packages installed on your system. + The directions below will help you configure your setup. + + +
+ System Packages - To start working on the Docs Project, you will need the appropriate - DocBook XML files, stylesheets, and scripts. The following packages are - required: - + To start working on the Docs Project, you will need the appropriate DocBook XML files, stylesheets, and scripts. + The following packages are required: + - xmlto — for producing HTML and PDF outputs + + xmlto — for producing HTML and PDF outputs. + - docbook-style-xsl — for the default XSLT stylesheets we - build on + + docbook-style-xsl — for the default XSLT stylesheets we build on. + - docbook-dtds — XML versions of the DocBook DTD + + docbook-dtds — XML versions of the DocBook DTD + - The custom scripts and stylesheets used are all stored in CVS on the - cvs.fedora.redhat.com CVS server. - You need to check them out along with the DocBook XML files for the - existing docs. - + You can verify these packages are on your system by: + + + + +rpm -q xmlto +rpm -q docbook-style-xsl +rpm -q docbook-dtds + + - You should perform these steps only once, when you first make a checkout - from docs CVS. When you see the password prompt, press the - Enter key. - + Any missing package can be installed using yum(8) this way: + + + + +su -c 'yum install xmlto' +su -c 'yum install docbook-style-xsl' +su -c 'yum install docbook-dtds' + + +
+
+ Fedora Documentation Tools + + + You need perform these steps only once. + These files are common to all the &FDPX; documents. + + + + The custom scripts and stylesheets used are all stored in CVS on the cvs.fedora.redhat.com CVS server. + You need to check them out along with the DocBook XML files for the existing docs. + - -mkdir my-fedora-docs -cd my-fedora-docs + + When you see the password prompt, press the Enter key. + In the example below, we also show how to obtain a copy of an existing &FDPX; document. + + + +mkdir my-fedora-docs-sandbox +cd my-fedora-docs-sandbox export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs cvs login cvs co docs-common cvs co example-tutorial - +
+
+ Filename Conventions - When you perform an anonymous CVS checkout, you can view the files and - retreive the latest versions. You cannot add (commit) any updates or new - files back to the repository. To commit changes to CVS, you must have - CVS write access. Refer to to learn - about getting write access to CVS. + &FDPX; provides the tools, scripts, and stylesheets to transform your XML documents into either HTML or PDF output formats. + In addition, your document can automatically be built into an RPM package. - - To see a list of the available documents: + To take advantage of these services, you should follow our conventions for naming your files. + While you may choose whatever filenames you like, adopting our practices will make your life simpler. + Of course, if you are bringing your own document into our building system, changing hundreds of filenames may seem quite a burden; relax, we can use your filenames with just a little work on your part. + Read on to find out how. - -cvs co -c - +
+ Document Filenames + + Each document lives in a peer directory to the docs-common directory you extracted from the &FED; archive earlier. + Name your document directory something related to its subject, just avoid any name already taken. + The cvs co -c command mentioned earlier will show you the names already taken. + +
+
+ Anticipating I18N Translation + + The &FDPX; includes an active translation team. + Project documents are often translated into several languages. + By convention, the translated files share the directory with the original files; filenames must be unique. + + + &FDPX; filenames are constructed appending a dash followed by the ISO language symbol before any file extention. + For example, a file whose language content is US English could be named mydoc-en.xml; the file containing its Chinese translation would then be named mydoc-zh_CN.xml, and so on. + + + To assist this effort, the document build system assumes that each file is tagged with its I18N locale. + Our filename convention is shown in + + + &FDPX; Filename Conventions + + + + + + + Compoment + + + Description + + + + + + + anything_but_dash + + + + The initial portion of a filename can be anything, as long as no dash is used. + + + + + + - + + + + A dash (-) is to be used only to introduce the ${LANG} filename component. + + + + + + ${LANG} + + + + The ${LANG} component identifies the locale for the file content. + + + In addition to helping classify files according to their language content, we also use the ${LANG} value as an UTF-8 locale when rendering the document. + For example, the document mydoc-it.xmlwill be rendered using it.UTF-8 as the language environment. + + + For more information on I18N localization, visit the web site. + + + + + +
+ + Document Filenames Are Special + + The main file in your document must follow the file naming convention or the document building system cannot find it. + + +
+
+
+ The Document Build System - Pick your document of interest and then download it to your working directory: + Common tasks such as rendering the document into either HTML or PDF can be performed easily using the document building system. - -cvs co example-tutorial - - Except for the &IG;, all documentation in CVS must - be tutorials written in DocBook XML article format using the template in - the example-tutorial directory. Each tutorial - must be in its own directory. No XML files should be - in the root directory. + The building system heavily leverages the make(1) tool and shell scripts to automate these activities, but authors need no prior experience with either shell scripts or a Makefile. + While individual documents do have their own Makefile, it is only a few lines long and very simple. + The document Makefile content is designed for cut's paste. - - + + As an example, shows the whole Makefile for a simple document having only one file and one language. + + + Sample Document Makefile + +DOCBASE = mydoc +LANGUAGES = en +XMLEXTRAFILES-en= +include ../docs-common/Makefile.common + + + + Our main XML file is mydoc-en.xml; no translation has been done yet. + + + The LANGUAGES definition lists the English locale en; when other translations become available, their locale will just be appended to this definition. + + + Our document has only the main file mydoc-en.xml, but other documents may be split over several files. + The XMLEXTRAFILES-en definition catalogs these additional files so that the document building system can watch them for changes and rebuild the document when necesssary. + This definition is just a simple list of files. + + + The final line, beginning with include, references the main Makefile for the build system. + The Makefile.common file contains all the make(1) targets and rules to actually build the document and the various archives. + + + Add new document translations by: + + + + + Add the translated document files to the document directory. + Be sure to use the proper ${LANG} filename component to keep the filenames similar, but unique. + + + + + Edit the Makefile to append the new ${LANG} to the LANGUAGES definition. + + + + + Create a new XMLEXTRAFILES-${LANG} definition that references any document files other than the base file. + + + +
+ Build System Actions + + To render the XML document into HTML or PDF the command: make html, + make html-nochunk, or make pdf may be used. + + + lists the defined build system targets. + + + Document Building Targets + + + + + + Target + Description + + + + + all + + + Builds the HTML, and the PDF forms of the document in all its defined translations. + + + Also builds the archives, such as tar(1) and rpm(8). + + + + + tarball + + + Builds only the tar(1) archive for all document languages. + + + + + pdf + + + Builds only the PDF document for all document languages. + + + Currently, PDF production is problematic and probably will not work for your document. + + + + + html + + + Builds only the HTML document for each defined translation. + Output is placed in a separate directory: + ${DOCBASE}-${LANG}/; each document section is given its own file within that directory. + + + + + html-nochunks + + + Builds only the HTML document for each defined translation. + Output is placed in a single file: + ${DOCBASE}-${LANG}.html; no other files are created. + + + + + clean + + + Deletes any temporary, or generated files. + Does not erase any HTML, PDF, or archive files. + + + + + distclean + + + Erases all HTML, PDF, and archive files. + Automatically invokes the clean target as well. + + + + + +
+ + You can add your own special targets and rules by placing them at the bottom of the document Makefile, below the include line. + + + Be sure to follow your target definitions with a double colon, not just one. + This will allow you to supply extra steps for the defined targets. + +
+
+ Finding Document Image Files + + Image files, such as .PNG, are often used in documents. + While your image files may be placed anywhere you like, we recommend that you store your image files in a figs/ subdirectory within your document directory. + In other words, place your image picture.png in the mydoc/figs/picture.png file. + + + You may organize your image files into as many subdirectories under figs/ as you choose. + The document building system will recreate your image subdirectory structure in the output documents. + + + In addition, we recommend that you follow our convention on naming the image. + For example, an image often contains a caption or other text. + This text should be translated along with the document content, so keeping words-en.png separate from words-ru.png is a good practice. + + + Sometimes, a document may require images that do not follow the naming convention. + You may still use these images with the document building system, but it requires that you create an ordinary text file containing the image filenames you want to use. + This file must be named figs/Manifest-${LANG} so that the build system can find it as the search for image filenames begins. + + + An easy way to create the figs/Manifest-${LANG} file is shown in . + + + Building A Manifest + +rm -f figs/Manifest-en +find figs -print >/tmp/manifest +mv /tmp/manifest figs/Manifest-en +vi figs/Manifest-en + + + +
+
+ Index: documentation-guide-en.xml =================================================================== RCS file: /cvs/docs/documentation-guide/documentation-guide-en.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- documentation-guide-en.xml 19 Sep 2005 00:00:31 -0000 1.21 +++ documentation-guide-en.xml 13 Dec 2005 21:56:24 -0000 1.22 @@ -22,7 +22,6 @@ - @@ -76,8 +75,6 @@ &STYLE; - &CONVERTING; - &CVS; &ACKNOWLEDGMENTS; --- docs-converting-en.xml DELETED --- --- docs-converting-zh_CN.xml DELETED --- From fedora-docs-commits at redhat.com Wed Dec 14 06:24:23 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Wed, 14 Dec 2005 01:24:23 -0500 Subject: selinux-apache Makefile,1.3,1.4 selinux-apache-it.xml,1.2,1.3 Message-ID: <200512140624.jBE6OOQS021087@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/selinux-apache In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067/selinux-apache Modified Files: Makefile selinux-apache-it.xml Log Message: Italian translation completed Index: Makefile =================================================================== RCS file: /cvs/docs/selinux-apache/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 15 Nov 2005 23:30:58 -0000 1.3 +++ Makefile 14 Dec 2005 06:24:15 -0000 1.4 @@ -8,7 +8,7 @@ # Copyright 2005 Tommy Reynolds, MegaCoder.com ############################################################################### -LANGUAGES = en +LANGUAGES = en it DOCBASE = selinux-apache XMLEXTRAFILES-en = Index: selinux-apache-it.xml =================================================================== RCS file: /cvs/docs/selinux-apache/selinux-apache-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- selinux-apache-it.xml 12 Dec 2005 23:24:22 -0000 1.2 +++ selinux-apache-it.xml 14 Dec 2005 06:24:15 -0000 1.3 @@ -83,7 +83,7 @@
Cominciamo - Questa guida ?? specifica per &FC; &LOCALVER; or &RHEL; + <title>Questa guida ?? specifica per &FC; &LOCALVER; o &RHEL; &LOCALRHELVER; Mentre gran parte della teoria in questa guida ?? applicabile ad altri @@ -139,7 +139,7 @@ L'obbiettivo di sicurezza ?? quello di essere sicuri che &APACHE; stia leggendo solamente il contenuto Web statico, e non faccia altro come - scrivere sui conenuti, connettersi ai sockets dei database, leggere + scrivere sui contenuti, connettersi ai sockets dei database, leggere le home directories degli utenti, etc. @@ -218,8 +218,8 @@ Quando hai usato - system-config-securitylevel per impostare una - bolena &SEL; che ha disattivato la capacit?? di &APACHE; di leggere le home + system-config-securitylevel per impostare la + booleana &SEL; che ha disattivato la capacit?? di &APACHE; di leggere le home directories, ci?? ha assicurato che il dominio httpd_t non abbia i permessi di leggere lo @@ -248,7 +248,7 @@ le informazioni di contesto associate con il file, mentre cp, poich?? crea un nuovo file, eredita quelle della directory genitore. Per esempio, questo ?? il risultato - dell'mv mensionato sopra: + dell'mv menzionato sopra: ls -aZ /var/www/html/ @@ -345,7 +345,7 @@ Avvia system-config-securitylevel. Nel - tab &SEL;, apri il menu Apache + tab &SEL;, apri il men?? Apache sotto Modifica la Policy di SELinux. Cambia la booleana Permette ad httpd di leggere le home directories attivandola. In alternativa, usa @@ -409,7 +409,7 @@ Un idea chiave ?? che attualmente sono coinvolti due - livelli di sicurezza indipendenti. Ci sono i normail permessi Unix + livelli di sicurezza indipendenti. Ci sono i normali permessi Unix (che modifichi con chmod), e le etichette dei files di &SEL;, che modifichi con chcon. Rendere semplicemente un file world-readable @@ -461,12 +461,12 @@ Per un maggior approfondimento sulla discussione sulla filosofia dietro - &SEL;, fa referimento a The Inevitability Of + &SEL;, fa riferimento a The Inevitability Of Failure (http://www.nsa.gov/selinux/papers/inevit-abs.cfm.)
- Hosting viryuale, CGI scripts e suEXEC + Hosting virtuale, CGI scripts e suEXEC La maggior parte delle installazioni di &APACHE; hanno qualche sorta di contenuto dinamico; in particolare, gli scripts CGI sono molto comuni. Questa @@ -625,7 +625,7 @@ httpd_sys_script_rw_t - Contentenuti che uno script CGI pu?? cambiare in qualsiasi modo, inclusa + Contenuti che uno script CGI pu?? cambiare in qualsiasi modo, inclusa la cancellazione. @@ -655,7 +655,7 @@ booleana chiamata httpd_unified. Se questa booleana ?? abilitata, questo vuol dire che - httpd_sys_content_t (ol tipo + httpd_sys_content_t (il tipo usato per ogni cosa fino a questo punto) ?? trattato come l'unione di tutti gli altri tipi succitati. Se questa booleana ?? disabilitata, vuol dire che (per esempio) un CGI script @@ -672,7 +672,7 @@ La booleana httpd_unified ?? stata introdotta affinch?? chiunque possa, per la maggior parte, usare una installazione tipica di &APACHE; senza conoscenza stretta sull'etichettatura - dei files e dei contesti di sicurezza. Comunque, disabilitando questa boleana si garantisce + dei files e dei contesti di sicurezza. Comunque, disabilitando questa booleana si garantisce una sicurezza di gran lunga superiore, ed ?? caldamente raccomandato. @@ -741,7 +741,7 @@ Il primo principale strumento per la personalizzazione delle policy ?? system-config-securitylevel. Esso - possiede un certo numero di policy boolene: + possiede un certo numero di policy booleane: Opzioni booleane per &APACHE; @@ -839,7 +839,7 @@ In altre parole, il CGI script in Python sta provando a scrivere in - una directory che ?? contrassegnata di sola lettura. Ci sono diverse ragioni percui ci?? pu?? + una directory che ?? contrassegnata di sola lettura. Ci sono diverse ragioni per cui ci?? pu?? accadere; potrebbe essere che lo script sia misconfigurato o bacato, per esempio. Ma in questo caso particolare, viene fuori che l'interprete Python normalmente usa generare @@ -910,7 +910,7 @@ - Analizza l'output di <command>audit2allow</command> con attezione + Analizza l'output di <command>audit2allow</command> con attenzione Non dovrai semplicemente mettere tutto l'output di audit2allow nel tuo @@ -952,7 +952,7 @@ httpd_user_script_ro_t e httpd_staff_script_exec_t. Questo fornisce una pi?? forte, mandatoria separazione tra gli - utenti, administratori, ed il sistema. Un utente ordinario ?? + utenti, amministratori, ed il sistema. Un utente ordinario ?? prevenuto dal leggere il contenuto Web di sistema direttamente, ed un compromesso o misconfigurato script CGI di sistema ?? prevenuto dal leggere il contenuto di un utente. @@ -994,7 +994,7 @@ La define(`apache_domain',` - cominica la definizione della macro. All'interno della definizione, il + comincia la definizione della macro. All'interno della definizione, il $1 rappresenta il parametro passato alla macro. @@ -1070,7 +1070,7 @@ - Definisci nuovi tipi per i contenuti. Cio che segue mostra + Definisci nuovi tipi per i contenuti. Ci?? che segue mostra un tipo sola-lettura ed un tipo sola scrittura, ma puoi facilmente definirne differenti, tipi pi?? raffinati. Dopo averli definiti, garantisci al tuo dominio CGI l'accesso a quelli che @@ -1160,11 +1160,11 @@ Sottodomini HTTP multipli Nell'installazione hosting virtuale descritta in , una compromisione o + linkend="sn-suexec-and-cgi-scripts"/>, una compromissione o misconfigurazione del server principale &APACHE; (httpd_t) significa che tutti i siti sono - affetti. Sarebbe bello se tu potessi attalmente avere - servers &APACHE; multipli, ogniuno eseguito nel proprio dominio; + affetti. Sarebbe bello se tu potessi attualmente avere + servers &APACHE; multipli, ognuno eseguito nel proprio dominio; per esempio, httpd_site_t. Questa sottosezione discute semplicemente i problemi e ne delinea @@ -1192,7 +1192,7 @@ abbastanza fortunato da avere un indirizzo ip per dominio, un approccio ?? semplicemente di copiare il binario /usr/sbin/httpd - tutte le volte, ma rietichettando ogniuno differentemente: + tutte le volte, ma rietichettando ognuno differentemente: ls -aZ /usr/sbin/httpd.* @@ -1247,7 +1247,7 @@ webmaster, in questo tipo di installazione stai contando interamente sulla policy &SEL;. C'?? molto altre da fare qui (rendere gli init scripts funzionanti sar?? un po macchinoso), ma questo delinea l'idea generale. - Il resto ti ?? lasciato come un esercizio. + Il resto ti ?? lasciato come esercizio.
From fedora-docs-commits at redhat.com Wed Dec 14 06:47:34 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Wed, 14 Dec 2005 01:47:34 -0500 Subject: selinux-faq selinux-faq-it.xml,1.2,1.3 Message-ID: <200512140647.jBE6lYJw021159@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/selinux-faq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21141/selinux-faq Modified Files: selinux-faq-it.xml Log Message: updated for typos Index: selinux-faq-it.xml =================================================================== RCS file: /cvs/docs/selinux-faq/selinux-faq-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- selinux-faq-it.xml 19 Nov 2005 21:56:49 -0000 1.2 +++ selinux-faq-it.xml 14 Dec 2005 06:47:27 -0000 1.3 @@ -172,7 +172,7 @@ sull'identit?? utente e il proprietario degli oggetti. Ogni utente e programma eseguito da quell'utente ha completa discrezione sugli oggetti dell'utente. Software malizioso o difettoso pu?? fare qualsiasi cosa con i files e - le risosrse controllate attraverso l'utente che ha avviato i processi. + le risorse controllate attraverso l'utente che ha avviato i processi. Se l'utente ?? il super-user o l'applicazione ?? setuid o setgid root, il processo pu?? avere un livello di controllo root sull'intero file @@ -264,7 +264,7 @@ centinaia di problemi nella strict policy. In seguito, ?? divenne ovvio che applicare una singola strict policy ai molti ambienti degli utenti &FED; non era fattibile. Amministrare una singola - strict policy per qualsiasi cosa diversa dal'installazione standard + strict policy per qualsiasi cosa diversa dall'installazione standard avrebbe richiesto un esperienza locale superiore. @@ -397,7 +397,7 @@ - La nuova opzione ?? il metodo piu immediato per + La nuova opzione ?? il metodo pi?? immediato per mostrare il contesto di un soggetto o di un oggetto: @@ -417,7 +417,7 @@ Non c'?? differenza fra un dominio ed un tipo, comunque - il dominio ?? qualche volta usato per riferisi al tipo di un processo. + il dominio ?? qualche volta usato per riferirsi al tipo di un processo. L'uso del dominio in questo modo discende dal tradizionale modello TE, dove i domini ed i tipi sono separati. @@ -471,7 +471,7 @@ Edita /etc/selinux/config e cambia il - tipp di policy in + tipo di policy in SELINUXTYPE=policyname. @@ -596,7 +596,7 @@ Usa system-config-securitylevel per controllare i valori Booleani di specifici demoni. Per esempio, se ritieni - di aver bisogno di sisabilitare &SEL; per Apache per eseguirlo correttamente nel tuo + di aver bisogno di disabilitare &SEL; per Apache per eseguirlo correttamente nel tuo ambiente, puoi disabilitare il valore in system-config-securitylevel. Questo disattiva la transizione della policy definita in @@ -642,7 +642,7 @@ httpd non ?? consentito di leggere i tipi di sicurezza per le directory ed i files che vengono creati nelle directory home degli utenti. Per risolvere questo, cambiate i contesti - di sicurezza della cartella e dei suoi contenuti ricursivamente usando + di sicurezza della cartella e dei suoi contenuti ricorsivamente usando l'opzione : @@ -1012,7 +1012,7 @@ Il contesto iniziale per una nuova directory utente ha un identit?? di - root. In seguinto la rietichettatura del + root. In seguito la rietichettatura del file system cambier?? l'identit?? a system_u. Queste sono funzionalmente le stesse poich?? il ruolo ed il tipo sono identici @@ -1031,7 +1031,7 @@ Il team di sviluppo di &FC; ha preso una direzione leggermente differente - rispetto alla pratica di &SEL; esistente. Le transizioni del contesto di sicurzza adesso + rispetto alla pratica di &SEL; esistente. Le transizioni del contesto di sicurezza adesso sono integrate in su via pam_selinux. Questo semplifica enormemente l'uso del sistema. @@ -1328,7 +1328,7 @@ Installando o aggiornando i pacchetti della policy, la nuova policy - verr?? caricata non appena intallati i nuovi files. In modo analogo, installando o aggiornando il + verr?? caricata non appena installati i nuovi files. In modo analogo, installando o aggiornando il pacchetto di sorgenti della policy ricreer?? sia il file policy.version che il file file_contexts, quindi @@ -1379,7 +1379,7 @@ - I nuovi pacchetti policy potranno disabilitere il mio sistema? + I nuovi pacchetti policy potranno disabilitare il mio sistema? @@ -1419,7 +1419,7 @@ Il meglio su cui puoi scommettere ?? dare un occhiata ai files di policy in /etc/selinux/policyname/src/policy/ e provare a sperimentare. Osserva i messaggi avc - denied in /var/log/messages per avere degli indizzi. + denied in /var/log/messages per avere degli indizi. Uno strumento utile per uno scrittore di policy ?? @@ -1496,7 +1496,7 @@ applicazione KDE viene eseguita nel dominio per kdeinit. - I problemi spesso vengono fuorui quando si installa &SEL; perch?? non ?? + I problemi spesso vengono fuori quando si installa &SEL; perch?? non ?? possibile rietichettare /tmp e /var/tmp. Non c'?? un buon metodo di determinare quale file dovrebbe avere quale contesto. @@ -1540,7 +1540,7 @@ - Il file system deve supportare le estichette + Il file system deve supportare le etichette xattr nel giusto namespace security.*. Oltre a ext2/ext3, XFS ha recentemente aggiunto il supporto per le necessarie @@ -1568,7 +1568,7 @@ - Di che tipo di implementazioni/applicazioni/systemi, etc. dovr?? tener conto + Di che tipo di implementazioni/applicazioni/sistemi, etc. dovr?? tener conto per l'uso con &SEL;? @@ -1585,7 +1585,7 @@ In questi servers di nicchia, potrai bloccare la policy molto strettamente. Questo sar?? facilitato dal piccolo numero di interazioni con gli altri componenti. In modo simile, una macchina dedicata che - esegue un applicazione specialistica di terze parti sar?? un buon cadidato. + esegue un applicazione specialistica di terze parti sar?? un buon candidato. In futuro, &SEL; ?? orientato a tutti gli ambienti. Per questo, From fedora-docs-commits at redhat.com Wed Dec 14 15:55:42 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Wed, 14 Dec 2005 10:55:42 -0500 Subject: documentation-guide docs-getting-files-en.xml,1.9,1.10 Message-ID: <200512141555.jBEFtgru006175@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6139 Modified Files: docs-getting-files-en.xml Log Message: Fixed minor typo's. Added admonition about preferring PNG to JPG. Index: docs-getting-files-en.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-getting-files-en.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- docs-getting-files-en.xml 13 Dec 2005 21:56:24 -0000 1.9 +++ docs-getting-files-en.xml 14 Dec 2005 15:55:34 -0000 1.10 @@ -200,7 +200,7 @@ The building system heavily leverages the make(1) tool and shell scripts to automate these activities, but authors need no prior experience with either shell scripts or a Makefile. While individual documents do have their own Makefile, it is only a few lines long and very simple. - The document Makefile content is designed for cut's paste. + The document Makefile content is designed for cut'n paste. As an example, shows the whole Makefile for a simple document having only one file and one language. @@ -351,12 +351,24 @@
- Finding Document Image Files + Using Document Image Files Image files, such as .PNG, are often used in documents. While your image files may be placed anywhere you like, we recommend that you store your image files in a figs/ subdirectory within your document directory. In other words, place your image picture.png in the mydoc/figs/picture.png file. + + Use PNG Images, Not JPG + + Depending on the output media, sometimes images may be scaled, + streteched, or squashed. + To minimize any distortions, we recommend that you use only + PDF images and avoid JPG files. + + + You may find the convert(1) program, from the ImageMagick RPM package, provides a convenient way to reformat any JPG images you already have. + + You may organize your image files into as many subdirectories under figs/ as you choose. The document building system will recreate your image subdirectory structure in the output documents. @@ -365,6 +377,7 @@ In addition, we recommend that you follow our convention on naming the image. For example, an image often contains a caption or other text. This text should be translated along with the document content, so keeping words-en.png separate from words-ru.png is a good practice. + An image file with no text can be named just picture.png, for example. Sometimes, a document may require images that do not follow the naming convention. From fedora-docs-commits at redhat.com Wed Dec 14 23:00:00 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Wed, 14 Dec 2005 18:00:00 -0500 Subject: install-guide fedora-install-guide-techref-en.xml, NONE, 1.1 Makefile, 1.15, 1.16 fedora-install-guide-adminoptions-en.xml, 1.1, 1.2 fedora-install-guide-en.xml, 1.31, 1.32 Message-ID: <200512142300.jBEN00N6020673@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20651 Modified Files: Makefile fedora-install-guide-adminoptions-en.xml fedora-install-guide-en.xml Added Files: fedora-install-guide-techref-en.xml Log Message: - Added a first draft "Technical References" section, to address #173582 - Minor edits of Management Options section --- NEW FILE fedora-install-guide-techref-en.xml --- Appendix: Technical References This document provides a reference for using the &FED; installation software, known as anaconda. To learn more about anaconda, visit the project webpage: . Both anaconda and &FED; systems use a common set of software components. For detailed information on key technologies, refer to the websites listed below: Boot Loader By default, &FED; uses the GRUB boot loader. Refer to for more information. Disk Partitioning &FED; uses parted to partition disks. Refer to for more information. Graphics System Both the installation system and &FED; itself use the Xorg suite to provide graphical displays. Refer to for more information. Remote Display &FC; and anaconda include VNC to provide remote display capabilities. For more information about VNC, refer to the documentation on the RealVNC website . Firewall &FED; uses the netfilter framework. The Netfilter project website provides documentation for netfilter, and the iptables administration facilities: . Access Control &SEL; provides Mandatory Access Control (MAC) capabilities that supplement the standard Linux security systems. Refer to the &SEL; FAQ for more information: . Software Installation &FED; uses yum to manage the RPM packages that make up the system. Refer to for more information. Index: Makefile =================================================================== RCS file: /cvs/docs/install-guide/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile 12 Dec 2005 02:21:54 -0000 1.15 +++ Makefile 14 Dec 2005 22:59:52 -0000 1.16 @@ -14,7 +14,7 @@ DOCBASE = fedora-install-guide define XMLEXTRAFILES_template -XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-adminoptions-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml +XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-adminoptions-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-techref-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml endef $(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG}))) Index: fedora-install-guide-adminoptions-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-adminoptions-en.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-adminoptions-en.xml 12 Dec 2005 02:21:54 -0000 1.1 +++ fedora-install-guide-adminoptions-en.xml 14 Dec 2005 22:59:52 -0000 1.2 @@ -46,28 +46,8 @@
-
- Installing &FC; with Expert Mode - - - The expert mode enables you to run the installation process with - additional options for hardware configuration. - - - - To run the installation process in expert mode, enter: - - - linux expert - - - This is untested. - - -
-
- Automating the Installation + Automating the Installation with Kickstart Kickstart. @@ -85,7 +65,7 @@
- Interface Options + Configuring the Installation Interface To run the installation process in text mode, enter: @@ -107,6 +87,26 @@
+ +
+ Installing &FC; with Expert Mode + + + The expert mode enables you to run the installation process with + additional options for hardware configuration. + + + + To run the installation process in expert mode, enter: + + + linux expert + + + This is untested. + + +
Performing a Memory (RAM) Test @@ -124,7 +124,7 @@ To load the memtest86 memory test utility, enter memtest86 at the boot: - . The utility immediately starts the first test. By default, + prompt. The utility immediately starts the first test. By default, memtest86 carries out a total of ten tests. Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fedora-install-guide-en.xml 12 Dec 2005 02:21:54 -0000 1.31 +++ fedora-install-guide-en.xml 14 Dec 2005 22:59:52 -0000 1.32 @@ -6,8 +6,8 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -34,6 +34,7 @@ + ]> @@ -185,6 +186,16 @@ + + 1.0.8 + 2005-12-14 + StuartEllis + + + Added Technical References section. + + + @@ -220,6 +231,8 @@ &ADMINOPTIONS; + &TECHREF; + &ACKNOWLEDGEMENTS; From fedora-docs-commits at redhat.com Thu Dec 15 03:20:04 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Wed, 14 Dec 2005 22:20:04 -0500 Subject: docs-common/bin xmldiff, NONE, 1.1 xmldiff.pl, NONE, 1.1 xmlpp, NONE, 1.1 Message-ID: <200512150320.jBF3K4v3000653@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv565 Added Files: xmldiff xmldiff.pl xmlpp Log Message: Here is a very simple XMLDIFF tool that I've hacked to work reasonably with the FDP files. Look in the "xmldiff.pl" file for information about its origin. --- NEW FILE xmldiff --- #!/bin/sh export PATH=`dirname $0`:${PATH} exec perl `basename $0`.pl $@ --- NEW FILE xmldiff.pl --- #!/usr/bin/perl # # Copyright (c) 2002, DecisionSoft Limited All rights reserved. # Please see: # http://software.decisionsoft.com/licence.html # for more information. # # Modified for the Fedora Docs Project by Tommy.Reynolds at MegaCoder.com # # # xmldiff: xmldiff program - uses xmlpp, which must be on the ${PATH} # #Change this if xmlpp is not in your current path #for example: $XMLPP = "./xmlpp"; $XMLPP = "xmlpp"; use Getopt::Std; getopts('tscupChHSi'); if ($opt_h || @ARGV != 2) { usage(); } my $diffOpts; my $outputFmt = $opt_u + $opt_c + $opt_s + $opt_p + $opt_C; if( $outputFmt == 0 ) { $outputFmt = $opt_p = 1; } if( $outputFmt > 1 ) { print STDERR "Error: Only one mode may be specified\n"; usage(); } if( $opt_s ) { # Standard diff, no playing around } if ( $opt_c ) { # Plain context diff $diffOpts .= "-c "; } if( $opt_u ) { # Plain unified diff $diffOpts .= "-u "; } if( $opt_p ) { # Colorized unified diff # $diffOpts .= "-u "; $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; } if( $opt_C ) { $diffOpts .= "--changed-group-format='\n<<<<<<<<<<<<<<\n%<==============\n%>>>>>>>>>>>>>>>\n\n' "; $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; } if( $opt_H ) { $diffOpts .= "--changed-group-format='%<%>' "; $diffOpts .= " --new-group-format='%>' "; $diffOpts .= "--old-group-format='%<' "; $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; } # Set up xmlpp options my $prettyOpts = $opt_t ? "-t " : ""; $prettyOpts .= $opt_S ? "-S " : ""; $prettyOpts .= $opt_H ? "-H " : ""; $prettyOpts .= "-s -e "; $file1 = "xmlppTEMP1.$$"; $file2 = "xmlppTEMP2.$$"; my $results = 0; $results += system("$XMLPP $prettyOpts '$ARGV[0]' > $file1"); $results += system("$XMLPP $prettyOpts '$ARGV[1]' > $file2"); if($opt_H) { print "\n"; print " \n"; print " XML Diff\n"; print " \n"; print " \n"; print " 
";
	$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
	# Do not add extra whitespace before the
print "\n"; print " \n"; print "\n"; } else { $results += system("/usr/bin/diff -bB $diffOpts $file1 $file2"); } unlink($file1,$file2); exit( $results ); sub usage { print STDERR < Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv845 Modified Files: xmldiff Log Message: Fixed bug in locating helper script "xmlpp". Index: xmldiff =================================================================== RCS file: /cvs/docs/docs-common/bin/xmldiff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmldiff 15 Dec 2005 03:19:56 -0000 1.1 +++ xmldiff 15 Dec 2005 03:38:33 -0000 1.2 @@ -1,3 +1,5 @@ #!/bin/sh -export PATH=`dirname $0`:${PATH} -exec perl `basename $0`.pl $@ +mydir=`dirname $0` +me=`basename $0` +export PATH=${mydir}:${PATH} +exec /usr/bin/perl ${mydir}/${me}.pl $@ From fedora-docs-commits at redhat.com Thu Dec 15 03:59:45 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Wed, 14 Dec 2005 22:59:45 -0500 Subject: docs-common/bin xmlpp,1.1,1.2 Message-ID: <200512150359.jBF3xjtt001690@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1668 Modified Files: xmlpp Log Message: Ignore elements for now. Index: xmlpp =================================================================== RCS file: /cvs/docs/docs-common/bin/xmlpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmlpp 15 Dec 2005 03:19:56 -0000 1.1 +++ xmlpp 15 Dec 2005 03:59:38 -0000 1.2 @@ -128,6 +128,7 @@ parsePI("$1\n"); } elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) { parseDoctype("$1"); + } elsif ($input =~ s/^(<\!ENTITY.*>)//s) { } else { last; } From fedora-docs-commits at redhat.com Thu Dec 15 05:42:13 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 15 Dec 2005 00:42:13 -0500 Subject: docs-common/bin xmlpp,1.2,1.3 Message-ID: <200512150542.jBF5gDC5006187@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6168 Modified Files: xmlpp Log Message: Output elements, so they can now be compared. Index: xmlpp =================================================================== RCS file: /cvs/docs/docs-common/bin/xmlpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmlpp 15 Dec 2005 03:59:38 -0000 1.2 +++ xmlpp 15 Dec 2005 05:42:05 -0000 1.3 @@ -2,10 +2,10 @@ # # Copyright (c) 2002, DecisionSoft Limited All rights reserved. -# Please see: +# Please see: # http://software.decisionsoft.com/licence.html # for more information. -# +# # $Revision$ # @@ -37,7 +37,7 @@ # expect to find attributeOrdering.txt file in same directory # as xmlpp is being run from - + my $scriptDir = $0; if ($scriptDir =~ m#/#){ $scriptDir =~ s#/[^/]+$##; @@ -45,22 +45,22 @@ else{ $scriptDir ="."; } - + # get attribute ordering from external file if (open(SORTLIST, "<$scriptDir/attributeOrdering.txt")) { @sortlist = ; chomp @sortlist; close (SORTLIST); @specialSort = grep(/^\w+/, @sortlist); - } - else { + } + else { # print STDERR "Could not open $scriptDir/attributeOrdering.txt: $!\nWARNING attribute sorting will only be alphabetic\n\n"; } } # set line separator to ">" speeding up parsing of XML files -# with no line breaks +# with no line breaks $/ = ">"; @@ -78,7 +78,7 @@ } if (!$opt_z && scalar(@ARGV) > 1) { - print STDERR "Warning: Multiple files specified without -z option\n"; + print STDERR "Warning: Multiple files specified without -z option\n"; } my $fh; @@ -103,71 +103,72 @@ my $input; while ($input .= <$fh>) { - while ($input) { - if ($input =~ s/^<($re_name)((?:\s+$re_name\s*=\s*$re_attr)*\s*)(\/?)>(.*)$/$4/s ) { - my %attr; - my ($name,$attr,$selfclose) = ($1,$2,$3); - while ($attr =~ m/($re_name)\s*=\s*($re_attr)/gs) { - my ($name,$value) = ($1,$2); - $value =~ s/^["'](.*)["']$/$1/s; - $attr{$name} = $value; - } - if ($opt_e) { - parseStart($name, 0, %attr); - if ($selfclose) { parseEnd($name) } - } else { - parseStart($name, $selfclose, %attr); - } - } elsif ($input =~ s/^<\/($re_name)\s*>(.*)$/$2/s) { - parseEnd($1); - } elsif ($input =~ s/^(.*)$/$2/s) { - parseComment($1); - } elsif ($input =~ s/^([^<]+)(.*)$/$2/s) { - parseDefault($1); - } elsif ($input =~ s/^(<\?[^>]*\?>)(.*)$/$2/s) { - parsePI("$1\n"); - } elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) { - parseDoctype("$1"); - } elsif ($input =~ s/^(<\!ENTITY.*>)//s) { - } else { - last; - } - } - if (eof($fh)) { - last; - } + while ($input) { + if ($input =~ s/^<($re_name)((?:\s+$re_name\s*=\s*$re_attr)*\s*)(\/?)>(.*)$/$4/s ) { + my %attr; + my ($name,$attr,$selfclose) = ($1,$2,$3); + while ($attr =~ m/($re_name)\s*=\s*($re_attr)/gs) { + my ($name,$value) = ($1,$2); + $value =~ s/^["'](.*)["']$/$1/s; + $attr{$name} = $value; + } + if ($opt_e) { + parseStart($name, 0, %attr); + if ($selfclose) { parseEnd($name) } + } else { + parseStart($name, $selfclose, %attr); + } + } elsif ($input =~ s/^<\/($re_name)\s*>(.*)$/$2/s) { + parseEnd($1); + } elsif ($input =~ s/^(.*)$/$2/s) { + parseComment($1); + } elsif ($input =~ s/^([^<]+)(.*)$/$2/s) { + parseDefault($1); + } elsif ($input =~ s/^(<\?[^>]*\?>)(.*)$/$2/s) { + parsePI("$1\n"); + } elsif ($input =~ s/^(<\!DOCTYPE[^\[>]*(\[[^\]]*\])?[^>]*>)(.*)$/$3/s) { + parseDoctype("$1"); + } elsif ($input =~ s/^(<\!ENTITY[^>]*>)(.*)$/$2/s) { + $output .= "$1"; + } else { + last; + } + } + if (eof($fh)) { + last; + } } if ($input) { - $input =~ m/([^\n]+)/gs; - print STDERR "WARNING: junk remaining on input: $1\n"; + $input =~ m/([^\n]+)/gs; + print STDERR "WARNING: junk remaining on input: $1\n"; } $fh->close(); if (!$opt_z) { - if(!$opt_H){ - print "$output\n" - } else { - print html_escape($output)."\n" - } + if(!$opt_H){ + print "$output\n" + } else { + print html_escape($output)."\n" + } } else { - if ($input) { - print STDERR "Not overwriting file\n"; - } else { - open FOUT,"> $filename" or die "Cannot overwrite file: $!"; - if(!$opt_H){ - print FOUT "$output\n" - } else { - print FOUT html_escape($output)."\n" - } - close FOUT - } + if ($input) { + print STDERR "Not overwriting file\n"; + } else { + open FOUT,"> $filename" or die "Cannot overwrite file: $!"; + if(!$opt_H){ + print FOUT "$output\n" + } else { + print FOUT html_escape($output)."\n" + } + close FOUT + } } } while ( !$stdin && $opt_z && ($fh = open_next_file(\$filename)) ); - + sub parseStart { @@ -175,21 +176,21 @@ my $selfclose = shift; my %attr = @_; - $textContent =~ s/\s+$//; + $textContent =~ s/\s+$//; printContent($textContent); if($inAnnotation) { - return; + return; } if($schemaHackMode and $s =~ m/(^|:)annotation$/) { - $inAnnotation = 1; - $textContent = ''; - $lastTag = 1; - return; + $inAnnotation = 1; + $textContent = ''; + $lastTag = 1; + return; } if (length($output)) { - $output .= "\n"; + $output .= "\n"; } $output .= " " x $indent; @@ -211,59 +212,59 @@ # alphabetic order). Else create a list that has attributes needing # special ordering. foreach $attribute (@alphaSorted){ - $isSpecial = 0; - foreach $sortAttrib (@specialSort){ - if ($attribute eq $sortAttrib){ - push @needSpecialSort, $attribute; - $isSpecial = 1; - } - } - if (!$isSpecial){ - push @final, $attribute; - } + $isSpecial = 0; + foreach $sortAttrib (@specialSort){ + if ($attribute eq $sortAttrib){ + push @needSpecialSort, $attribute; + $isSpecial = 1; + } + } + if (!$isSpecial){ + push @final, $attribute; + } } # now read through the specialSort list backwards looking for - # any match in the needSpecialSort list. Unshift this onto the + # any match in the needSpecialSort list. Unshift this onto the # front of the final array to maintain proper order. foreach my $attribute (reverse @specialSort){ - foreach (@needSpecialSort){ - if ($attribute eq $_){ - unshift @final, $attribute; - } - } + foreach (@needSpecialSort){ + if ($attribute eq $_){ + unshift @final, $attribute; + } + } } @k = @final; } foreach my $attr (@k) { - # - # Remove (min|max)Occurs = 1 if schemaHackMode - # - if ($schemaHackMode and $attr =~ m/^(minOccurs|maxOccurs)$/ and $attr{$attr} eq "1") { - next; - } - - if ($splitAttributes) { - $output .= "\n"." " x $indent." "; - } - if ($attr{$attr} =~ /'/) { - $output .= " $attr=\"$attr{$attr}\""; - } else { - $output .= " $attr='$attr{$attr}'"; - } + # + # Remove (min|max)Occurs = 1 if schemaHackMode + # + if ($schemaHackMode and $attr =~ m/^(minOccurs|maxOccurs)$/ and $attr{$attr} eq "1") { + next; + } + + if ($splitAttributes) { + $output .= "\n"." " x $indent." "; + } + if ($attr{$attr} =~ /'/) { + $output .= " $attr=\"$attr{$attr}\""; + } else { + $output .= " $attr='$attr{$attr}'"; + } } if ($splitAttributes and @k) { - $output .= "\n"." " x $indent; + $output .= "\n"." " x $indent; } if ($selfclose) { - $output .= " />"; - $lastTag = 0; + $output .= " />"; + $lastTag = 0; } else { - $output .= ">"; - $indent++; - $lastTag = 1; + $output .= ">"; + $indent++; + $lastTag = 1; } $textContent = ''; } @@ -272,21 +273,21 @@ my $s = shift; if($inAnnotation) { - if($s =~ m/(^|:)annotation$/) { - $inAnnotation = 0; - } - return; + if($s =~ m/(^|:)annotation$/) { + $inAnnotation = 0; + } + return; } if($normaliseWhiteSpace) { - $textContent =~ s/^\s*(.*?)\s*$/$1/; + $textContent =~ s/^\s*(.*?)\s*$/$1/; } $indent--; printContent($textContent); if ($lastTag == 0) { - $output .= "\n"; - $output .= " " x $indent; - } + $output .= "\n"; + $output .= " " x $indent; + } $output .= ""; $textContent = ''; $lastTag = 0; @@ -317,7 +318,7 @@ } sub parseComment { - my $s = shift; + my $s = shift; if($inAnnotation) { return } printContent($textContent,1); if ($s =~ /([^\<]*)(<.*>)(.*)/ms) { @@ -332,9 +333,9 @@ } $s =~ s/\n\s*$/\n /msg; if ($newLineComments) { - $output .= "\n\n"; + $output .= "\n\n"; } else { - $output .= ""; + $output .= ""; } $textContent=''; } @@ -345,16 +346,16 @@ my ($LF,$ret) = ("",""); if ($s =~ m/\n\s*$/) { - $LF = "\n"; + $LF = "\n"; } if ($s =~ m/^[\s\n]*$/) { - $ret = undef; + $ret = undef; } else { - $output .= "$s"; - $ret = 1; + $output .= "$s"; + $ret = 1; } if ($printLF) { - $output .= $LF; + $output .= $LF; } } @@ -371,11 +372,11 @@ my $filename = shift; $$filename = shift @ARGV; while ($$filename and ! -f $$filename) { - print STDERR "WARNING: Could not find file: $$filename\n"; - $$filename = shift @ARGV; + print STDERR "WARNING: Could not find file: $$filename\n"; + $$filename = shift @ARGV; } if(!$$filename) { - return undef; + return undef; } my $fh = new FileHandle; $fh->open("< $$filename") or die "Can't open $$filename: $!"; From fedora-docs-commits at redhat.com Thu Dec 15 05:42:53 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 15 Dec 2005 00:42:53 -0500 Subject: docs-common/bin xmldiff.pl,1.1,1.2 Message-ID: <200512150542.jBF5grmb006215@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6195 Modified Files: xmldiff.pl Log Message: Cleaned up tacky if-series into an elegant if-elsif checklist ;-) Index: xmldiff.pl =================================================================== RCS file: /cvs/docs/docs-common/bin/xmldiff.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmldiff.pl 15 Dec 2005 03:19:56 -0000 1.1 +++ xmldiff.pl 15 Dec 2005 05:42:45 -0000 1.2 @@ -1,12 +1,12 @@ #!/usr/bin/perl # # Copyright (c) 2002, DecisionSoft Limited All rights reserved. -# Please see: -# http://software.decisionsoft.com/licence.html +# Please see: +# http://software.decisionsoft.com/licence.html # for more information. # # Modified for the Fedora Docs Project by Tommy.Reynolds at MegaCoder.com -# +# # # xmldiff: xmldiff program - uses xmlpp, which must be on the ${PATH} @@ -37,29 +37,24 @@ if( $opt_s ) { # Standard diff, no playing around -} -if ( $opt_c ) { +} elsif( $opt_c ) { # Plain context diff $diffOpts .= "-c "; -} -if( $opt_u ) { +} elsif( $opt_u ) { # Plain unified diff $diffOpts .= "-u "; -} -if( $opt_p ) { +} elsif( $opt_p ) { # Colorized unified diff # $diffOpts .= "-u "; $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; -} -if( $opt_C ) { +} elsif( $opt_C ) { $diffOpts .= "--changed-group-format='\n<<<<<<<<<<<<<<\n%<==============\n%>>>>>>>>>>>>>>>\n\n' "; $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; -} -if( $opt_H ) { +} elsif( $opt_H ) { $diffOpts .= "--changed-group-format='%<%>' "; $diffOpts .= " --new-group-format='%>' "; $diffOpts .= "--old-group-format='%<' "; From fedora-docs-commits at redhat.com Thu Dec 15 06:00:09 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 15 Dec 2005 01:00:09 -0500 Subject: docs-common Makefile.common,1.21,1.22 Message-ID: <200512150600.jBF609nd006300@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6273 Modified Files: Makefile.common Log Message: Added a "make OLD=old.xml NEW=new.xml diff" target to utilize the xmldiff tool a bit easier. Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile.common 12 Dec 2005 16:32:16 -0000 1.21 +++ Makefile.common 15 Dec 2005 06:00:02 -0000 1.22 @@ -34,6 +34,9 @@ ifeq (${FDPDIR},) FDPDIR = .. endif +ifeq (${FDPBIN},) +FDPBIN = ${FDPDIR}/docs-common/bin +endif ifeq (${XSLPDF},) XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl endif @@ -84,9 +87,8 @@ cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css [ -z "${HTMLCSSEXTRA}" ] || \ cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png - [ ! -d figs ] || \ - ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ - -l ${LANG} figs $(DOCBASE)-$(1) + [ ! -d figs ] || ${FDPBIN}/copy-figs -v -f '*.png' \ + -l ${LANG} figs $(DOCBASE)-$(1) endef # html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html) @@ -153,5 +155,18 @@ @echo "LANGUAGES=\"$(LANGUAGES)\"" # ######################################################################### +# Show differences between two file revisions. To use this tool: +# $ make OLD=old.xml NEW=new.xml diff +# The ${DIFFS} macro can select a different output format: +# $ make DIFFS=-C OLD=old.xml NEW=new.xml diff + +OLD =define-me-old.xml +NEW =define-me-new.xml +DIFFS =-u + +diff:: + ${FDPBIN}/xmldiff ${DIFFS} ${OLD} ${NEW} +# +######################################################################### # End of Makefile.common ######################################################################### From fedora-docs-commits at redhat.com Thu Dec 15 06:12:35 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Thu, 15 Dec 2005 01:12:35 -0500 Subject: selinux-apache selinux-apache-it.xml,1.3,1.4 Message-ID: <200512150612.jBF6CZlh007921@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/selinux-apache In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7902/selinux-apache Modified Files: selinux-apache-it.xml Log Message: missed translated phrase Index: selinux-apache-it.xml =================================================================== RCS file: /cvs/docs/selinux-apache/selinux-apache-it.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- selinux-apache-it.xml 14 Dec 2005 06:24:15 -0000 1.3 +++ selinux-apache-it.xml 15 Dec 2005 06:12:07 -0000 1.4 @@ -728,7 +728,7 @@
- Debugging Problems and Customizing the Policy + Problemi di debugging e personalizzazione della policy Quando applichi per la prima volta &SEL; e &APACHE;, se la tua configurazione &APACHE; varia molto da quella predefinita di &FC; o &RHEL;, potrai From fedora-docs-commits at redhat.com Thu Dec 15 06:15:59 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 15 Dec 2005 01:15:59 -0500 Subject: docs-common/bin xmldiff.pl,1.2,1.3 xmlpp,1.3,NONE Message-ID: <200512150615.jBF6FxoU007962@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940 Modified Files: xmldiff.pl Removed Files: xmlpp Log Message: Switched to our own XMLFORMAT tool to prepare the files for comparison. As long as the original files have been normalized by XMLFORMAT, then the line numbers output by XMLDIFF will be correct. Why would you *not* work with normalized files? Index: xmldiff.pl =================================================================== RCS file: /cvs/docs/docs-common/bin/xmldiff.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmldiff.pl 15 Dec 2005 05:42:45 -0000 1.2 +++ xmldiff.pl 15 Dec 2005 06:15:49 -0000 1.3 @@ -13,12 +13,12 @@ # #Change this if xmlpp is not in your current path -#for example: $XMLPP = "./xmlpp"; -$XMLPP = "xmlpp"; +#for example: $XMLFORMAT = "./xmlpp"; +# $XMLFORMAT = "xmlpp"; use Getopt::Std; -getopts('tscupChHSi'); +getopts('scupChi'); if ($opt_h || @ARGV != 2) { usage(); @@ -54,45 +54,18 @@ $diffOpts .= "--new-line-format='+ %l\n' "; $diffOpts .= "--old-line-format='- %l\n' "; $diffOpts .= "--unchanged-line-format=' %l\n' "; -} elsif( $opt_H ) { - $diffOpts .= "--changed-group-format='%<%>' "; - $diffOpts .= " --new-group-format='%>' "; - $diffOpts .= "--old-group-format='%<' "; - $diffOpts .= "--new-line-format='+ %l\n' "; - $diffOpts .= "--old-line-format='- %l\n' "; - $diffOpts .= "--unchanged-line-format=' %l\n' "; } -# Set up xmlpp options - -my $prettyOpts = $opt_t ? "-t " : ""; -$prettyOpts .= $opt_S ? "-S " : ""; -$prettyOpts .= $opt_H ? "-H " : ""; -$prettyOpts .= "-s -e "; +$XMLFORMAT = "xmlformat"; $file1 = "xmlppTEMP1.$$"; $file2 = "xmlppTEMP2.$$"; my $results = 0; -$results += system("$XMLPP $prettyOpts '$ARGV[0]' > $file1"); -$results += system("$XMLPP $prettyOpts '$ARGV[1]' > $file2"); - -if($opt_H) { - print "\n"; - print " \n"; - print " XML Diff\n"; - print " \n"; - print " \n"; - print " 
";
-	$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2");
-	# Do not add extra whitespace before the
- print "\n"; - print " \n"; - print "\n"; +$results += system("$XMLFORMAT '$ARGV[0]' > $file1"); +$results += system("$XMLFORMAT '$ARGV[1]' > $file2"); -} else { - $results += system("/usr/bin/diff -bB $diffOpts $file1 $file2"); -} +$results += system("/usr/bin/diff -bB $diffOpts $file1 $file2"); unlink($file1,$file2); @@ -111,9 +84,7 @@ -C vaguely CVS like unified diff options: - -H HTML output -t split attributes - good for spotting changes in attributes - -S schema hack mode - good for diffing schemas -i ignore element and attribute contents EOF --- xmlpp DELETED --- From fedora-docs-commits at redhat.com Sat Dec 17 12:22:08 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 17 Dec 2005 07:22:08 -0500 Subject: install-guide fedora-install-guide-adminoptions-zh_CN.xml, NONE, 1.1 fedora-install-guide-techref-zh_CN.xml, NONE, 1.1 fedora-install-guide-diskpartitioning-zh_CN.xml, 1.3, 1.4 fedora-install-guide-intro-zh_CN.xml, 1.4, 1.5 fedora-install-guide-nextsteps-zh_CN.xml, 1.2, 1.3 fedora-install-guide-other-instmethods-zh_CN.xml, 1.4, 1.5 fedora-install-guide-zh_CN.xml, 1.2, 1.3 Message-ID: <200512171222.jBHCM8ZY026030@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26006 Modified Files: fedora-install-guide-diskpartitioning-zh_CN.xml fedora-install-guide-intro-zh_CN.xml fedora-install-guide-nextsteps-zh_CN.xml fedora-install-guide-other-instmethods-zh_CN.xml fedora-install-guide-zh_CN.xml Added Files: fedora-install-guide-adminoptions-zh_CN.xml fedora-install-guide-techref-zh_CN.xml Log Message: update translation, add appendix 1 (adm options and tech ref) --- NEW FILE fedora-install-guide-adminoptions-zh_CN.xml --- ??????: ???????????? &FED; ?????????????????????????????????????????????????????????
???????????? ??????????????????????????? boot: ?????????????????? linux option??? ????????????????????????????????????????????????????????????????????? linux option1 option2
?????????????????????????????? ???????????????????????? #1 ???????????? Linux ????????????????????????????????? &FED; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????? linux rescue ???????????????????????????????????????????????????????????????????????????????????????
?????? Kickstart ?????????????????? Kickstart(????????????)
???????????? VNC, ????????????????????????????????????????????????
?????????????????? ???????????????????????????????????????????????? linux text ????????????????????????????????????
?????????????????? ????????????????????? ????????????????????????????????????????????????????????????????????????????????????
????????????????????? &FC; ???????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????? linux expert ???????????????
???????????? (RAM) ?????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FED; ???????????????????????????????????????????????????????????????????????? ????????? memtest86 ???????????????????????? boot: ?????????????????? memtest86?????????????????????????????????????????????????????????memtest86 ???????????????????????? ?????????????????????????????????????????????????????? Esc???
???????????? ??????????????? (console?????????)??????????????????????????????????????????????????????shell ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????? ????????????????????? ?????? ????????? ????????? Ctrl Alt F7 Shell ??????????????? Ctrl Alt F2 ??????????????? Ctrl Alt F3 ?????????????????? Ctrl Alt F4
???????????? ?????? Installing Packages ???????????????????????????????????????????????????????????? CtrlAltDel ?????????????????????????????????????????????&FED; ?????????????????????????????????????????????????????????????????????
--- NEW FILE fedora-install-guide-techref-zh_CN.xml --- ????????????????????? ?????????????????????????????? &FED; ???????????????????????? anaconda ????????????????????????????????? anaconda ??????????????????????????????????????? anaconda ??? &FED; ?????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ??????????????????&FED; ?????? GRUB ?????????????????????????????? ??? ???????????? &FED; ?????? parted ??????????????????????????? ??? ???????????? ??????????????? &FED; ??????????????? Xorg ????????????????????????????????????????????? ??? ???????????? &FC; ??? anaconda ????????? VNC ???????????????????????????????????? VNC ??????????????????????????? RealVNC ?????? ??????????????? ????????? &FED; ?????? netfilter ?????????Netfilter ????????????????????? netfilter ?????????????????? iptables ??????????????? ??? ???????????? &SEL; ????????? Mandatory Access Control (MAC) ????????????????????? Linux ????????????????????????????????? &SEL; FAQ?????? ???????????? &FED; ?????? yum ???????????????????????? RPM ????????????????????? ??? Index: fedora-install-guide-diskpartitioning-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-diskpartitioning-zh_CN.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-diskpartitioning-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.3 +++ fedora-install-guide-diskpartitioning-zh_CN.xml 17 Dec 2005 12:22:01 -0000 1.4 @@ -62,7 +62,11 @@ ???????????? <filename>/root</filename> - / (partitionroot ???) ?????????????????????????????????partition/root/root (???????????? "slash-root") ?????????????????????????????????????????? + / + + partition + root + (???) ?????????????????????????????????partition/root/root (???????????? "slash-root") ?????????????????????????????????????????? ??????????????????????????? Index: fedora-install-guide-intro-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-zh_CN.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-install-guide-intro-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.4 +++ fedora-install-guide-intro-zh_CN.xml 17 Dec 2005 12:22:01 -0000 1.5 @@ -7,4 +7,4 @@ &FC; ???????????????????????????????????????????????????????????????&FC; ????????????????????????????????????????????????????????? ????????????????????? &FC; ????????????????????????????????????????????????????????????????????????????????????????????? Linux ??????????????????????????????????????????????????????????????????????????????????????????&FC; ???????????????????????????????????????????????????????????????????????????????????????????????????????????? - ????????????????????????????????????????????????????????? &BUG-REPORTING;
??????&FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ????????????????????????????????????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ??????????????????????????????????????????????????????
?????? i386 ?????????????????????????????????&FP; ?????? &FC; ???????????????????????? PC ???????????????????????????????????????????????????????????? &FC; ??????????????? architecture (????????????)???????????? ?????? 32 ?????? PC ????????? i386 ???????????????????????? &FC; ??????????????? x86_64 ??? ppc ????????????????????????????????????????????????????????????i386Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? SempronppcPowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ??????????????????x86_6464-bit AMD ????! ?????? ????? Athlon64, Turion64, Opteron; ?????? Intel 64-bit ????????? EM64T
????????????????????? &FC; ?????????????????????????????????????????????????????????(????????? ?????????????????????)???????????????????????????????????? &IG; ??????????????????????????? &FC; ??????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ?????????
??????! ??????????????????&FC; ?????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ???????????????????????????????????????????????????????????? DHCP ????????????????????????????????????????????????DHCP ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ????????????????????????Modem ??????&FC; ??????????????????????????????????????????????????????????????????????????? modem????????????????????????????????????????????????
?????????????????????????????????????????????????????? mirror! (??????)?????????????????????????????????????????????????????! ?????? ???? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????? (FTP, HTTP ?????? NFS)???????????????????????????????????????????????????????????????????????? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FP; ??????????????? HTTP ??? FTP ???????????????????????????????????????????????????????????????????????????????????? /&FCLOCALVER;/architecture/os/ ?????????????????????????????????????????????????????????????????? ??????????????????????????? &FED; ???????????????????????????! ???????????????????????????????????? &FED; ??????????????????????????????????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????????????????? DVD ????????????????????? CD ?????????????????????????????? boot: ?????????????????? linux askmethod???????????????????????????????????????????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment????????????????????????)??????????????????PXE (???????????? netboot ????????????)???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ??????????????????????????????????????????????????????????????????????????????????????? &FC;????????????????! ?????????????????
????????????????????????????????? &FC;??????????????????????????? directory service ????????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ???????????????????????????????????????&FC; ??????????????? LDAP ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????? &FC; ????????????????????? CD ??? DVD ?????????????????????????????????????????????????????? CD ??? DVD ????????????????????????????????? ?????????????????????! ???????????? &FC; ?????????????????????????????? ????????????????????? &FC;???????????????????????? CD????????? DVD ????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC;????????????????????????????????????????????????????????????????????????&FC; ??????????????? CD???DVD ??? USB ???????????????????????? image files(????????????)???????????????????????????????????????????????????????????????????????? Linux ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FED; ???????????????????????????CD ??? DVD ??????????????????????????? USB ??????????????????????????????????????????????????????????????????????????? ! HTTP, , ??? NFS???????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????? CD ??? DVD ???????????????????????????????????? &FC;???????????? USB ?????????????????????????????????????????????????????????????????????&FED; ????????????????????????????????????CD ??? DVD ?????? (??????????????????????????????????????????????????????????????????????????????)USB ?????????????????? (?????? PXE)?????????????????????????????????????????????????????? &FC;???
?????? CD ??? DVD ??????&FC; ??????????????????????????? images/boot.iso ???????????? CD ??? DVD ???????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????! ???????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ??????cdrecord --device=cdwriter-device -tao -eject image-file.iso
?????? USB ?????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ???????????????????????????????????????! ??????????????????????????????????????????????????????????????! ?????? ???????????????????????????????????????????????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????????????????????? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????dd if=diskboot.img of=/dev/sda
+ ????????????????????????????????????????????????????????? &BUG-REPORTING;
??????&FP; ?????????????????? &FC;????????? &FORMAL-RHI; ??? free softwareFOSSopen sourceFOSSFOSS (free and open source software)????????????????????? (FOSS) ????????????????????????&FP; ???????????? &FEX;??????????????????????????? &FC; ????????????????????????????????????????????? &FP; ??????????????????????????? &FP-URL;????????? http://www.opensource.org/ ??? http://www.gnu.org/philosophy/free-sw.html ??????????????????????????????????????????????????????
?????? i386 ?????????????????????????????????&FP; ?????? &FC; ???????????????????????? PC ???????????????????????????????????????????????????????????? &FC; ??????????????? architecture (????????????)???????????? ?????? 32 ?????? PC ????????? i386 ???????????????????????? &FC; ??????????????? x86_64 ??? ppc ????????????????????????????????????????????????????????????i386Intel x86-??????????????????????????? Pentium ??? Pentium-MMX, Pentium Pro, Pentium-II, Pentium-III, Celeron, Pentium 4, ??? Xeon; VIA C3/C3-m ?????? Eden/Eden-N; ?????? AMD Athlon, AthlonXP, Duron, AthlonMP, ??? SempronppcPowerPC ?????????????????? Apple Power Macintosh, G3, G4, and G5, ??? IBM pSeries ??????????????????x86_6464-bit AMD ????! ?????? ????? Athlon64, Turion64, Opteron; ?????? Intel 64-bit ????????? EM64T
????????????????????? &FC; ?????????????????????????????????????????????????????????(????????? ?????????????????????)???????????????????????????????????? &IG; ??????????????????????????? &FC; ??????????????????????????????????????????????????????????????? &FC; ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? HTML ?????????????????????????????????????????? &IG; ???????????????????????? &FDPDOCS-URL; ?????????
??????! ??????????????????&FC; ?????????????????? DHCP (Dynamic Host Configuration Protocol)DHCP (????????????????????????) ???????????????????????????????????????????????????????????? DHCP ????????????????????????????????????????????????DHCP ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??? ????????????????????????Modem ??????&FC; ??????????????????????????????????????????????????????????????????????????? modem????????????????????????????????????????????????
?????????????????????????????????????????????????????? mirror! (??????)?????????????????????????????????????????????????????! ?????? ???? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????? (FTP, HTTP ?????? NFS)???????????????????????????????????????????????????????????????????????? &FC;??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FP; ??????????????? HTTP ??? FTP ???????????????????????????????????????????????????????????????????????????????????? /&FCLOCALVER;/architecture/os/ ?????????????????????????????????????????????????????????????????? ??????????????????????????? &FED; ???????????????????????????! ???????????????????????????????????? &FED; ??????????????????????????????????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????????????????? DVD ????????????????????? CD ?????????????????????????????? boot: ?????????????????? linux askmethod???????????????????????????????????????????????????????????????????????????????????????????????? PXE (Pre-boot eXecution Environment????????????????????????)??????????????????PXE (???????????? netboot ????????????)???????????????????????? PC ????????????????????????????????????????????????&FC; ??????????????????????????????????????????????????? PXE ????????????????????????????????????????????????????????????????????? PXE ??????????????????????????????????! ???????? &FC;?????????????????????????????????????????????????????????????????? &FC;??????????????????????????? directory service ????????????????????????????????????????????????&FC; ?????????????????? Kerberos, NIS, Hesiod, ?????? MicrosoftWindows ???????????????????????????????????????&FC; ??????????????? LDAP ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????? &FC;???????????????????????? CD????????? DVD ???????????????????????????????????????????????????????????????????????????????????????????????? CD ??? DVD ???????????????????! ?????????????? ????????????????????????????????? &FC; ?????????????????????????????? ????????????????????????????????? &FC;???????????????????????????????????????????????????????????????????????????????????????????????? &FC; ????????????????????? CD ??? DVD ???????????????????????????&FC; ?????????????????? CD???DVD ??? USB ???????????????????????? image files(????????????)???????????????????????????????????????????????????????????????????????? Linux ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????&FED; ???????????????????????????CD ??? DVD ??????????????????????????? USB ??????????????????????! ????????????????????????????! ?????? ???????????????? HTTP, FTP, ??? NFS???????????????????????????????????? &FC; ??????????????????????????????????????????????????????????????? CD ??? DVD ???????????????????????????????????? &FC;???????????? USB ?????????????????????????????????????????????????????????????????????&FED; ????????????????????????????????????CD ??? DVD ?????? (??????????????????????????????????????????????????????????????????????????????)USB ?????????????????? (?????? PXE)?????????????????????????????????????????????????????? &FC;???
?????? CD ??? DVD ??????&FC; ??????????????????????????? images/boot.iso ???????????? CD ??? DVD ????????????????????????????????????????????????????????????! &FC; ??? FTP ??? Web ???????????????????????????????????????????????? &FC; ????????????????????????????????????????????????????????????????????? ISO ???????????????????????????????????? CD ??????????????? CD ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ????????????????????????????????????????????? Linux???????????????????????????????????? CD ?????????????????????????????????????????? CD ??????cdrecord --device=cdwriter-device -tao -eject image-file.iso
?????? USB ?????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????? USB ?????????????! ??????????????????????????????????????????????????????????????! ?????? ?????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????? images/diskboot.img ???????????? USB ????????????????????????????????????????????????????????????????????? &FC; ??? FTP ??? Web ????????????????????? Windows ??? Linux ?????????????????????????????????????????????????????????????????????Linux ?????? dd ???????????????????????????????????????????????????????????????????????????????????? &FC; ??????????????? dd ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????dd if=diskboot.img of=/dev/sda
Index: fedora-install-guide-nextsteps-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-nextsteps-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-nextsteps-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 +++ fedora-install-guide-nextsteps-zh_CN.xml 17 Dec 2005 12:22:01 -0000 1.3 @@ -68,19 +68,19 @@ ??? Web ??????????????? &FC; ?????????????????? &FP; ?????????????????? - http://fedora.redhat.com/docs/ + Linux ???????????? (LDP) ??????????????????????????? - http://www.tldp.org/ + ?????? &FC; ?????????????????????????????? &RHEL; ??????????????????????????? - http://www.redhat.com/docs/manuals/enterprise/ + ?????????????????????????????????????????????????????? &FED; ?????????????????????????????????????????? Google ????????????????????????????????? - http://www.google.com/linux/ +
@@ -88,7 +88,7 @@ &FED; ???????????????????????????????????????????????????????????????????????? Linux ????????? (LUG) ?????????????????? ??????????????????????????? - http://forums.fedoraforum.org/ +
@@ -96,7 +96,7 @@ &FP; ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? &FC; ?????????????????? &RH; ???????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????? - http://fedora.redhat.com/participate/ +
Index: fedora-install-guide-other-instmethods-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-zh_CN.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-install-guide-other-instmethods-zh_CN.xml 10 Dec 2005 18:54:16 -0000 1.4 +++ fedora-install-guide-other-instmethods-zh_CN.xml 17 Dec 2005 12:22:01 -0000 1.5 @@ -87,7 +87,7 @@
??????????????? - ??????????????????????????????????????? &FED; ????????? ISO ????????????????????????????????????ISO ???????????????????????? USB ???????????????????????????????????????????????????????????????????????????????????????????????????????????? CD ??? DVD ?????????????????????????????? &FC;??? + ??????????????????????????????????????? &FED; ????????? ISO ????????????????????????????????????ISO ?????????????????????????????????????????????????????? USB ????????????????????????????????????????????????????????????????????????????????????????????? CD ??? DVD ?????????????????????????????? &FC;??? ??????????????????????????? ISO ???????????????????????????????????? ext2file systemsfile systemsext2ext2, ext3file systemsfile systemsext3ext3 ??? vfatfile systemsfile systemsvfatvfat ????????????????????? &FED;???vfat ???????????????????????????????????? FAT-16 ??? FAT-32????????????????????????????????????????????????????????????????????????????????? vfat (FAT-32) ????????????????????? Microsoft Windows ??????????????? vfat ????????????????????????????????????????????????????????? FAT-16, FAT-32, ??? <systemitem class="filesystem">vfat</systemitem> @@ -110,7 +110,7 @@ ?????????????????????????????????????????? ISO ??????????????????????????? IDE ????????????????????? /dev/hd ?????????SCSI ?????? USB ???????????????????????? /dev/sd ??????????????????????????????????????????????????????????????? /dev/hda????????????????????????????????????????????????????????? /dev/sda1??? - ????????????????????? Directory holding images ?????????????????????????????????????????? ISO ???????????????????????????????????? + ????????????????????? Directory holding images(???????????????????????????)??????????????? ISO ???????????????????????????????????? ?????? OK ?????????
Index: fedora-install-guide-zh_CN.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-zh_CN.xml 10 Dec 2005 12:54:11 -0000 1.2 +++ fedora-install-guide-zh_CN.xml 17 Dec 2005 12:22:01 -0000 1.3 @@ -4,12 +4,12 @@ %FEDORA-ENTITIES-EN; - - + + - + @@ -25,6 +25,8 @@ + + ]> @@ -46,4 +48,4 @@ Paul W. - &LEGALNOTICE; 0.6.22005-04-30StuartEllisPaulWFrields?????? CVS???????????????0.6.32005-05-10PaulWFrieldsStuartEllis????????????????????????????????? "nextsteps"0.72005-05-15StuartEllisPaulWFrields???????????????????????????1.0rc12005-06-08KarstenWade?????????????????????????????????1.02005-06-10KarstenWade????????????1.0.1rc12005-11-20PaulWFrields???????????????????????????1.0.22005-11-25PaulWFrields??????????????????????????????????????? /home ???????????????1.0.32005-12-04StuartEllis????????????????????? anaconda ?????????????????????1.0.42005-12-06StuartEllis??????????????????????????????????????????1.0.52005-12-0! 8StuartEllis????????????????????? &INTRODUCTION; &BEGINNINGINSTALLATION; &OTHERINSTALLMETHODS; &LOCALE; &UPGRADING; &DISKPARTITIONING; &BOOTLOADER; &NETWORKCONFIG; &TIMEZONE; &ROOTPASSWORD; &PACKAGESELECTION; &ABOUTTOINSTALL; &INSTALLINGPACKAGES; &FIRSTBOOT; &NEXTSTEPS; &ACKNOWLEDGEMENTS; + &LEGALNOTICE; 0.6.22005-04-30StuartEllisPaulWFrields?????? CVS???????????????0.6.32005-05-10PaulWFrieldsStuartEllis????????????????????????????????? "nextsteps"0.72005-05-15StuartEllisPaulWFrields???????????????????????????1.0rc12005-06-08KarstenWade?????????????????????????????????1.02005-06-10KarstenWade????????????1.0.1rc12005-11-20PaulWFrields???????????????????????????1.0.22005-11-25PaulWFrields??????????????????????????????????????? /home ???????????????1.0.32005-12-04StuartEllis????????????????????? anaconda ?????????????????????1.0.42005-12-06StuartEllis??????????????????????????????????????????1.0.52005-12-0! 8StuartEllis?????????????????????1.0.62005-12-10StuartEllis???????????????????????????1.0.72005-12-12StuartEllis??????????????????????????????1.0.82005-12-14StuartEllis??????????????????????????? &INTRODUCTION; &BEGINNINGINSTALLATION; &OTHERINSTALLMETHODS; &LOCALE; &UPGRADING; &DISKPARTITIONING; &BOOTLOADER; &NETWORKCONFIG; &TIMEZONE; &ROOTPASSWORD; &PACKAGESELECTION; &ABOUTTOINSTALL; &INSTALLINGPACKAGES; &FIRSTBOOT; &NEXTSTEPS; &ADMINOPTIONS; &TECHREF; &ACKNOWLEDG! EMENTS; From fedora-docs-commits at redhat.com Sat Dec 17 13:28:46 2005 From: fedora-docs-commits at redhat.com (Yuan Yijun (bbbush)) Date: Sat, 17 Dec 2005 08:28:46 -0500 Subject: documentation-guide acknowledgments-zh_CN.xml, 1.1, 1.2 docs-emacs-zh_CN.xml, 1.1, 1.2 docs-getting-files-zh_CN.xml, 1.1, 1.2 docs-intro-zh_CN.xml, 1.1, 1.2 docs-rh-guidelines-zh_CN.xml, 1.1, 1.2 docs-tutorial-zh_CN.xml, 1.1, 1.2 docs-vim-zh_CN.xml, 1.1, 1.2 docs-xml-tags-zh_CN.xml, 1.1, 1.2 documentation-guide-zh_CN.xml, 1.1, 1.2 Message-ID: <200512171328.jBHDSkpM027806@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27776 Modified Files: acknowledgments-zh_CN.xml docs-emacs-zh_CN.xml docs-getting-files-zh_CN.xml docs-intro-zh_CN.xml docs-rh-guidelines-zh_CN.xml docs-tutorial-zh_CN.xml docs-vim-zh_CN.xml docs-xml-tags-zh_CN.xml documentation-guide-zh_CN.xml Log Message: update build part Index: acknowledgments-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/acknowledgments-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- acknowledgments-zh_CN.xml 9 Dec 2005 15:28:54 -0000 1.1 +++ acknowledgments-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 @@ -7,4 +7,5 @@ Joshua Daniel Franklin (joshuadfranklin at yahoo.com) ?????????????????????????????? ??? Karsten Wade (kwade at redhat.com) ?????????????????????????????? ????????? Paul W. Frields (stickstr5 at hotmail.com) ????????? Paul W. Frields (stickstr5 at hotmail.com) ??????????????????????????? ?????? screen ????????????????????????????????? + ????????? Tommy Reynolds (Tommy.Reynolds at MegaCoder.com) ????????????????????????????????????????????? Index: docs-getting-files-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-getting-files-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docs-getting-files-zh_CN.xml 9 Dec 2005 15:28:54 -0000 1.1 +++ docs-getting-files-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 @@ -1,46 +1,286 @@ - ???????????? - ???????????? Docs Project ????????????????????????????????? DocBook XML ????????????????????????????????????????????????????????????????????? - - - - xmlto — ?????? HTML ??? PDF ??????????????? - - - - docbook-style-xsl — ????????????????????? XSLT ????????? - - - - docbook-dtds — DocBook DTD ?????? XML ????????? - - - ??????????????????????????????????????? cvs.fedora.redhat.com CVS ??????????????????????????????????????????????????????????????? DocBook XML ??????????????? - ??????????????????????????? docs CVS ?????????????????????????????????????????????????????????????????? Enter??? - - mkdir my-fedora-docs -cd my-fedora-docs + ???????????? + ????????? &FED; ??????????????????????????????????????????????????????????????????????????????????????????????????? +
+ ??????????????? + ???????????? Docs Project ????????????????????????????????? DocBook XML ????????????????????????????????????????????????????????????????????? + + + + xmlto — ?????? HTML ??? PDF ????????? + + + + docbook-style-xsl — ???????????????????????? XSLT ???????????? + + + + docbook-dtds — DocBook DTD ?????? XML ????????? + + + ???????????????????????????????????????????????????????????? + + +rpm -q xmlto +rpm -q docbook-style-xsl +rpm -q docbook-dtds + + + ???????????????????????????????????? yum(8) ???????????? + + +su -c 'yum install xmlto' +su -c 'yum install docbook-style-xsl' +su -c 'yum install docbook-dtds' + + +
+
+ Fedora ???????????? + ????????????????????????????????????????????????????????? &FDPX; ???????????????????????? + ??????????????????????????????????????? cvs.fedora.redhat.com CVS ??????????????????????????????????????????????????????????????? DocBook XML ??????????????? + ???????????????????????????????????? Enter ???????????????????????????????????????????????????????????????????????? &FDPX; ?????????????????? + + mkdir my-fedora-docs-sandbox +cd my-fedora-docs-sandbox export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs cvs login cvs co docs-common cvs co example-tutorial - - ?????????????????? CVS ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? CVS ???????????????????????? CVS ?????????????????? ??? - ????????????????????????????????? - - cvs co -c - - ???????????????????????????????????????????????????????????? - - cvs co example-tutorial - - ?????? &IG; ?????????CVS ???????????????????????? DocBook XML article ??????????????? example-tutorial ????????????????????????????????? ?????? ????????????????????????????????????????????? XML ????????? + +
+
+ ??????????????? + &FDPX; ???????????????????????????????????????????????? XML ??????????????? HTML ??? PDF ??????????????????????????????????????????????????????????????? RPM ???????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+ ??????????????? + ????????????????????????????????????????????? &FED; ?????????????????? docs-common ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? cvs co -c ???????????????????????????????????? +
+
+ ??? I18N ???????????????????????? + &FDPX; ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + &FDPX; ???????????????????????????????????????????????????????????? ISO ????????????????????????????????????????????? US(????????????)?????????????????? mydoc-en.xml?????????????????????????????????????????? mydoc-zh_CN.xml?????????????????? + ??????????????????????????????????????????????????????????????????????????? I18N ????????????????????????????????????????????????????????? ????????? + + &FDPX; ??????????????? + + + + + + + ?????? + + + ?????? + + + + + + + + ?????????????????????????????? + + + + ????????????????????????????????????????????????????????????????????????(dash)??? + + + + + + - + + + + ????????? (-) ???????????? ${LANG} ?????????????????? + + + + + + ${LANG} + + + + + ${LANG} ?????????????????????????????? locale(????????????)??? + ???????????????????????????????????????????????? ${LANG} ?????????????????????????????? UTF-8 ?????????????????????????????? mydoc-it.xml ????????????????????? it.UTF-8 ????????????????????? + ???????????? I18N ??????????????????????????? ????????? + + + + +
+ + ??????????????????????????? + ????????????????????? ?????? ??????????????????????????????????????????????????????????????? + +
+
+
+ ?????????????????? + ?????????????????????????????????????????? HTML ??? PDF ???????????????????????????????????????????????? + ????????????????????? make(1) ????????? shell ???????????????????????????????????????????????????????????????????????????????????? ????????? shell ????????? Makefile ???????????????????????????????????????????????? Makefile????????????????????????????????????????????????????????? Makefile ????????????????????????????????? 'n ????????? + ????????? ???????????????????????????(??????????????????????????????????????????)????????? Makefile??? + + ???????????? Makefile(??????????????????) + +DOCBASE = mydoc +LANGUAGES = en +XMLEXTRAFILES-en= +include ../docs-common/Makefile.common + + + ??????????????? XML ????????? mydoc-en.xml???????????????????????? + + LANGUAGES ???????????????????????????????????? en?????????????????????????????????????????????????????????????????????????????????????????? + ????????????????????????????????? mydoc-en.xml?????????????????????????????????????????????????????? XMLEXTRAFILES-en ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? + ?????????????????? include(??????)?????????????????????????????????????????? Makefile???Makefile.common ????????????????????? make(1) ????????????????????????????????????????????????????????????????????? + ??????????????????????????? + + + ?????????????????????????????????????????????????????????????????? ${LANG} ???????????????????????????????????????????????? + + + ?????? Makefile??????????????? ${LANG} ??? LANGUAGES ???????????? + + + ???????????? XMLEXTRAFILES-${LANG} ???????????????????????????????????????????????????????????????????????????????????? + + +
+ ?????????????????? + ?????? XML ??????????????? HTML ??? PDF?????????????????? make html, make html-nochunk, ??? make pdf??? + + ?????????????????????????????????????????? + + ?????????????????? + + + + + + + ?????? + + + ?????? + + + + + + + + all + + + + ?????? HTML, ??? PDF ?????????????????????????????????????????? + ??????????????????????????? tar(1) ??? rpm(8)??? + + + + + + tarball + + + + ????????? tar(1) ???????????????????????????????????? + + + + + + pdf + + + + ????????? PDF ???????????????????????????????????? + ?????????PDF ?????????????????????????????????????????? + + + + + + html + + + + ????????? HTML ??????????????????????????????????????????????????????????????????${DOCBASE}-${LANG}/?????????????????????????????????????????????????????? + + + + + + html-nochunks + + + + ????????? HTML ???????????????????????????????????????????????????????????????${DOCBASE}-${LANG}.html?????????????????????????????? + + + + + + clean + + + + ??????????????????????????????????????????????????? ???????????? HTML, PDF, ?????????????????? + + + + + + distclean + + + + ???????????? HTML, PDF, ???????????????????????????????????? clean ????????? + + + + +
+ ?????????????????????????????????????????????????????????????????????????????? Makefile ??????????????? include ?????????????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? +
+
+ ???????????????????????? + ????????????????????? .PNG????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? figs/ ???????????????????????????????????? picture.png ????????? mydoc/figs/picture.png ????????? + + ?????? PNG ?????????????????? JPG + ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? PNG ??????????????? JPG ????????? + ???????????? convert(1) ??????????????? ImageMagickRPM ???????????????????????????????????? JPG ????????????????????? + + ????????????????????????????????? figs/ ???????????????????????????????????????????????????????????????????????????????????????????????? + ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? words-en.png ??? words-ru.png ???????????????????????????????????????????????????????????????????????? picture.png ????????? + ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? figs/Manifest-${LANG}????????????????????????????????????????????????????????????????????? + ?????? figs/Manifest-${LANG} ???????????????????????? ??? + + ??????????????????(Manifest) + +rm -f figs/Manifest-en +find figs -print >/tmp/manifest +mv /tmp/manifest figs/Manifest-en +vi figs/Manifest-en + + +
+
Index: docs-rh-guidelines-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-rh-guidelines-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docs-rh-guidelines-zh_CN.xml 9 Dec 2005 15:28:54 -0000 1.1 +++ docs-rh-guidelines-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 @@ -181,7 +181,7 @@ ??????????????? CVS ?????? (??????????????????)??????????????????????????????????????????????????????????????????????????? -<!-- $Id$ --> +<!-- $Id: --> Index: docs-xml-tags-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-xml-tags-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docs-xml-tags-zh_CN.xml 9 Dec 2005 15:28:54 -0000 1.1 +++ docs-xml-tags-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 @@ -119,8 +119,6 @@ ?????? DocBook ??????????????????????????????????????? -<!--$Id$ --> - <chapter id="ch-sample"> <title>?????????</title> Index: documentation-guide-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/documentation-guide-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- documentation-guide-zh_CN.xml 9 Dec 2005 15:28:54 -0000 1.1 +++ documentation-guide-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 @@ -1,9 +1,8 @@ - + %FEDORA-ENTITIES-EN; - @@ -14,7 +13,6 @@ - @@ -43,4 +41,4 @@ Moore Sandra - &LEGALNOTICE; &INTRODUCTION; &GETTINGFILES; &GUIDELINES; &EMACS; &EMACS-NXML; &VIM; &TAGS; &TUTORIAL; &STYLE; &CONVERTING; &CVS; &ACKNOWLEDGMENTS; + &LEGALNOTICE; &INTRODUCTION; &GETTINGFILES; &GUIDELINES; &EMACS; &EMACS-NXML; &VIM; &TAGS; &TUTORIAL; &STYLE; &CVS; &ACKNOWLEDGMENTS; From fedora-docs-commits at redhat.com Sat Dec 17 14:52:43 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Sat, 17 Dec 2005 09:52:43 -0500 Subject: docs-common/bin bulkbuild,1.4,1.5 Message-ID: <200512171452.jBHEqhpL029629@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29611 Modified Files: bulkbuild Log Message: Added "-k" switch to keep on trying to build remaining document languages in case an earlier translation fails. Also used scalable method to get list of documents to build. Index: bulkbuild =================================================================== RCS file: /cvs/docs/docs-common/bin/bulkbuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bulkbuild 30 Nov 2005 12:56:30 -0000 1.4 +++ bulkbuild 17 Dec 2005 14:52:35 -0000 1.5 @@ -1,6 +1,7 @@ #!/bin/bash # # Written by stickster :) +# Mangled by megacoder ;-P # # Pull all active FDP docs from CVS, build and install HTML in # TARGETDIR folder. @@ -27,6 +28,7 @@ echo " -p : build PDF (not working currently)" echo " -t : build tarball" echo " -h : print usage (this message)" + echo " -k : continue building in face of errors" } @@ -44,9 +46,10 @@ # just to make sure defaults are read unset FDPDIR HTMLDIR ANONCVS TAG CHUNKS NOCHUNKS PDF TARBALL VERBOSE +unset KEEPON BUILDS=0 -while getopts "m:f:D:a:r:Qcnpthv" OPT; do +while getopts "m:f:D:a:r:Qcnpthvk" OPT; do case $OPT in m ) WORKDIR="$OPTARG" @@ -90,6 +93,9 @@ v ) REDIR="/dev/stdout" ;; + k ) + KEEPON="-k" + ;; * ) echo "$MYSELF: invalid option: $OPT" print_usage @@ -116,8 +122,10 @@ #cvs -d $ANONCVS login cvs "$QUIET" -z3 -d $ANONCVS co docs-common - -for DOC in `cat docs-common/bin/active`; do +# for DOC in `cat docs-common/bin/active`; do +xargs -n1 echo &1 > $REDIR @@ -127,7 +135,7 @@ rm -f tmpvars if [ "$CHUNKS" = "yes" ]; then echo "Making chunked HTML for ${DOCBASE}" - make html 2>&1 > $REDIR || ( echo "$MYSELF: CHUNKS failed" ;\ + make ${KEEPON} html 2>&1 > $REDIR || ( echo "$MYSELF: CHUNKS failed" ;\ exit 251 ) for LANG in $LANGUAGES ; do DESTDIR="${TARGETDIR}/${DOCBASE}/${LANG}" @@ -137,8 +145,8 @@ fi if [ "$NOCHUNKS" = "yes" ]; then echo "Making nochunks HTML for ${DOCBASE}" - mak html-nochunks 2>&1 > $REDIR || ( echo "$MYSELF: NOCHUNKS failed" ;\ - exit 251 ) + make ${KEEPON} html-nochunks 2>&1 > $REDIR || + ( echo "$MYSELF: NOCHUNKS failed" ; exit 251 ) for LANG in $LANGUAGES ; do DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR From fedora-docs-commits at redhat.com Sat Dec 17 15:55:01 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Sat, 17 Dec 2005 10:55:01 -0500 Subject: release-notes desktop-it.xml, 1.2, 1.3 feedback-it.xml, 1.1, 1.2 install-notes-it.xml, 1.4, 1.5 intro-it.xml, 1.2, 1.3 kernel-it.xml, 1.3, 1.4 legacy-it.xml, 1.2, 1.3 misc-server-it.xml, 1.1, 1.2 multimedia-it.xml, 1.2, 1.3 networking-it.xml, 1.2, 1.3 package-notes-it.xml, 1.4, 1.5 project-overview-it.xml, 1.3, 1.4 README-it.xml, 1.2, 1.3 splash-it.xml, 1.3, 1.4 xorg-it.xml, 1.3, 1.4 Message-ID: <200512171555.jBHFt1MO031407@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31373/release-notes Modified Files: desktop-it.xml feedback-it.xml install-notes-it.xml intro-it.xml kernel-it.xml legacy-it.xml misc-server-it.xml multimedia-it.xml networking-it.xml package-notes-it.xml project-overview-it.xml README-it.xml splash-it.xml xorg-it.xml Log Message: typos corrections Index: desktop-it.xml =================================================================== RCS file: /cvs/docs/release-notes/desktop-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- desktop-it.xml 25 Nov 2005 21:12:13 -0000 1.2 +++ desktop-it.xml 17 Dec 2005 15:54:54 -0000 1.3 @@ -9,7 +9,7 @@ Questa test release ha GNOME 2.12.1, insieme ad alcune anticipazioni della tecnologia del prossimo GNOME 2.14. Riscontri - su questi pacchetti sno apprezzati in modo speciale. + su questi pacchetti sono apprezzati in modo speciale. @@ -18,7 +18,7 @@ di sessione per l'ambiente desktop GNOME che rende semplice amministrare l'alimentazione sul tuo sistema portatile o desktop. Si avvantaggia dell'HAL (che fornisce un hardware abstraction - layer) e di DBUS (software di comunicazione inter process) + layer) e di DBUS (software di comunicazione inter processo) scritto e mantenuto da sviluppatori &FC;. @@ -39,7 +39,7 @@ GNOME 2.12 ha rimosso l'opzione - terminal dal menu contestuale + terminal dal men?? contestuale del desktop. Il pacchetto nautilus-open-terminal nel repositorio &FEX; fornisce un sostituto avanzato per coloro che lo richiedono. @@ -50,7 +50,7 @@ - Solo il salvaschermo blank ?? prinstallato, fin + Solo il salvaschermo blank ?? preinstallato, fin da &FC; 4. Index: feedback-it.xml =================================================================== RCS file: /cvs/docs/release-notes/feedback-it.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- feedback-it.xml 4 Nov 2005 19:55:14 -0000 1.1 +++ feedback-it.xml 17 Dec 2005 15:54:54 -0000 1.2 @@ -4,7 +4,7 @@ (Questa sezione scomparir?? quando la release finale di &DISTRO; sar?? creata.) Se pensi che queste release notes possano essere migliorate in qualche modo, - puoi inviare il tuo suggerimento diretamente all'autore. Se vedi un URL nelle + puoi inviare il tuo suggerimento direttamente all'autore. Se vedi un URL nelle release notes che sia tipo: %%% https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=<bug-number> %%% Index: install-notes-it.xml =================================================================== RCS file: /cvs/docs/release-notes/install-notes-it.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- install-notes-it.xml 27 Nov 2005 19:28:15 -0000 1.4 +++ install-notes-it.xml 17 Dec 2005 15:54:54 -0000 1.5 @@ -190,7 +190,7 @@ In questa release, l'installer controlla le possibilit?? - dell'hardware ed installa il kernel uniprocessoro o SMP + dell'hardware ed installa il kernel uniprocessore o SMP (Symmetric Multi Processor), in modo appropriato. Le precedenti versioni installavano entrambe le varianti usando poi quella appropriata come predefinita. @@ -233,7 +233,7 @@ Index: legacy-it.xml =================================================================== RCS file: /cvs/docs/release-notes/legacy-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- legacy-it.xml 25 Nov 2005 21:12:13 -0000 1.2 +++ legacy-it.xml 17 Dec 2005 15:54:54 -0000 1.3 @@ -40,7 +40,7 @@ - La LinuxThreads library, che ?? stta deprecata in &FC; 4, non ?? pi?? + La LinuxThreads library, che ?? stata deprecata in &FC; 4, non ?? pi?? disponibile in questa release. NPTL threading library ?? la libreria predefinita fin da Red Hat Linux 9. Index: misc-server-it.xml =================================================================== RCS file: /cvs/docs/release-notes/misc-server-it.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- misc-server-it.xml 4 Nov 2005 19:56:57 -0000 1.1 +++ misc-server-it.xml 17 Dec 2005 15:54:54 -0000 1.2 @@ -9,7 +9,7 @@ Se hai scelto di contravvenire alle raccomandazioni di non aggiornare da una test release precedente, potrai - incontrare un problema con OpenOffice eseguedo l'upgrade. + incontrare un problema con OpenOffice eseguendo l'upgrade. Per risolverlo, dovrai eseguire il seguente comando Index: multimedia-it.xml =================================================================== RCS file: /cvs/docs/release-notes/multimedia-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multimedia-it.xml 25 Nov 2005 21:12:13 -0000 1.2 +++ multimedia-it.xml 17 Dec 2005 15:54:54 -0000 1.3 @@ -25,11 +25,11 @@ linkend="sn-multimedia-excluded"/>. - &FC; ?? anche ecquipaggiata per ottenere un pieno vantaggio dal sistema sonoro + &FC; ?? anche equipaggiata per ottenere un pieno vantaggio dal sistema sonoro Advanced Linux Sound Architecture (ALSA). Questo vuol dire che molti programmi possono suonare simultaneamente, che era una cosa difficile sui sistemi linux. Quando tutti i software multimediali sono - configurati per usare ALSA per il suppoto sonoro, questa vecchia limitazione + configurati per usare ALSA per il supporto sonoro, questa vecchia limitazione scompare. Per maggiori informazioni su ALSA, visita il sito web del progetto: @@ -67,8 +67,8 @@
Software multimediale escluso - Diversi programmi sono esclusi da &FC; e &FEX; a cusa di problemi di - licenza. Queso include programmi che forniscono supporto MP3 e DVD, + Diversi programmi sono esclusi da &FC; e &FEX; a causa di problemi di + licenza. Questo include programmi che forniscono supporto MP3 e DVD, Flash Player e Real Player. Per maggiori informazioni su questo soggetto, riferitevi a: Index: networking-it.xml =================================================================== RCS file: /cvs/docs/release-notes/networking-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- networking-it.xml 4 Nov 2005 21:13:34 -0000 1.2 +++ networking-it.xml 17 Dec 2005 15:54:54 -0000 1.3 @@ -53,7 +53,7 @@ E' stato aggiunto un nuovo algoritmo di routing lookup chiamato trie. E' inteso per grandi tavole di routing e mostra un chiaro miglioramento delle prestazioni - rispetto all'origninale implementazione hash al costo di un aumento + rispetto all'originale implementazione hash al costo di un aumento del consumo di memoria e della complessit??. @@ -94,7 +94,7 @@ Cose che interessano L'algoritmo di controllo di congestione Una interessante aggiunta per gli sviluppatori ?? che - l'algoritmo di controllo della congestione ?? spcifico al socket e pu?? + l'algoritmo di controllo della congestione ?? specifico al socket e pu?? essere cambiato mediante l'opzione socket . @@ -108,9 +108,9 @@ quando un cavo viene staccato, il driver ferma la coda davanti al driver. Questo ha causato che i pacchetti siano stati accodati al layer di coda disciplinata per un certo periodo - di tempo causando effetti inaspettati. Per prvenire questo + di tempo causando effetti inaspettati. Per prevenire questo effetto, lo stack di rete di base adesso cessa di accettare qualsiasi - paccchetto per la coda da ogni device che sia operativamente + pacchetto per la coda da ogni device che sia operativamente disattivato, cio??, ha l'accodamento disabilitato. @@ -201,7 +201,7 @@ a scopo amministrativo o perch?? non c'?? linea (cavo staccato). Il flag NO-CARRIER ?? stato introdotto per mostrare un link flag se il link ?? - administrativamente su ma non viene trovata linea. + amministrativamente su ma non viene trovata linea. Il comando ip adesso supporta una modalit?? batch @@ -236,7 +236,7 @@ Usate l'applet del desktop Network Monitor per monitorare e configurare NetworkManager. Per caricare - l'applet in GNOME, click con il bottone destro del mouse sul pannelo e selezionate: + l'applet in GNOME, click con il bottone destro del mouse sul pannello e selezionate: Add to Panel...Network @@ -250,7 +250,7 @@ connessioni da altri sistemi. - Nota che alcune shcede di rete wireless richiedono drivers o firmware + Nota che alcune schede di rete wireless richiedono drivers o firmware che non pu?? essere incluso con &DISTRO;. Questo software deve essere installato separatamente per far funzionare NetworkManager. Index: package-notes-it.xml =================================================================== RCS file: /cvs/docs/release-notes/package-notes-it.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- package-notes-it.xml 25 Nov 2005 21:12:13 -0000 1.4 +++ package-notes-it.xml 17 Dec 2005 15:54:54 -0000 1.5 @@ -78,8 +78,8 @@ di log Il demone audit, auditd, ?? abilitato per impostazione predefinita. Quando - auditd ?? in esecuzione, il kernel redireziona i messagi a - /var/log/audit/audit.log. La posiozione di questo file ?? + auditd ?? in esecuzione, il kernel redireziona i messaggi a + /var/log/audit/audit.log. La posizione di questo file ?? specificata in /etc/auditd.conf. Index: project-overview-it.xml =================================================================== RCS file: /cvs/docs/release-notes/project-overview-it.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project-overview-it.xml 25 Nov 2005 21:12:13 -0000 1.3 +++ project-overview-it.xml 17 Dec 2005 15:54:54 -0000 1.4 @@ -3,10 +3,10 @@ L'obiettivo del &PROJ; ?? di lavorare con la comunit?? Linux per creare un sistema operativo completo, general-purpose esclusivamente - da software open source. Lo sviluppo ?? compiuto in un forum pubbllico. + da software open source. Lo sviluppo ?? compiuto in un forum pubblico. Il progetto produce delle releases su base temporale di &DISTRO; approssimativamente 2-3 volte l'anno, con uno scadenziario pubblico delle release. Le squadre - di ingegneri &RH; continuano a participare alla costruzione della &DISTRO; + di ingegneri &RH; continuano a partecipare alla costruzione della &DISTRO; ed invitano ed incoraggiano pi?? partecipanti esterni di quanto era possibile in passato. Utilizzando questo processo pi?? aperto, speriamo di fornire un sistema operativo molto pi?? in linea con gli ideali di software @@ -97,7 +97,7 @@ Per poter parlare sul canale #fedora, dovrai registrare il tuo nickname (nick). Ti verranno date istruzioni quando farai il /join al - cannale. + canale. Nota Index: README-it.xml =================================================================== RCS file: /cvs/docs/release-notes/README-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README-it.xml 6 Nov 2005 12:53:08 -0000 1.2 +++ README-it.xml 17 Dec 2005 15:54:54 -0000 1.3 @@ -158,7 +158,7 @@ Molti computers possono essere avviati automaticamente dai CD-ROMs. Se hai una macchina di questo tipo (ed ?? configurata nel modo appropriato) puoi avviare il - CD-ROM di &DISTRO; direttamente. Dopo l'avvio, il programma d'instalazione di &DISTRO; + CD-ROM di &DISTRO; direttamente. Dopo l'avvio, il programma d'installazione di &DISTRO; sar?? eseguito, e sarai in grado di installare il tuo sistema dal CD-ROM. La @@ -170,7 +170,7 @@ suo drive CD-ROM, e le sue impostazioni del BIOS devono essere configurate per farlo. Devi quindi masterizzare la boot.iso su un CD-ROM recordable/rewriteable. - Un'altro file + Un altro file immagine contenuto nella directory images/ ?? diskboot.img. Questo file ?? disegnato per essere utilizzato con i pen drives USB (o altri media avviabili con una capacit?? pi?? grande di un floppy disk), Index: splash-it.xml =================================================================== RCS file: /cvs/docs/release-notes/splash-it.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- splash-it.xml 25 Nov 2005 21:12:13 -0000 1.3 +++ splash-it.xml 17 Dec 2005 15:54:54 -0000 1.4 @@ -1,7 +1,7 @@
Benvenuti in &FC; &LOCALVER; - &FC; ?? una piattaforma basata su Linux completamente gratutita, amichevole, sicura e + &FC; ?? una piattaforma basata su Linux completamente gratuita, amichevole, sicura e general purpose. &FP; ?? un progetto open source che ?? utilizzabile, modificabile e distribuibile liberamente da chiunque, ora e per sempre. Il &FP; ?? un progetto open source che esplora le ultime tecnologie e concetti sponsorizzato da &RH; e @@ -11,7 +11,7 @@ Questa ?? una test release, non intesa per gli utenti finali Questa ?? una test release ed ?? distribuita per gli sviluppatori e testers - per partecipare e fornire giudizzi. Non ?? intesa per gli + per partecipare e fornire giudizi. Non ?? intesa per gli utenti finali. @@ -19,7 +19,7 @@ dei cambiamenti pi?? importanti nella versione di sviluppo attuale e dare il tuo giudizio agli sviluppatori. &FP; ha bisogno che tu invii i rapporti d'errore e le migliorie per dare all'utente finale una migliore - versione definitva. Per maggiori informazioni su questo, fa riferimento al + versione definitiva. Per maggiori informazioni su questo, fa riferimento al seguente documento: @@ -33,7 +33,7 @@ Queste release notes devono essere aggiornate. Visita http://fedora.redhat.com/docs/release-notes/ - per vedere le ultimerelease notes per &DISTRO; &DISTROVER;. + per vedere le ultime release notes per &DISTRO; &DISTROVER;. @@ -77,7 +77,7 @@ - Participa al &FP; (http://fedora.redhat.com/participate/) @@ -93,7 +93,7 @@ Il software di virtualizzazione Xen ed lo strumento di amministrazione dei - pacchetti yum sono ora ben integrati all'interno del proramma di installazione &FED;. + pacchetti yum sono ora ben integrati all'interno del programma di installazione &FED;. L'interfaccia del programma d'installazione ?? molto sequenziale. Il login remoto ed il supporto per i tracebacks ?? incluso. Index: xorg-it.xml =================================================================== RCS file: /cvs/docs/release-notes/xorg-it.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xorg-it.xml 25 Nov 2005 21:12:13 -0000 1.3 +++ xorg-it.xml 17 Dec 2005 15:54:54 -0000 1.4 @@ -119,7 +119,7 @@ percorsi sono compilati all'interno del codice in /usr/X11R6, devono ora essere cambiati preferibilmente per determinare automaticamente l'appropriata posizione dell'oggetto, o inglobare nel codice i nuovi percorsi - che X11R7 usa per impostazione predefinit. E' fortemente consigliato l'uso di + che X11R7 usa per impostazione predefinita. E' fortemente consigliato l'uso di sistemi di autodeterminazione rispetto a quelli che inglobano i percorsi nel codice. @@ -130,11 +130,11 @@ Ogni pacchetto software che in precedenza prelevava gli - headers di sviluppo, etc. pe le librerie X usando + headers di sviluppo, etc. per le librerie X usando BuildRequires: (XFree86-devel|xorg-x11-devel), devono ora elencare individualmente la dipendenza da ciascuna libreria. Quando - fano questo, ?? notevolmente preferito e fortemente raccomandato + fanno questo, ?? notevolmente preferito e fortemente raccomandato usare compilazioni di dipendenze virtual invece di includere il nome di pacchetto della libreria nell'implementazione Xorg. From fedora-docs-commits at redhat.com Thu Dec 22 01:47:44 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Wed, 21 Dec 2005 20:47:44 -0500 Subject: install-guide fedora-install-guide-adminoptions-en.xml, 1.2, 1.3 fedora-install-guide-en.xml, 1.32, 1.33 fedora-install-guide-techref-en.xml, 1.1, 1.2 Message-ID: <200512220147.jBM1liK3015574@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15554 Modified Files: fedora-install-guide-adminoptions-en.xml fedora-install-guide-en.xml fedora-install-guide-techref-en.xml Log Message: - Filled out Management Option section: needs indexing and testing to complete. - Fixed small typo in Technical References section. Index: fedora-install-guide-adminoptions-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-adminoptions-en.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-install-guide-adminoptions-en.xml 14 Dec 2005 22:59:52 -0000 1.2 +++ fedora-install-guide-adminoptions-en.xml 22 Dec 2005 01:47:35 -0000 1.3 @@ -10,6 +10,11 @@ Boot Options + Almost all of the options listed here have NOT yet been tested. + + + + To use boot options, enter linux option at the boot: @@ -27,10 +32,10 @@ Booting Your Computer with Rescue Mode - You may use installation disc #1 to boot a command-line Linux - system without installing &FED; on the computer. This rescue - system may access the drives on your computer. Rescue mode - enables you to use the utilities and functions of a running + You may use the first installation disc to boot a command-line + Linux system, without installing &FED; on the computer. This + rescue system may access the drives on your computer. Rescue + mode enables you to use the utilities and functions of a running system to modify or repair an installed system. @@ -38,7 +43,7 @@ To load the rescue mode, enter: - linux rescue + linux rescue Specify the language, keyboard layout and network settings for @@ -46,54 +51,550 @@
-
- Automating the Installation with Kickstart +
+ Configuring the Installation System - Kickstart. - + You may configure the installation system without affecting the + final &FED; system. + + + + You may force the installation system to use the lowest possible + screen resolution (640x480) with the + option. To use a specific display resolution, enter + + as a boot option. For example, to set the display resolution to + 1024x768, enter: + + +linux resolution=1024x768 + + + To run the installation process in mode, + enter: + + + linux text + + + To enable support for a serial console, enter + as an additional option. + + + You may also configure the installation method and network + settings at the + boot: + prompt itself, without using to + display menus. To specify the installation method from the + boot: + prompt, use the option. + + + Installation Methods + + + + + + Method + Format + + + + + + + CD or DVD drive + + + + + + + + + + + + Hard Drive + + + + + + + + + + + + HTTP Server + + + + + + + + + + + + FTP Server + + + + + + + + + + + + NFS Server + + + + + + + + + + +
+ + By default, the installation system uses DHCP to obtain the + correct network settings. To manually configure one or more + network settings, specify the setting at the + boot: + prompt. You may set the address, + , , and + servers for the installation system. + + + + This example configures all of the network settings for an + installation syste that uses the IP address 192.168.1.10: + + +linux ip=192.168.1.10 netmask=255.255.255.0 gateway=192.168.1.1 dns=192.168.1.2,192.168.1.3 +
-
- Networking Options +
+ Enabling Remote Access to the Installation System - VNC, remote syslog, and options for network settings. - + You may access the interface for the installation system from + any other system. Access to a text mode display requires + telnet, which is installed by default on + &FED; systems. To remotely access a graphical display for the + installation system, you must install client software that + supports the VNC (Virtual Network Computing) display protocol. + + + To enable remote access to a text mode installation, use the + option at the + boot: + prompt: + + +linux telnet + + + You may then connect to the installation system with the + telnet utility. The telnet + command requires the name or IP address of the installation + system: + + +telnet computer.mydomain.com + + + To enable remote graphical access to the installation system, + enter two options at the prompt: + + +linux vnc vncpassword=qwerty + + + The option enables the VNC service. The + option sets a password for remote + access. The example shown above sets the password as + qwerty. + + + + VNC Passwords + + + The VNC password must be at least six characters long. + + + + + Specify the language, keyboard layout and network settings for + the installation system with the screens that follow. You may + then access the graphical interface through a VNC client. The + installation system displays the correct connection setting for + the VNC client: + + + for a shell]]> + + + Installing a VNC Client + + To install a VNC client on &FED;, use the package + vnc. To run the + vncviewer client, choose + Applications + AccessoriesVNC + Viewer. + + + + Alternatively, you may automatically connect the interface for + the installation system to an active VNC client, with the + option. This requires the VNC client + to run in listening mode. The client system + must also allow connections on a known TCP port. By default, the + vncviewer utility listens on TCP port + 5500. + + + + To connect to a VNC client on the system + desktop.mydomain.com + on the port 5500, you would enter the + following at the + boot: + prompt: + + +linux vnc vncpassword=qwerty vncconnect=desktop.mydomain.com:5500 + + + On &FED; systems, use the option to + start the vncviewer VNC client in + listening mode: + + + vncviewer -listen +
-
- Configuring the Installation Interface +
+ Automating the Installation with Kickstart - To run the installation process in text mode, enter: + A Kickstart file specifies settings for + an installation. To automate the installation process, use the + option to provide the name and location of a + Kickstart file: - linux text + linux ks=location/kickstart-file.cfg - Add information on enabling serial console. - + You may use Kickstart files that are located on either removable + storage, a hard drive, or a network server. Refer to + for the supported Kickstart + sources. + + + Kickstart Sources + + + + + + Source + Format + + + + + + + CD or DVD drive + + + + + + + + + + + + Hard Drive + + + + + + + + + + + + Other Device + + + + + + + + + + + + HTTP Server + + + + + + + + + + + + FTP Server + + + + + + + + + + + + NFS Server + + + + + + + + + + +
+ + Kickstart File is Automatically Created + + The Kickstart file /root/anaconda-ks.cfg + contains the settings for your system. The &FED; installation + process automatically creates this file. + + + + To install an application to create and edit Kickstart files, + use the package system-config-kickstart. To + load this Kickstart file editor, choose + Applications System + ToolsKickstart. + Alternatively, you may edit Kickstart files with a text editor. + + + + You may also write Web applications to generate Kickstart files. + To use a Web application to provide a Kickstart file, specify + the URL of the application with the option. + If you add the option , the request + also sends HTTP headers to the Web application. Your application + may use these headers to identify the computer. For example, + this line sends a request with headers to the application + http://server.example.com/kickstart.cgi: + +linux ks=http://server.mydomain.com/kickstart.cgi kssendmac +
Hardware Compatibility Options - Most of these options turn off configuring or using certain systems. Consider a table to summarise them. - - + By default, &FED; detects and configures all of the components + of your computer. To override the automatic hardware detection, + use the following options: + + + Hardware Options + + + + + + Option + Keyword + + + + + + + Disable all hardware detection + + + + + + + + + + + + Disable graphics, keyboard, and mouse detection + + + + + + + + + + + + Disable power management (ACPI) + + + + + + + + + + + + Disable monitor detection (DDC) + + + + + + + + + + + + Disable Firewire device detection + + + + + + + + + + + + Disable parallel port detection + + + + + + + + + + + + Disable PC Card (PCMCIA) device detection + + + + + + + + + + + + Disable USB storage device detection + + + + + + + + + + + + Disable all USB device detection + + + + + + + + + + + + Force Firewire device detection + + + + + + + + + + + + Prompt user for ISA device configuration + + + + + + + + + + +
Installing &FC; with Expert Mode - The expert mode enables you to run the installation process with - additional options for hardware configuration. + The mode enables you to run the + installation process with additional options for hardware + configuration. @@ -102,10 +603,6 @@ linux expert - - This is untested. - -
Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fedora-install-guide-en.xml 14 Dec 2005 22:59:52 -0000 1.32 +++ fedora-install-guide-en.xml 22 Dec 2005 01:47:35 -0000 1.33 @@ -6,8 +6,8 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -196,6 +196,16 @@ + + 1.0.9 + 2005-12-22 + StuartEllis + + + Updated Management Options section. + + + Index: fedora-install-guide-techref-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-techref-en.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-install-guide-techref-en.xml 14 Dec 2005 22:59:52 -0000 1.1 +++ fedora-install-guide-techref-en.xml 22 Dec 2005 01:47:35 -0000 1.2 @@ -55,8 +55,7 @@ &FC; and anaconda include VNC to provide remote display capabilities. For more information about VNC, - refer to the documentation on the RealVNC website - . + refer to the documentation on the RealVNC website: . @@ -79,7 +78,7 @@ &SEL; provides Mandatory Access Control (MAC) capabilities - that supplement the standard Linux security systems. Refer to + that supplement the standard Linux security features. Refer to the &SEL; FAQ for more information: . From fedora-docs-commits at redhat.com Thu Dec 22 14:54:24 2005 From: fedora-docs-commits at redhat.com (Stuart Ellis (elliss)) Date: Thu, 22 Dec 2005 09:54:24 -0500 Subject: install-guide fedora-install-guide-adminoptions-en.xml, 1.3, 1.4 fedora-install-guide-en.xml, 1.33, 1.34 Message-ID: <200512221454.jBMEsOKJ008391@cvs-int.fedora.redhat.com> Author: elliss Update of /cvs/docs/install-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8372 Modified Files: fedora-install-guide-adminoptions-en.xml fedora-install-guide-en.xml Log Message: - More work on Management Options section. Index: fedora-install-guide-adminoptions-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-adminoptions-en.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-install-guide-adminoptions-en.xml 22 Dec 2005 01:47:35 -0000 1.3 +++ fedora-install-guide-adminoptions-en.xml 22 Dec 2005 14:54:15 -0000 1.4 @@ -10,7 +10,7 @@ Boot Options - Almost all of the options listed here have NOT yet been tested. + Many of the options listed here have NOT yet been tested. @@ -56,9 +56,34 @@ You may configure the installation system without affecting the - final &FED; system. + final &FED; system. The + boot: + prompt enables you to configure the following: + + + + Display resolution + + + + + Interface type + + + + + Installation method + + + + + Network settings + + + + You may force the installation system to use the lowest possible screen resolution (640x480) with the @@ -83,23 +108,30 @@ - You may also configure the installation method and network - settings at the + Use the option to display additional + menus that enable you to specify the installation method network + settings. You may also configure the installation method and + network settings at the boot: - prompt itself, without using to - display menus. To specify the installation method from the + prompt itself. + + + + To specify the installation method from the boot: - prompt, use the option. + prompt, use the option. Refer to + for the supported + installation methods. Installation Methods - - + + - Method - Format + Installation Method + Option Format @@ -178,7 +210,7 @@ This example configures all of the network settings for an - installation syste that uses the IP address 192.168.1.10: + installation system that uses the IP address 192.168.1.10: linux ip=192.168.1.10 netmask=255.255.255.0 gateway=192.168.1.1 dns=192.168.1.2,192.168.1.3 @@ -192,29 +224,17 @@ You may access the interface for the installation system from any other system. Access to a text mode display requires telnet, which is installed by default on - &FED; systems. To remotely access a graphical display for the - installation system, you must install client software that - supports the VNC (Virtual Network Computing) display protocol. - - - - To enable remote access to a text mode installation, use the - option at the - boot: - prompt: + &FED; systems. To remotely access the graphical display of an + installation system, you must use client software that supports + the VNC (Virtual Network Computing) display protocol. - -linux telnet - - - You may then connect to the installation system with the - telnet utility. The telnet - command requires the name or IP address of the installation - system: - - -telnet computer.mydomain.com - + + Installing a VNC Client + + To install the vncviewer VNC client + on &FED;, use the package vnc. + + To enable remote graphical access to the installation system, enter two options at the prompt: @@ -247,21 +267,22 @@ for a shell]]> - - Installing a VNC Client - - To install a VNC client on &FED;, use the package - vnc. To run the - vncviewer client, choose - Applications - AccessoriesVNC - Viewer. - - + + To run the vncviewer client, choose + Applications + AccessoriesVNC + Viewer, or type the command + vncviewer in a terminal window. Enter + the server and display number in the VNC + Server dialog. For the example above, the + VNC Server is + computer.mydomain.com:1. + + Alternatively, you may automatically connect the interface for the installation system to an active VNC client, with the @@ -287,11 +308,33 @@ On &FED; systems, use the option to start the vncviewer VNC client in - listening mode: + listening mode. In a terminal window, enter the command: vncviewer -listen + + To enable remote access to a text mode installation, use the + option at the + boot: + prompt: + + +linux telnet + + + You may then connect to the installation system with the + telnet utility. The telnet + command requires the name or IP address of the installation + system: + + +telnet computer.mydomain.com + + + No password option for telnet ? + +
@@ -308,19 +351,19 @@ You may use Kickstart files that are located on either removable - storage, a hard drive, or a network server. Refer to + storage, or a hard drive, or on a network server. Refer to for the supported Kickstart sources.
Kickstart Sources - - + + - Source - Format + Kickstart Source + Option Format @@ -442,12 +485,12 @@
Hardware Options - - + + + Compatibility Setting Option - Keyword @@ -490,7 +533,7 @@ - Disable monitor detection (DDC) + Disable automatic monitor detection (DDC) @@ -603,6 +646,10 @@ linux expert + + May need an explanation of driver disks. + +
Index: fedora-install-guide-en.xml =================================================================== RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fedora-install-guide-en.xml 22 Dec 2005 01:47:35 -0000 1.33 +++ fedora-install-guide-en.xml 22 Dec 2005 14:54:15 -0000 1.34 @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -206,6 +206,16 @@ + + 1.1 + 2005-12-22 + StuartEllis + + + Amended Management Options section. + + + From fedora-docs-commits at redhat.com Fri Dec 23 22:57:38 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 17:57:38 -0500 Subject: documentation-guide docs-vim-en.xml,1.1,1.2 Message-ID: <200512232257.jBNMvcmW008659@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/documentation-guide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640 Modified Files: docs-vim-en.xml Log Message: Fix alignment and eliminate invalid tag Index: docs-vim-en.xml =================================================================== RCS file: /cvs/docs/documentation-guide/docs-vim-en.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docs-vim-en.xml 18 Mar 2004 20:25:02 -0000 1.1 +++ docs-vim-en.xml 23 Dec 2005 22:57:30 -0000 1.2 @@ -30,8 +30,7 @@ some VIM features useful for editing SGML or XML content such as DocBook: - -" Turn off vi compatibility settings like limited undo +" Turn off vi compatibility settings like limited undo set nocompatible " Syntax highlighting based on file extension syntax on @@ -40,8 +39,7 @@ " Automatically indent set autoindent " Match SGML tags with % -source $VIMRUNTIME/macros/matchit.vim - +source $VIMRUNTIME/macros/matchit.vim @@ -71,10 +69,8 @@ can save it in a separate file and load it with a source command in your .vimrc. - - - +e />:nohlsearcha @@ -99,10 +95,8 @@ imapcm F>a " entities imap > > -imap < < -]]> - - +imap < <]]> + Unfortunately, there is not currently a complete macro set for all From fedora-docs-commits at redhat.com Sat Dec 24 00:40:13 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 19:40:13 -0500 Subject: docs-common/packaging khelpcenter-plugin.xsl,NONE,1.1 Message-ID: <200512240040.jBO0eDcn012441@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12420 Added Files: khelpcenter-plugin.xsl Log Message: Added XSL for khelpcenter .desktop entry --- NEW FILE khelpcenter-plugin.xsl --- [Desktop Entry] DocPath=help://index.html Name= Name[]= X-DOC-Weight=-5000 From fedora-docs-commits at redhat.com Sat Dec 24 00:54:17 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 19:54:17 -0500 Subject: docs-common Makefile,1.2,1.3 Message-ID: <200512240054.jBO0sHYB012537@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12519 Modified Files: Makefile Log Message: Make build a little cleaner Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 12 Oct 2005 14:59:44 -0000 1.2 +++ Makefile 24 Dec 2005 00:54:09 -0000 1.3 @@ -14,8 +14,8 @@ DATE = $(shell date +"%Y-%m-%d") NOW = $(shell date +"%a %b %e %Y") SPECIN = ../docs-common/packaging/$(DOCBASE).spec -DOCSPEC = $(PWD)/SPECS/$(DOCBASE).spec -DOCSRCTAR = $(PWD)/SOURCES/$(DOCBASE)-$(RELEASE).src.tar.gz +DOCSPEC = $(shell rpm ${RPMFLAGS} --eval '%{_specdir}')/$(DOCBASE).spec +DOCSRCTAR = $(shell rpm ${RPMFLAGS} --eval '%{_sourcedir}')/$(DOCBASE)-$(RELEASE).src.tar.gz TITLE = Fedora Documentation Project Shared Files ###################################################### # Some RPM flags... @@ -23,7 +23,9 @@ RPMFLAGS = --define "docbase $(DOCBASE)" \ --define "version $(VERSION)" \ --define "release $(RELEASE)" \ - --define "_topdir $(PWD)" + --define "_topdir $(PWD)/rpmbuild" + +RPM = rpm ${RPMFLAGS} ###################################################### @@ -48,7 +50,7 @@ cpio -pamdv $(DOCBASE)-$(RELEASE) # # Make RPM build tree; don't rely on local user's setup - mkdir -p {BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS} + mkdir -p rpmbuild/{BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS} tar -zcvf $(DOCSRCTAR) $(DOCBASE)-$(RELEASE) cp $(SPECIN) $(DOCSPEC) rm -rf $(DOCBASE)-$(RELEASE)/ @@ -62,6 +64,6 @@ # Do the build... # rpmbuild -bb $(RPMFLAGS) $(DOCSPEC) - mv RPMS/noarch/*.rpm . + mv $(shell ${RPM} --eval '%{_rpmdir}')/noarch/*.rpm . rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC) - rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS} + rm -rf $(shell ${RPM} --eval '%{_topdir}') From fedora-docs-commits at redhat.com Sat Dec 24 01:08:18 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 20:08:18 -0500 Subject: example-tutorial rpm-info.xml,1.4,1.5 Message-ID: <200512240108.jBO18IM7014205@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14187 Modified Files: rpm-info.xml Log Message: Not letting our German speaking friends think we're Neanderthals... also good for testing UTF8 Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpm-info.xml 27 Nov 2005 23:27:52 -0000 1.4 +++ rpm-info.xml 24 Dec 2005 01:07:52 -0000 1.5 @@ -20,8 +20,8 @@ This is quite a feat. - Beispeil Tutorial - Ist idiotien + Beispieltutorial + Dieses ist durchaus ein Meisterst??ck. From fedora-docs-commits at redhat.com Sat Dec 24 01:25:18 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 20:25:18 -0500 Subject: docs-common/packaging bookinfo.xsl,1.2,1.3 Message-ID: <200512240125.jBO1PITO014310@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14292 Modified Files: bookinfo.xsl Log Message: Catch multiple copyright years Index: bookinfo.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bookinfo.xsl 26 Nov 2005 21:44:24 -0000 1.2 +++ bookinfo.xsl 24 Dec 2005 01:25:10 -0000 1.3 @@ -11,9 +11,9 @@ - - - + + + From fedora-docs-commits at redhat.com Sat Dec 24 01:25:46 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 23 Dec 2005 20:25:46 -0500 Subject: docs-common/bin xmlformat-fdp.conf,1.8,1.9 Message-ID: <200512240125.jBO1Pkfs014334@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/bin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14316 Modified Files: xmlformat-fdp.conf Log Message: Normalize articleinfo and bookinfo elements Index: xmlformat-fdp.conf =================================================================== RCS file: /cvs/docs/docs-common/bin/xmlformat-fdp.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmlformat-fdp.conf 30 Nov 2005 12:57:25 -0000 1.8 +++ xmlformat-fdp.conf 24 Dec 2005 01:25:39 -0000 1.9 @@ -22,6 +22,12 @@ wrap-length = 72 element-break = 2 +article book + element-break = 2 + +articleinfo bookinfo + normalize = yes + year holder entry-break = 0 exit-break = 0 @@ -40,10 +46,6 @@ revremark normalize = yes - -article book - element-break = 2 - section entry-break = 1 normalize = yes From fedora-docs-commits at redhat.com Sat Dec 24 12:44:39 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Sat, 24 Dec 2005 07:44:39 -0500 Subject: docs-common/common cvs-it.xml, 1.2, 1.3 legalnotice-content-it.xml, 1.1, 1.2 Message-ID: <200512241244.jBOCid3Q002546@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/docs-common/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2520/docs-common/common Modified Files: cvs-it.xml legalnotice-content-it.xml Log Message: Typos checked Index: cvs-it.xml =================================================================== RCS file: /cvs/docs/docs-common/common/cvs-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cvs-it.xml 20 Nov 2005 18:29:38 -0000 1.2 +++ cvs-it.xml 24 Dec 2005 12:44:32 -0000 1.3 @@ -17,11 +17,11 @@ Il Concurrent Versions System (CVS) fornisce un framework dove molteplici utenti possono editare gli stessi files. Come puoi immaginare, se un gruppo di utenti edita i files in una singola - directory, il chaos regner??. Usando CVS, + directory, il caos regner??. Usando CVS, comunque, un gruppo di persone pu?? lavorare con sicurezza sullo stesso gruppo di files. CVS mantiene la copia master dei files, e registra chi ha cambiato cosa e quando in un depositorio centrale. Se - insorgssero dei conflitti, CVS te lo far?? sapere. + insorgessero dei conflitti, CVS te lo far?? sapere. CVS ?? spesso usato affinch?? i programmatori possano condividere codice, ma funziona bene anche per la documentazione. @@ -40,7 +40,7 @@ In molti casi, ogni gruppo di files che costituisce un pacchetto o un progetto - ?? immagazzinato come un module sul CVS server. + ?? immagazzinato come modulo sul CVS server. @@ -67,7 +67,7 @@ Quando commetti i cambiamenti, solo i cambiamenti ai files che il server sa sono commessi. In altre parole, se crei un file nel checkout locale di un modulo, il nuovo file non ?? automaticamente - inviato al server. Devi prima add il + inviato al server. Devi prima fare un add del file al repositorio quindi eseguire il commit. Se rimuovi un file dal tuo checkout locale di un modulo, dovrai specificare che vuoi rimuoverlo dal repositorio sul CVS server e quindi @@ -125,10 +125,10 @@ e vedi un output simile a cvs-1.11.19-1, allora il pacchetto ?? installato. Un messaggio simile a package cvs - is not installed vuol dire che devi instllare il + is not installed vuol dire che devi installare il pacchetto cvs prima di continuare. Se non sai come fare, consulta il tuo amministratore di sistema - che potr?? intallarlo per te. + che potr?? installarlo per te.
@@ -155,7 +155,7 @@ Se la tua chiave DSA esistente non richiede una passphrase, sei fortemente incoraggiato a - generrne una che richieda una passphrase. + generarne una che richieda una passphrase. @@ -296,7 +296,7 @@ Se il tuo obbiettivo ?? scaricare i vari documenti &FC; e renderizzarli sul tuo sistema, hai bisogno solo di un accesso read-only al depositorio CVS. Segui le - instruzioni in questa sezione quindi salta direttamente a + istruzioni in questa sezione quindi salta direttamente a . @@ -345,7 +345,7 @@ - Sotoscriviti alla + Sottoscriviti alla fedora-docs-list , che ?? il forum principale del progetto. @@ -394,7 +394,7 @@ $CVSROOT e $CVS_RSH - impostate, puoi accedera al repositorio: + impostate, puoi accedere al repositorio: $ cvs co -c @@ -428,7 +428,7 @@ Se hai una directory CVS/, - CVS ignorera qualsiasi + CVS ignorer?? qualsiasi $CVSROOT o switch della linea di comando . @@ -456,7 +456,7 @@ $ cvs co example-tutorial Verr?? creata una directory chiamata example-tutorial/ - nela directory corrente. + nella directory corrente. @@ -586,7 +586,7 @@ Il <filename> pu?? essere un - filename, una serie si filenames separati da spazi, o un gruppo + filename, una serie di filenames separati da spazi, o un gruppo di filenames specificati usando una wildcards tipo *.png o foo-*.sgml. @@ -596,7 +596,7 @@ comando commit, tutti i cambiamenti eccezionali di qualsiasi tipo sono commessi al server. Il comando ?? recursivo ed includer?? i cambiamenti in ogni subdirectories del modulo. - Usa cautela qunado esegui il comando commit + Usa cautela quando esegui il comando commit senza nessun filenames poich?? potresti non ricordare esattamente quali files sono cambiano. @@ -651,8 +651,8 @@ Questa sostituzione di keyword di solito corrompe i files binari, cos?? deve essere disattivata se cvs non - reconosce i tuoi files come binari. Per marcare il tuo file come - binario, e quindi disattivare l'espansione dell keyword, usa + riconosce i tuoi files come binari. Per marcare il tuo file come + binario, e quindi disattivare l'espansione delle keyword, usa il comando: $ cvs filename @@ -694,7 +694,7 @@ Dopo la rimozione del file, devi eseguire il commit della rimozione: -$ cvs commit "qualche messagiio di log" file-da-rimuovere +$ cvs commit "qualche messaggio di log" file-da-rimuovere Non puoi usare wildcards nel eseguire il commit per identificare files rimossi. Essi devono essere specificati con il nome @@ -744,7 +744,7 @@ Hai aggiornato il file all'ultima versione dal server, - ma poi hai modificatio il file sul tuo sistema. + ma poi hai modificato il file sul tuo sistema. @@ -777,7 +777,7 @@ Sul server c'?? una nuova versione del file ed necessita di essere recuperata. Anche se lo status include la parola - checkout, vuoldire che hai bisogno di aggiornare + checkout, vuol dire che hai bisogno di aggiornare i files con il comando cvs update. @@ -826,7 +826,7 @@ Il CVS server non sa nulla su questo file. Il file non ?? stato aggiunto ne - rimosso loclamente e non ?? mai stato commesso al + rimosso localmente e non ?? mai stato commesso al server. Questo status di solito sussiste per i files che di cui non vorresti fare il commit al CVS tipo i generated-index.sgml o per quei files @@ -846,7 +846,7 @@ Se modifichi un file e la stessa regione ?? modificata da qualcun'altro - che esegue il commitprima di te, probabilmente vedrai un messaggio + che esegue il commit prima di te, probabilmente vedrai un messaggio simile al seguente quando eseguirai il commit o l'aggiornamento della tua copia locale del modulo: @@ -890,7 +890,7 @@ - Resolvi il conflitto editando la tua copia, ed esegui il commit del file. + Risolvi il conflitto editando la tua copia, ed esegui il commit del file. @@ -986,7 +986,7 @@ Per maggiori informazioni, leggi il manuale CVS disponibile sul tuo sistema in /usr/share/doc/cvs-<version-number>/cvs.ps - (la versione CVS pu?? cambiare) e visita la pagian web di CVS disponibile + (la versione CVS pu?? cambiare) e visita la pagina web di CVS disponibile su http://www.cvshome.org/. Index: legalnotice-content-it.xml =================================================================== RCS file: /cvs/docs/docs-common/common/legalnotice-content-it.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- legalnotice-content-it.xml 19 Nov 2005 20:24:08 -0000 1.1 +++ legalnotice-content-it.xml 24 Dec 2005 12:44:32 -0000 1.2 @@ -1,6 +1,6 @@ - Sono garatiti i permessi di copiare, distribuire, e/o modificare questo documento sotto + Sono garantiti i permessi di copiare, distribuire, e/o modificare questo documento sotto i termini della GNU Free Documentation License, Versione 1.2 o qualsiasi successiva versione pubblicata dalla Free Software Foundation; con nessuna Invariant Sections, nessuna Front-Cover Texts, e nessuna Back-Cover Texts. Una copia della From fedora-docs-commits at redhat.com Sat Dec 24 14:22:14 2005 From: fedora-docs-commits at redhat.com (Francesco Tombolini (tombo)) Date: Sat, 24 Dec 2005 09:22:14 -0500 Subject: docs-common/common fedora-entities-it.ent,1.1,1.2 Message-ID: <200512241422.jBOEMEml006342@cvs-int.fedora.redhat.com> Author: tombo Update of /cvs/docs/docs-common/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6324 Modified Files: fedora-entities-it.ent Log Message: Updated IG definition Index: fedora-entities-it.ent =================================================================== RCS file: /cvs/docs/docs-common/common/fedora-entities-it.ent,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-entities-it.ent 19 Nov 2005 20:38:08 -0000 1.1 +++ fedora-entities-it.ent 24 Dec 2005 14:22:06 -0000 1.2 @@ -60,7 +60,7 @@ - + From fedora-docs-commits at redhat.com Sat Dec 24 16:07:21 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 24 Dec 2005 11:07:21 -0500 Subject: docs-common/packaging fedora-doc-gnome.desktop.in.common, NONE, 1.1 fedora-doc.desktop.in.common, 1.3, NONE Message-ID: <200512241607.jBOG7LSu009762@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9736 Added Files: fedora-doc-gnome.desktop.in.common Removed Files: fedora-doc.desktop.in.common Log Message: Renamed fedora-doc.desktop.in.common to fedora-doc-gnome.desktop.in.common --- NEW FILE fedora-doc-gnome.desktop.in.common --- [Desktop Entry] Encoding=UTF-8 Categories=X-Fedora-Documentation; Name=@TITLE@ GenericName=@TITLE@ Exec=gnome-help file:///usr/share/fedora/doc/fedora-doc- at DOCBASE@/C/@DOCBASE at -en.xml Icon=icon-documentation.png Terminal=false Type=Application Comment=Official Fedora documentation --- fedora-doc.desktop.in.common DELETED --- From fedora-docs-commits at redhat.com Sat Dec 24 16:31:03 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 24 Dec 2005 11:31:03 -0500 Subject: docs-common/packaging gnome-desktop.xsl, NONE, 1.1 fedora-doc-gnome.desktop.in.common, 1.1, NONE Message-ID: <200512241631.jBOGV3dS010095@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10078 Added Files: gnome-desktop.xsl Removed Files: fedora-doc-gnome.desktop.in.common Log Message: Never mind, we can do this with XSLT instead, thanks to MegaCoder --- NEW FILE gnome-desktop.xsl --- [Desktop Entry] Encoding=UTF-8 Categories=X-Fedora-Documentation; Name= GenericName= Exec=gnome-help file:///usr/share/fedora/doc/fedora-doc-/C/-en.xml Name[]= Exec[]=gnome-help file:///usr/share/fedora/doc/fedora-doc-//-.xml Icon=icon-documentation.png Terminal=false Type=Application ShowOnlyIn=GNOME; --- fedora-doc-gnome.desktop.in.common DELETED --- From fedora-docs-commits at redhat.com Sat Dec 24 16:32:15 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 24 Dec 2005 11:32:15 -0500 Subject: docs-common/packaging gnome-desktop.xsl,1.1,1.2 Message-ID: <200512241632.jBOGWFED010119@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10101 Modified Files: gnome-desktop.xsl Log Message: Fix term Index: gnome-desktop.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/gnome-desktop.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-desktop.xsl 24 Dec 2005 16:30:56 -0000 1.1 +++ gnome-desktop.xsl 24 Dec 2005 16:32:08 -0000 1.2 @@ -28,7 +28,7 @@ Icon=icon-documentation.png Terminal=false Type=Application -ShowOnlyIn=GNOME; +OnlyShowIn=GNOME; From fedora-docs-commits at redhat.com Sat Dec 24 16:43:12 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 24 Dec 2005 11:43:12 -0500 Subject: example-tutorial example-tutorial-de.xml,1.2,1.3 Message-ID: <200512241643.jBOGhCN9010150@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10132 Modified Files: example-tutorial-de.xml Log Message: Just to make things less confusing while testing some XSLTs Index: example-tutorial-de.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- example-tutorial-de.xml 28 Nov 2005 01:36:14 -0000 1.2 +++ example-tutorial-de.xml 24 Dec 2005 16:43:05 -0000 1.3 @@ -20,7 +20,7 @@
- Example Tutorial + Beispieltutorial 2003, 2005 &FORMAL-RHI; From fedora-docs-commits at redhat.com Sun Dec 25 19:26:18 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 25 Dec 2005 14:26:18 -0500 Subject: docs-common/packaging kde-desktop.xsl, NONE, 1.1 doctype.xsl, NONE, 1.1 gnome-desktop.xsl, 1.2, 1.3 Message-ID: <200512251926.jBPJQI6D029586@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566 Modified Files: gnome-desktop.xsl Added Files: kde-desktop.xsl doctype.xsl Log Message: Additional helpful XSLT, also provide doctype dynamically --- NEW FILE kde-desktop.xsl --- [Desktop Entry] Encoding=UTF-8 Categories=X-Fedora-Documentation; Name= Exec=khelpcenter help:/fedora-doc-/index.html Name[]= Comment[]= Icon=icon-documentation.png Terminal=false Keywords=fedora OnlyShowIn=KDE; --- NEW FILE doctype.xsl --- articleinfo bookinfo Index: gnome-desktop.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/gnome-desktop.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-desktop.xsl 24 Dec 2005 16:32:08 -0000 1.2 +++ gnome-desktop.xsl 25 Dec 2005 19:26:10 -0000 1.3 @@ -15,16 +15,20 @@ GenericName= Exec=gnome-help file:///usr/share/fedora/doc/fedora-doc-/C/-en.xml +Comment= Name[]= + select="@lang"/>]= + Exec[]=gnome-help file:///usr/share/fedora/doc/fedora-doc-//-.xml +Comment[]= + Icon=icon-documentation.png Terminal=false Type=Application @@ -41,4 +45,14 @@ + + + + + + + + + + From fedora-docs-commits at redhat.com Sun Dec 25 20:36:42 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 25 Dec 2005 15:36:42 -0500 Subject: docs-common/packaging khelpcenter-fdp.directory, NONE, 1.1 fedora-doc-common.spec, 1.2, 1.3 Message-ID: <200512252036.jBPKag8K031446@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31427 Modified Files: fedora-doc-common.spec Added Files: khelpcenter-fdp.directory Log Message: Add .directory for khelpcenter, include in f-doc-common spec --- NEW FILE khelpcenter-fdp.directory --- # Fedora Documentation for KHelpCenter [KDE Desktop Entry] Name=Fedora Comment=Official Fedora Documentation DocPath= Index: fedora-doc-common.spec =================================================================== RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-doc-common.spec 12 Oct 2005 14:59:43 -0000 1.2 +++ fedora-doc-common.spec 25 Dec 2005 20:36:34 -0000 1.3 @@ -12,12 +12,14 @@ Source0: fedora-doc-common-%release.src.tar.gz Group: Documentation BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -This package contains the common entities and XML fragments for -official Fedora Documentation. +This package contains the following official Fedora Documentation components: +- Common entities and XML fragments +- Desktop menu integration +- Help system integration for GNOME and KDE %prep @@ -42,6 +44,8 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/stylesheet-images/* \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory %clean @@ -54,6 +58,7 @@ %{_datadir}/fedora/doc/docs-common/common/* %{_datadir}/fedora/doc/docs-common/css/* %{_datadir}/fedora/doc/docs-common/stylesheet-images/* +%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory %{_sysconfdir}/xdg/menus/applications-merged/* %changelog From fedora-docs-commits at redhat.com Mon Dec 26 04:06:03 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 25 Dec 2005 23:06:03 -0500 Subject: docs-common/packaging rpm-info.dtd,1.4,1.5 Message-ID: <200512260406.jBQ463MI013642@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609/docs-common/packaging Modified Files: rpm-info.dtd Log Message: Need to provide function for langifying revision history Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpm-info.dtd 27 Nov 2005 23:27:58 -0000 1.4 +++ rpm-info.dtd 26 Dec 2005 04:05:54 -0000 1.5 @@ -49,3 +49,4 @@ + From fedora-docs-commits at redhat.com Mon Dec 26 04:05:56 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 25 Dec 2005 23:05:56 -0500 Subject: example-tutorial rpm-info.xml,1.5,1.6 Message-ID: <200512260406.jBQ46c3I013646@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609/d Modified Files: rpm-info.xml Log Message: Need to provide function for langifying revision history Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpm-info.xml 24 Dec 2005 01:07:52 -0000 1.5 +++ rpm-info.xml 26 Dec 2005 04:04:53 -0000 1.6 @@ -32,6 +32,6 @@
Add revision history
- +
addierte Neuausgabengeschichte From fedora-docs-commits at redhat.com Mon Dec 26 17:22:03 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Mon, 26 Dec 2005 12:22:03 -0500 Subject: example-tutorial example-tutorial-en.xml, 1.17, 1.18 rpm-info.xml, 1.6, 1.7 Message-ID: <200512261722.jBQHM3Tk005407@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5368 Modified Files: example-tutorial-en.xml rpm-info.xml Log Message: Adjust XML file to be consistent with new standards. Wow, I really need to get to updating the DocGuide soon. Also, fix an error I made in rpm-info.xml yesterday. Index: example-tutorial-en.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- example-tutorial-en.xml 27 Nov 2005 13:55:30 -0000 1.17 +++ example-tutorial-en.xml 26 Dec 2005 17:21:55 -0000 1.18 @@ -6,10 +6,10 @@ %FEDORA-ENTITIES-EN; - - - - + + + + Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpm-info.xml 26 Dec 2005 04:04:53 -0000 1.6 +++ rpm-info.xml 26 Dec 2005 17:21:55 -0000 1.7 @@ -32,6 +32,7 @@
Add revision history
-
addierte Neuausgabengeschichte +
addierte Neuausgabengeschichte
+ From fedora-docs-commits at redhat.com Tue Dec 27 14:23:27 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 09:23:27 -0500 Subject: docs-common/packaging spec.xsl,1.4,1.5 Message-ID: <200512271423.jBRENRgV013207@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13189 Modified Files: spec.xsl Log Message: Some improvements to make nicer, more Fedora compliant spec Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- spec.xsl 26 Nov 2005 21:44:24 -0000 1.4 +++ spec.xsl 27 Dec 2005 14:23:19 -0000 1.5 @@ -20,22 +20,24 @@ Url: http://fedora.redhat.com/projects/docs Source0: %{docbase}-%{version}.src.tar.gz Source1: %{name}.desktop - -Source: %{name}-.omf +Source: %{name}-C.omf + Group: Documentation BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: scrollkeeper >= 0.3.11 Requires: fedora-doc-common BuildRequires: xmlto +BuildRequires: kdelibs %description - -%description - - +%description + %prep %setup -q -n %{docbase}-${version} @@ -63,10 +65,9 @@ %changelog - -* - <> - +* - <> - - - + From fedora-docs-commits at redhat.com Tue Dec 27 18:14:45 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 13:14:45 -0500 Subject: docs-common/packaging spec.xsl,1.5,1.6 Message-ID: <200512271814.jBRIEjDV020389@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20371 Modified Files: spec.xsl Log Message: Additional spec improvements Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- spec.xsl 27 Dec 2005 14:23:19 -0000 1.5 +++ spec.xsl 27 Dec 2005 18:14:37 -0000 1.6 @@ -54,13 +54,13 @@ /bin/rm -rf $RPM_BUILD_ROOT -%post +%post /usr/bin/scrollkeeper-update || true -%postun +%postun /usr/bin/scrollkeeper-update || true -%files +%files %defattr(-, root, root, -) From fedora-docs-commits at redhat.com Wed Dec 28 00:36:43 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 19:36:43 -0500 Subject: docs-common/common bugreporting-en.xml, 1.1, 1.2 bugreporting-it.xml, 1.1, 1.2 bugreporting-zh_CN.xml, 1.1, 1.2 legalnotice-content-en.xml, 1.2, 1.3 legalnotice-content-it.xml, 1.2, 1.3 legalnotice-content-ru.xml, 1.1, 1.2 Message-ID: <200512280036.jBS0ahI8032305@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32277 Modified Files: bugreporting-en.xml bugreporting-it.xml bugreporting-zh_CN.xml legalnotice-content-en.xml legalnotice-content-it.xml legalnotice-content-ru.xml Log Message: Use new entity nomenclature properly Index: bugreporting-en.xml =================================================================== RCS file: /cvs/docs/docs-common/common/bugreporting-en.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bugreporting-en.xml 21 Aug 2005 13:27:00 -0000 1.1 +++ bugreporting-en.xml 28 Dec 2005 00:36:35 -0000 1.2 @@ -6,7 +6,7 @@ at &BZ-URL;. When you file your bug, select "&BZ-PROD;" as the Product, and select the title of this document as the Component. The version of this document is - &BOOKID;. + &DOCID;. Index: bugreporting-it.xml =================================================================== RCS file: /cvs/docs/docs-common/common/bugreporting-it.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bugreporting-it.xml 19 Nov 2005 20:22:35 -0000 1.1 +++ bugreporting-it.xml 28 Dec 2005 00:36:35 -0000 1.2 @@ -6,7 +6,7 @@ su &BZ-URL;. Quando invii il tuo errore, seleziona "&BZ-PROD;" come Product, e seleziona il titolo di questo documento come Component. La versione di questo documento ?? - &BOOKID;. + &DOCID;. Index: bugreporting-zh_CN.xml =================================================================== RCS file: /cvs/docs/docs-common/common/bugreporting-zh_CN.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bugreporting-zh_CN.xml 10 Dec 2005 12:56:34 -0000 1.1 +++ bugreporting-zh_CN.xml 28 Dec 2005 00:36:35 -0000 1.2 @@ -2,7 +2,7 @@ ?????????????????? - ???????????????????????????????????????????????? &BZ-URL; ?????? &BZ; ??????????????????????????????????????????????????????????????? "&BZ-PROD;" ?????? Product(??????)???????????????????????????????????? Component(??????)???????????????????????? &BOOKID;??? + ???????????????????????????????????????????????? &BZ-URL; ?????? &BZ; ??????????????????????????????????????????????????????????????? "&BZ-PROD;" ?????? Product(??????)???????????????????????????????????? Component(??????)???????????????????????? &DOCID;??? Index: legalnotice-content-en.xml =================================================================== RCS file: /cvs/docs/docs-common/common/legalnotice-content-en.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- legalnotice-content-en.xml 31 Oct 2005 15:43:23 -0000 1.2 +++ legalnotice-content-en.xml 28 Dec 2005 00:36:35 -0000 1.3 @@ -25,7 +25,7 @@ - &BOOKID; + &DOCID; Index: legalnotice-content-it.xml =================================================================== RCS file: /cvs/docs/docs-common/common/legalnotice-content-it.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- legalnotice-content-it.xml 24 Dec 2005 12:44:32 -0000 1.2 +++ legalnotice-content-it.xml 28 Dec 2005 00:36:35 -0000 1.3 @@ -25,7 +25,7 @@ - &BOOKID; + &DOCID; Index: legalnotice-content-ru.xml =================================================================== RCS file: /cvs/docs/docs-common/common/legalnotice-content-ru.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- legalnotice-content-ru.xml 27 Nov 2005 13:12:01 -0000 1.1 +++ legalnotice-content-ru.xml 28 Dec 2005 00:36:35 -0000 1.2 @@ -53,7 +53,7 @@ - &BOOKID; + &DOCID; - + Index: documentation-guide-zh_CN.xml =================================================================== RCS file: /cvs/docs/documentation-guide/documentation-guide-zh_CN.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- documentation-guide-zh_CN.xml 17 Dec 2005 13:28:38 -0000 1.2 +++ documentation-guide-zh_CN.xml 28 Dec 2005 00:40:27 -0000 1.3 @@ -4,7 +4,7 @@ %FEDORA-ENTITIES-EN; - + From fedora-docs-commits at redhat.com Wed Dec 28 00:43:33 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 19:43:33 -0500 Subject: example-tutorial Makefile, 1.20, 1.21 example-tutorial-de.xml, 1.3, 1.4 Message-ID: <200512280043.jBS0hXjL032367@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32347 Modified Files: Makefile example-tutorial-de.xml Log Message: Update to use new entity standards Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile 1 Dec 2005 21:10:41 -0000 1.20 +++ Makefile 28 Dec 2005 00:43:25 -0000 1.21 @@ -18,10 +18,10 @@ DOCBASE = example-tutorial # DOCTITLE-en = Example Tutorial -XMLEXTRAFILES-en=article-info-en.xml +XMLEXTRAFILES-en= fdp-info-en.xml # DOCTITLE-de = Beispiel Tutorial -XMLEXTRAFILES-de= +XMLEXTRAFILES-de= fdp-info-de.xml # ###################################################### include ../docs-common/Makefile.common @@ -38,20 +38,15 @@ ###################################################### # -article-info-en.xml:: rpm-info.xml - xsltproc --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@ - -clean:: - ${RM} bookinfo.xml ###################################################### ###################################################### # Some packaging specific vars # These are obviated by new standard -#VERSION=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/ $@ +endef + +fdp-info.xml:: $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG}))) +spec:: rpm-info.xml + $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > ${DOCBASE}.spec + +gnome-desktop-file:: rpm-info.xml + $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > ${DOCBASE}-gnome.desktop + +kde-desktop-file:: rpm-info.xml + $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > ${DOCBASE}-kde.desktop + +khelpcenter-file:: rpm-info.xml + $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > ${DOCBASE}-khelpcenter.desktop define rpm_template -rpm-$(1):: clean $(DOCBASE)-$(VERSION).src.tar.gz +rpm-$(1):: clean $(DOCBASE)-$(1).src.tar.gz # depend on source tarball and lang-specific HTML tarball # Make RPM build tree; don't rely on local user's setup mkdir -p BUILD @@ -98,24 +112,26 @@ # Make rpmlint happy with a changelog entry # FIXME: Maybe more magic would make this stickier; pity # I'm no magician... - sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project - $(VERSION)-1\n- Update to version $(VERSION)\n/' \ - $(SPECIN) > $(DOCSPEC) +# sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project - $(VERSION)-1\n- Update to version $(VERSION)\n/' \ +# $(SPECIN) > $(DOCSPEC) + # # Fill in files # FIXME: Needs to be multiplexed for LANGUAGES (see above) - cp $(OMFIN) $(DOCOMF) - cp $(DESKTOPIN) $(DOCDESKTOP) - sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF) - sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF) - sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF) - sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF) - sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP) - sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP) - sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP) - sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP) +# cp $(OMFIN) $(DOCOMF) +# cp $(DESKTOPIN) $(DOCDESKTOP) +# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF) +# sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF) +# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF) +# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF) +# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP) +# sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP) +# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP) +# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP) # # Do the build... # + rpmbuild -bb $(RPMFLAGS) \ $(DOCSPEC) rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC) Index: example-tutorial-de.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- example-tutorial-de.xml 24 Dec 2005 16:43:05 -0000 1.3 +++ example-tutorial-de.xml 28 Dec 2005 00:43:25 -0000 1.4 @@ -5,10 +5,10 @@ %FEDORA-ENTITIES-EN; - - - - + + + + ]> From fedora-docs-commits at redhat.com Wed Dec 28 00:55:59 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 19:55:59 -0500 Subject: docs-common/packaging rpm-info.dtd,1.5,1.6 Message-ID: <200512280055.jBS0txIg032423@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/docs-common/packaging Modified Files: rpm-info.dtd Log Message: Langifying means optionally more than one details entry Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpm-info.dtd 26 Dec 2005 04:05:54 -0000 1.5 +++ rpm-info.dtd 28 Dec 2005 00:55:52 -0000 1.6 @@ -22,7 +22,7 @@ - + From fedora-docs-commits at redhat.com Wed Dec 28 01:04:02 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 27 Dec 2005 20:04:02 -0500 Subject: docs-common Makefile.common,1.22,1.23 Message-ID: <200512280104.jBS142ue001581@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1566/docs-common Modified Files: Makefile.common Log Message: Define macro for xsltproc Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile.common 15 Dec 2005 06:00:02 -0000 1.22 +++ Makefile.common 28 Dec 2005 01:03:47 -0000 1.23 @@ -56,6 +56,8 @@ # Define a macro to locate xmlto(1) so we can choose a specific version # by "make XMLTO=/path/to/xmlto", if we so desire. XMLTO =xmlto +# Let's also do this for xsltproc(1). +XSLTPROC=xsltproc ######################################################################### # PUT NO TARGETS BEFORE THIS ONE, not even in your base Makefile # In a properly-constructed Makefile, this will be the default target From fedora-docs-commits at redhat.com Wed Dec 28 18:32:30 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 13:32:30 -0500 Subject: docs-common Makefile.common,1.23,1.24 Message-ID: <200512281832.jBSIWUip001901@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1883/docs-common Modified Files: Makefile.common Log Message: Remove nochunks watermark during clean target Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.common 28 Dec 2005 01:03:47 -0000 1.23 +++ Makefile.common 28 Dec 2005 18:32:22 -0000 1.24 @@ -145,7 +145,7 @@ ${RM} -r ${DOCBASE}-$(1).html stylesheet-images ${RM} -r ${DOCBASE}-$(1).pdf ${RM} -r ${DOCBASE}-$(1).tar.gz - ${RM} fedora.css watermark-${LANG}.png + ${RM} fedora.css watermark-${LANG}.png watermark.png endef # distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean) From fedora-docs-commits at redhat.com Wed Dec 28 18:38:11 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 13:38:11 -0500 Subject: mirror-tutorial mirror-tutorial-en.xml,1.21,1.22 Message-ID: <200512281838.jBSIcBCu001930@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/mirror-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1912 Modified Files: mirror-tutorial-en.xml Log Message: Updated to 0.37.2, fixing minor tagging errors and updating entities Index: mirror-tutorial-en.xml =================================================================== RCS file: /cvs/docs/mirror-tutorial/mirror-tutorial-en.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mirror-tutorial-en.xml 27 Nov 2005 17:13:26 -0000 1.21 +++ mirror-tutorial-en.xml 28 Dec 2005 18:38:04 -0000 1.22 @@ -5,12 +5,11 @@ %FEDORA-ENTITIES-EN; - - - - + + + + - ]> @@ -223,6 +222,17 @@ + + 0.37.2 + 2005-12-28 + PaulWFrields + + + Minor revision updating entity names and incorporating + variablelist. + + + @@ -755,32 +765,44 @@ feedback. The switches -PHav enable the following rsync features: - - - - -P — recover partially-downloaded files, - and show a progress meter - - - - - -H — preserve hard links - - - - - -a — recurse all directories, and preserve - as much file information as possible, including timestamps, - ownership, permissions, device files (if you are running as root), - and soft links - - - - - -v — give verbose feedback to the screen - - - + + + -P + + + recover partially-downloaded files, and show a progress + meter + + + + + -H + + + preserve hard links + + + + + -a + + + recurse all directories, and preserve as much file + information as possible, including timestamps, + ownership, permissions, device files (if you are running + as root), and soft links + + + + + -v + + + give verbose feedback to the screen + + + + Remove the -v switch if you run this mirroring From fedora-docs-commits at redhat.com Wed Dec 28 20:01:46 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 15:01:46 -0500 Subject: docs-common/packaging spec.xsl,1.6,1.7 Message-ID: <200512282001.jBSK1kuU005944@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5908/packaging Modified Files: spec.xsl Log Message: Grab all .desktop files Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- spec.xsl 27 Dec 2005 18:14:37 -0000 1.6 +++ spec.xsl 28 Dec 2005 20:01:25 -0000 1.7 @@ -19,9 +19,11 @@ License: (Version ) Url: http://fedora.redhat.com/projects/docs Source0: %{docbase}-%{version}.src.tar.gz -Source1: %{name}.desktop +Source1: %{name}-gnome.desktop +Source2: %{name}-kde.desktop +Source3: %{name}-khelp.desktop Source: %{name}-: %{name}-C.omf From fedora-docs-commits at redhat.com Wed Dec 28 20:02:36 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 15:02:36 -0500 Subject: docs-common/packaging fedora-doc-common.spec,1.3,1.4 Message-ID: <200512282002.jBSK2aks006017@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5952/packaging Modified Files: fedora-doc-common.spec Log Message: Hopefully improve conditions for offline doc builders Index: fedora-doc-common.spec =================================================================== RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-doc-common.spec 25 Dec 2005 20:36:34 -0000 1.3 +++ fedora-doc-common.spec 28 Dec 2005 20:02:21 -0000 1.4 @@ -44,8 +44,13 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/stylesheet-images/* \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/ +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/*.{xsl,dtd} \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/packaging/ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/packaging/khelpcenter-fdp.directory $RPM_BUILD_ROOT/%{_datadir}/apps/khelpcenter/plugins/Fedora/.directory +install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/Makefile.common \ + $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/Makefile.common %clean @@ -55,8 +60,10 @@ %files %defattr(-, root, root,-) %docdir %{_datadir}/fedora/doc/docs-common/common/ +%{_datadir}/fedora/doc/docs-common/Makefile.common %{_datadir}/fedora/doc/docs-common/common/* %{_datadir}/fedora/doc/docs-common/css/* +%{_datadir}/fedora/doc/docs-common/packaging/* %{_datadir}/fedora/doc/docs-common/stylesheet-images/* %{_datadir}/apps/khelpcenter/plugins/Fedora/.directory %{_sysconfdir}/xdg/menus/applications-merged/* From fedora-docs-commits at redhat.com Wed Dec 28 20:02:23 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 15:02:23 -0500 Subject: docs-common Makefile,1.3,1.4 Message-ID: <200512282002.jBSK2roR006025@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5952 Modified Files: Makefile Log Message: Hopefully improve conditions for offline doc builders Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 24 Dec 2005 00:54:09 -0000 1.3 +++ Makefile 28 Dec 2005 20:02:13 -0000 1.4 @@ -48,6 +48,8 @@ -name '.*' -o -name '*~' -o \ -name '*.svg' -o -name '*.eps' \) | \ cpio -pamdv $(DOCBASE)-$(RELEASE) +# include Makefile.common for use in offline FDP doc building + cp Makefile.common $(DOCBASE)-$(RELEASE) # # Make RPM build tree; don't rely on local user's setup mkdir -p rpmbuild/{BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS} From fedora-docs-commits at redhat.com Wed Dec 28 22:19:13 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 17:19:13 -0500 Subject: example-tutorial Makefile, 1.21, 1.22 example-tutorial-de.xml, 1.4, 1.5 example-tutorial-en.xml, 1.18, 1.19 Message-ID: <200512282219.jBSMJDsH010488@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10466 Modified Files: Makefile example-tutorial-de.xml example-tutorial-en.xml Log Message: Current state of the world, the light at the end of the tunnel is an oncoming train Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile 28 Dec 2005 00:43:25 -0000 1.21 +++ Makefile 28 Dec 2005 22:19:04 -0000 1.22 @@ -48,100 +48,85 @@ DATE=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//') VERSION=$(shell grep " DOCVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' ) NOW=$(shell date +"%a %b %e %Y") -SPECIN=../docs-common/packaging/fedora-doc.spec.in.common -OMFIN=../docs-common/packaging/fedora-doc.omf.in.common -DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common -DOCSPEC=$(PWD)/$(DOCBASE).spec.in -DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf -DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop -DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz -TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//') +#SPECIN=../docs-common/packaging/fedora-doc.spec.in.common +#OMFIN=../docs-common/packaging/fedora-doc.omf.in.common +#DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common +#DOCSPEC=$(PWD)/$(DOCBASE).spec.in +#DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf +#DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop +#DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz +#TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//') ###################################################### # Some RPM flags... ###################################################### -RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "lang $(1)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-$(1)-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)" --define "lang $(LANG)" +RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)" ###################################################### -$(DOCBASE)-$(VERSION).src.tar.gz:: tarball - mkdir $(DOCBASE)-$(VERSION) - find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \ - -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \ - | cpio -pamdv $(DOCBASE)-$(VERSION) - find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \ - -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \ - | cpio -pamdv $(DOCBASE)-$(VERSION) - ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-$(VERSION).tar.gz ) - pwd - tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/ - rm -rf $(DOCBASE)-$(VERSION)/ - -#$(DOCBASE)-$(1)-clean:: clean:: ${RM} -rf fedora-doc-$(DOCBASE)*.rpm ${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz ${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/ - ${RM} -f *omf *desktop *spec.in + ${RM} -f *omf *desktop *spec ${RM} -f fdp-info-*.xml + sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\@\&FDP-INFO;@g' $(DOCBASE)-$(1).xml endef -fdp-info.xml:: $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG}))) +fdp-info:: $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml) + +$(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG}))) + + +spec:: + $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > \ + fedora-doc-$(DOCBASE).spec + + +gnome.desktop:: + $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > \ + fedora-doc-$(DOCBASE)-gnome.desktop -spec:: rpm-info.xml - $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > ${DOCBASE}.spec -gnome-desktop-file:: rpm-info.xml - $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > ${DOCBASE}-gnome.desktop +kde.desktop:: + $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > \ + fedora-doc-$(DOCBASE)-kde.desktop -kde-desktop-file:: rpm-info.xml - $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > ${DOCBASE}-kde.desktop -khelpcenter-file:: rpm-info.xml - $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > ${DOCBASE}-khelpcenter.desktop +khelp.desktop:: + $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > \ + fedora-doc-$(DOCBASE)-khelp.desktop -define rpm_template -rpm-$(1):: clean $(DOCBASE)-$(1).src.tar.gz + + +$(DOCBASE)-$(VERSION).src.tar.gz:: fdp-info + mkdir $(DOCBASE)-$(VERSION) + find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \ + -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \ + | cpio -pamdv $(DOCBASE)-$(VERSION) + find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \ + -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \ + | cpio -pamdv $(DOCBASE)-$(VERSION) +# ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-*.tar.gz ) +# pwd + tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/ + rm -rf $(DOCBASE)-$(VERSION)/ + + +rpm:: clean $(DOCBASE)-$(VERSION).src.tar.gz spec gnome.desktop kde.desktop khelp.desktop # depend on source tarball and lang-specific HTML tarball # Make RPM build tree; don't rely on local user's setup mkdir -p BUILD -# -# Make rpmlint happy with a changelog entry -# FIXME: Maybe more magic would make this stickier; pity -# I'm no magician... -# sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project - $(VERSION)-1\n- Update to version $(VERSION)\n/' \ -# $(SPECIN) > $(DOCSPEC) - -# -# Fill in files -# FIXME: Needs to be multiplexed for LANGUAGES (see above) -# cp $(OMFIN) $(DOCOMF) -# cp $(DESKTOPIN) $(DOCDESKTOP) -# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF) -# sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF) -# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF) -# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF) -# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP) -# sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP) -# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP) -# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP) -# -# Do the build... -# - - rpmbuild -bb $(RPMFLAGS) \ - $(DOCSPEC) + rpmbuild -bb $(RPMFLAGS) fedora-doc-$(DOCBASE).spec rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC) # rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS} # rm -rf $(DOCBASE)-$(VERSION) -endef - -rpm:: $(foreach LANG,$(LANGUAGES),rpm-$(LANG)) -$(foreach LANG,${LANGUAGES},$(eval $(call rpm_template,${LANG}))) showvars:: @echo "VERSION=$(VERSION)" Index: example-tutorial-de.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- example-tutorial-de.xml 28 Dec 2005 00:43:25 -0000 1.4 +++ example-tutorial-de.xml 28 Dec 2005 22:19:04 -0000 1.5 @@ -11,6 +11,7 @@ + ]> @@ -19,38 +20,8 @@
- - Beispieltutorial - - 2003, 2005 - &FORMAL-RHI; - Tammy Fox - - - - Fox - Tammy - - - Frields - Paul - W. - - - &LEGALNOTICE; - - - 0.13 - 2005-09-18 - PaulWFrields - - - Add revision history. - - - - - + +
Some Section @@ -61,7 +32,7 @@ This is an example section. You should not use sect1, sect2, etc., since - those tags will make sections less modular — that is, harder to + those tags will make sections less modular, i.e., harder to relocate without changing a lot of other markup. Index: example-tutorial-en.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- example-tutorial-en.xml 26 Dec 2005 17:21:55 -0000 1.18 +++ example-tutorial-en.xml 28 Dec 2005 22:19:04 -0000 1.19 @@ -12,13 +12,13 @@ - + ]>
- &ARTICLE-INFO-EN; +
Some Section @@ -27,7 +27,7 @@ This is an example section. You should not use sect1, sect2, etc., - since those tags will make sections less modular — that is, + since those tags will make sections less modular, i.e., harder to relocate without changing a lot of other markup. From fedora-docs-commits at redhat.com Wed Dec 28 22:20:46 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 17:20:46 -0500 Subject: docs-common/packaging spec.xsl,1.7,1.8 Message-ID: <200512282220.jBSMKkfB010517@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10499/docs-common/packaging Modified Files: spec.xsl Log Message: Provide stuff that RPM expects in -lang subpackages Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spec.xsl 28 Dec 2005 20:01:25 -0000 1.7 +++ spec.xsl 28 Dec 2005 22:20:39 -0000 1.8 @@ -38,7 +38,11 @@ %description -%description +%package +Summary: Fedora Documentation - +Group: Documentation + +%description %prep From fedora-docs-commits at redhat.com Wed Dec 28 22:41:14 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 17:41:14 -0500 Subject: docs-common/packaging desktop.xsl,1.3,1.4 Message-ID: <200512282241.jBSMfEmK010819@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10796/docs-common/packaging Modified Files: desktop.xsl Log Message: Remove redundant lang=en processing Index: desktop.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/desktop.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- desktop.xsl 29 Nov 2005 17:41:14 -0000 1.3 +++ desktop.xsl 28 Dec 2005 22:41:07 -0000 1.4 @@ -16,12 +16,12 @@ GenericName= Name= Exec=gnome-help file://usr/share/doc/fedora-doc-/en/-en.xml - + Name[]= Comment[]= Exec[]=gnome-help file://usr/share/doc/fedora-doc-//-.xml OnlyShownIn=GNOME; - + From fedora-docs-commits at redhat.com Wed Dec 28 22:44:01 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 28 Dec 2005 17:44:01 -0500 Subject: docs-common/packaging desktop.xsl,1.4,NONE Message-ID: <200512282244.jBSMi1ok010890@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10874/docs-common/packaging Removed Files: desktop.xsl Log Message: Whoops, don't need this file anymore, see other \*desktop.xsl files --- desktop.xsl DELETED --- From fedora-docs-commits at redhat.com Thu Dec 29 08:07:48 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 03:07:48 -0500 Subject: sudo-tutorial sudo-tutorial-en.xml,1.3,1.4 Message-ID: <200512290807.jBT87mIt031941@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/sudo-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31923 Modified Files: sudo-tutorial-en.xml Log Message: Updated entities to use &DOCNAME; and frields, I mean: friends. Index: sudo-tutorial-en.xml =================================================================== RCS file: /cvs/docs/sudo-tutorial/sudo-tutorial-en.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sudo-tutorial-en.xml 18 Nov 2005 15:14:38 -0000 1.3 +++ sudo-tutorial-en.xml 29 Dec 2005 08:07:22 -0000 1.4 @@ -6,7 +6,10 @@ %FEDORA-ENTITIES-EN; - + + + + From fedora-docs-commits at redhat.com Thu Dec 29 16:30:15 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Dec 2005 11:30:15 -0500 Subject: example-tutorial rpm-info.xml,1.7,1.8 Message-ID: <200512291630.jBTGUFxu015561@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541 Modified Files: rpm-info.xml Log Message: Minor changes for testing purposes Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpm-info.xml 26 Dec 2005 17:21:55 -0000 1.7 +++ rpm-info.xml 29 Dec 2005 16:30:07 -0000 1.8 @@ -25,6 +25,11 @@ + + +
Minor changes for testing purposes
+
Some rpm-only changes
From fedora-docs-commits at redhat.com Thu Dec 29 17:32:24 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 12:32:24 -0500 Subject: docs-common/packaging rpm-info.dtd,1.6,1.7 Message-ID: <200512291732.jBTHWO3q017865@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831/docs-common/packaging Modified Files: rpm-info.dtd Log Message: Consolidate author, editor and such, information into a colophon that we can access using the manditory ID attributes. Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpm-info.dtd 28 Dec 2005 00:55:52 -0000 1.6 +++ rpm-info.dtd 29 Dec 2005 17:32:16 -0000 1.7 @@ -1,4 +1,4 @@ - + @@ -28,25 +28,25 @@ - - - - - - + + + + + + + + + + + + - - - - + - - - - + From fedora-docs-commits at redhat.com Thu Dec 29 17:32:17 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 12:32:17 -0500 Subject: example-tutorial rpm-info.xml,1.8,1.9 Message-ID: <200512291732.jBTHWmwp017868@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831/example-tutorial Modified Files: rpm-info.xml Log Message: Consolidate author, editor and such, information into a colophon that we can access using the manditory ID attributes. Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rpm-info.xml 29 Dec 2005 16:30:07 -0000 1.8 +++ rpm-info.xml 29 Dec 2005 17:32:10 -0000 1.9 @@ -3,8 +3,13 @@ - - + + + + + + + GNU FDL 1.0 @@ -31,11 +36,11 @@
Minor changes for testing purposes
 - +
Some rpm-only changes
 - +
Add revision history
addierte Neuausgabengeschichte
 From fedora-docs-commits at redhat.com Thu Dec 29 17:35:51 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 12:35:51 -0500 Subject: example-tutorial rpm-info.xml,1.9,1.10 Message-ID: <200512291735.jBTHZp6V017901@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17874/example-tutorial Modified Files: rpm-info.xml Log Message: Oops, should not have committed the invalid XML: didn't check after the preliminary sync update. Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rpm-info.xml 29 Dec 2005 17:32:10 -0000 1.9 +++ rpm-info.xml 29 Dec 2005 17:35:43 -0000 1.10 @@ -31,8 +31,7 @@ - +
Minor changes for testing purposes
 From fedora-docs-commits at redhat.com Thu Dec 29 22:37:40 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Dec 2005 17:37:40 -0500 Subject: docs-common/packaging templates.xsl, NONE, 1.1 bookinfo.xsl, 1.3, 1.4 gnome-desktop.xsl, 1.3, 1.4 kde-desktop.xsl, 1.1, 1.2 khelpcenter-plugin.xsl, 1.1, 1.2 spec.xsl, 1.8, 1.9 Message-ID: <200512292237.jBTMbeDt027529@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27505/packaging Modified Files: bookinfo.xsl gnome-desktop.xsl kde-desktop.xsl khelpcenter-plugin.xsl spec.xsl Added Files: templates.xsl Log Message: Reduce redundancy, and create new, stupider pet tricks --- NEW FILE templates.xsl --- <> Index: bookinfo.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bookinfo.xsl 24 Dec 2005 01:25:10 -0000 1.3 +++ bookinfo.xsl 29 Dec 2005 22:37:32 -0000 1.4 @@ -1,73 +1,69 @@ - - - + - - - - <xsl:call-template name="get-title"/> - - - - - - - - - - - - - - - - - - - - - Translator - - - - - - - - - &LEGALNOTICE; - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + &LEGALNOTICE; + + + + + + + + + + + + + + + + + + + + + + + + - - - - Index: gnome-desktop.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/gnome-desktop.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-desktop.xsl 25 Dec 2005 19:26:10 -0000 1.3 +++ gnome-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.4 @@ -35,24 +35,5 @@ OnlyShowIn=GNOME; - - - - - - - - - - - - - - - - - - - - + Index: kde-desktop.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/kde-desktop.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kde-desktop.xsl 25 Dec 2005 19:26:10 -0000 1.1 +++ kde-desktop.xsl 29 Dec 2005 22:37:32 -0000 1.2 @@ -29,6 +29,6 @@ OnlyShowIn=KDE; - + Index: khelpcenter-plugin.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/khelpcenter-plugin.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- khelpcenter-plugin.xsl 24 Dec 2005 00:40:04 -0000 1.1 +++ khelpcenter-plugin.xsl 29 Dec 2005 22:37:32 -0000 1.2 @@ -1,13 +1,12 @@ - + - [Desktop Entry] DocPath=help://index.html @@ -19,14 +18,5 @@ X-DOC-Weight=-5000 - - - - - - - - - - + Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- spec.xsl 28 Dec 2005 22:20:39 -0000 1.8 +++ spec.xsl 29 Dec 2005 22:37:32 -0000 1.9 @@ -46,13 +46,15 @@ %prep -%setup -q -n %{docbase}-${version} -for in in $RPM_BUILD_DIR/%{docbase}-%{version}/%{docbase}*.xml +%setup -q -n %{docbase}-%{version} +for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{%{docbase}*.xml,Makefile} do - %{__sed} -i 's;../docs-common;../../docs-common;' "$i" + %{__sed} -i 's;../docs-common;../../../docs-common;' "$i" done + %build +make html # /bin/rm -r $RPM_BUILD_ROOT # /usr/bin/install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/omf/%{name} @@ -71,19 +73,15 @@ %changelog -* - <> - +* - - - - + - - - - - - - - - - + From fedora-docs-commits at redhat.com Thu Dec 29 22:39:13 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Dec 2005 17:39:13 -0500 Subject: example-tutorial Makefile,1.22,1.23 Message-ID: <200512292239.jBTMdDKG027566@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27548 Modified Files: Makefile Log Message: Show some improvement, and clean up a little Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile 28 Dec 2005 22:19:04 -0000 1.22 +++ Makefile 29 Dec 2005 22:39:06 -0000 1.23 @@ -44,22 +44,16 @@ # Some packaging specific vars # These are obviated by new standard -#VERSION=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/ \ - fedora-doc-$(DOCBASE)-khelp.desktop + $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl \ + rpm-info.xml > fedora-doc-$(DOCBASE)-khelp.desktop + + +define omf_template +omf-$(1):: + ${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \ + $(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf +endef + +omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG)) +# correct lang=en for scrollkeeper document + mv fedora-doc-$(DOCBASE)-en.omf fedora-doc-$(DOCBASE)-C.omf +$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG}))) -$(DOCBASE)-$(VERSION).src.tar.gz:: fdp-info +$(DOCBASE)-$(VERSION).src.tar.gz:: clean fdp-info gnome.desktop kde.desktop khelp.desktop omf mkdir $(DOCBASE)-$(VERSION) - find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \ + find . -maxdepth 1 -type f ! \( -name '*~' -o -name '#*' \ -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \ | cpio -pamdv $(DOCBASE)-$(VERSION) find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \ -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \ | cpio -pamdv $(DOCBASE)-$(VERSION) -# ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-*.tar.gz ) -# pwd tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/ rm -rf $(DOCBASE)-$(VERSION)/ +src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz + -rpm:: clean $(DOCBASE)-$(VERSION).src.tar.gz spec gnome.desktop kde.desktop khelp.desktop +rpm:: src-tarball spec # depend on source tarball and lang-specific HTML tarball # Make RPM build tree; don't rely on local user's setup mkdir -p BUILD - rpmbuild -bb $(RPMFLAGS) fedora-doc-$(DOCBASE).spec - rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC) -# rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS} -# rm -rf $(DOCBASE)-$(VERSION) + rpmbuild -ba $(RPMFLAGS) fedora-doc-$(DOCBASE).spec + rpmbuild --clean --rmsource $(RPMFLAGS) fedora-doc-$(DOCBASE).spec + rm -rf BUILD showvars:: From fedora-docs-commits at redhat.com Thu Dec 29 22:40:36 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Dec 2005 17:40:36 -0500 Subject: example-tutorial rpm-info.xml,1.10,1.11 Message-ID: <200512292240.jBTMeaqu027600@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27582 Modified Files: rpm-info.xml Log Message: Make rpm revisions date-compliant, add othername Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rpm-info.xml 29 Dec 2005 17:35:43 -0000 1.10 +++ rpm-info.xml 29 Dec 2005 22:40:28 -0000 1.11 @@ -5,11 +5,12 @@ - + + GNU FDL 1.0 @@ -30,11 +31,19 @@ + + +
A matching RPM release
+ + + +
Make sure version matches what's in DOCVERSION
+
Minor changes for testing purposes
 - +
Some rpm-only changes
 From fedora-docs-commits at redhat.com Fri Dec 30 00:33:28 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 29 Dec 2005 19:33:28 -0500 Subject: docs-common Makefile.common,1.24,1.25 Message-ID: <200512300033.jBU0XSbu031199@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181 Modified Files: Makefile.common Log Message: Make sure FDPDIR gets set correctly, important for build processes Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.common 28 Dec 2005 18:32:22 -0000 1.24 +++ Makefile.common 30 Dec 2005 00:33:20 -0000 1.25 @@ -32,7 +32,7 @@ # Supply default values for the boilerplate files _unless_ the user has # provided their own values. ifeq (${FDPDIR},) -FDPDIR = .. +FDPDIR = $(PWD)/.. endif ifeq (${FDPBIN},) FDPBIN = ${FDPDIR}/docs-common/bin From fedora-docs-commits at redhat.com Fri Dec 30 02:45:15 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 21:45:15 -0500 Subject: docs-common/packaging rpm-info.dtd,1.7,1.8 Message-ID: <200512300245.jBU2jF6H002328@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2292/docs-common/packaging Modified Files: rpm-info.dtd Log Message: Add optional "othername" attribute to . Use colophon to specify the copyright holder. Allow optional translators and editors to be listed in any order after the author specification. Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpm-info.dtd 29 Dec 2005 17:32:16 -0000 1.7 +++ rpm-info.dtd 30 Dec 2005 02:45:07 -0000 1.8 @@ -1,4 +1,4 @@ - + @@ -9,7 +9,8 @@ - + + @@ -37,6 +38,7 @@ + From fedora-docs-commits at redhat.com Fri Dec 30 02:45:09 2005 From: fedora-docs-commits at redhat.com (Tommy Reynolds (jtr)) Date: Thu, 29 Dec 2005 21:45:09 -0500 Subject: example-tutorial rpm-info.xml,1.11,1.12 Message-ID: <200512300245.jBU2jdq0002332@cvs-int.fedora.redhat.com> Author: jtr Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2292/example-tutorial Modified Files: rpm-info.xml Log Message: Add optional "othername" attribute to . Use colophon to specify the copyright holder. Allow optional translators and editors to be listed in any order after the author specification. Index: rpm-info.xml =================================================================== RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rpm-info.xml 29 Dec 2005 22:40:28 -0000 1.11 +++ rpm-info.xml 30 Dec 2005 02:45:01 -0000 1.12 @@ -18,7 +18,7 @@ 2003, 2004, 2005 - Tammy Fox + From fedora-docs-commits at redhat.com Fri Dec 30 06:06:22 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 01:06:22 -0500 Subject: docs-common/packaging rpm-info.dtd,1.8,1.9 Message-ID: <200512300606.jBU66Mfj010028@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10007/docs-common/packaging Modified Files: rpm-info.dtd Log Message: I know there's a word for this somewhere... Index: rpm-info.dtd =================================================================== RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rpm-info.dtd 30 Dec 2005 02:45:07 -0000 1.8 +++ rpm-info.dtd 30 Dec 2005 06:04:39 -0000 1.9 @@ -37,8 +37,8 @@ + - @@ -46,7 +46,6 @@ - From fedora-docs-commits at redhat.com Fri Dec 30 06:11:30 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 01:11:30 -0500 Subject: docs-common/packaging bookinfo.xsl,1.4,1.5 Message-ID: <200512300611.jBU6BU9l010081@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063/docs-common/packaging Modified Files: bookinfo.xsl Log Message: Properly process langified revision details Index: bookinfo.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bookinfo.xsl 29 Dec 2005 22:37:32 -0000 1.4 +++ bookinfo.xsl 30 Dec 2005 06:11:20 -0000 1.5 @@ -54,9 +54,11 @@ - - - + + + + + From fedora-docs-commits at redhat.com Fri Dec 30 07:10:39 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 02:10:39 -0500 Subject: example-tutorial Makefile,1.23,1.24 Message-ID: <200512300710.jBU7AdJH011859@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11841 Modified Files: Makefile Log Message: Holy smoke, it finally works! Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile 29 Dec 2005 22:39:06 -0000 1.23 +++ Makefile 30 Dec 2005 07:10:10 -0000 1.24 @@ -53,7 +53,7 @@ ###################################################### # Some RPM flags... ###################################################### -RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)" +RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)" --define "fdpdir $(FDPDIR)" ###################################################### @@ -68,7 +68,11 @@ define fdp-info_template fdp-info-$(1).xml:: - ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > fdp-info-$(1).xml + ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} \ + ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) \ + --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl \ + rpm-info.xml | exec $(XMLFORMAT) $(XMLFOPTS) > \ + fdp-info-$(1).xml sed -i 's@@\&FDP-INFO;@g' $(DOCBASE)-$(1).xml endef @@ -99,6 +103,7 @@ define omf_template omf-$(1):: +# xmllint is part of libxml2 ${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \ $(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf endef @@ -112,14 +117,19 @@ $(DOCBASE)-$(VERSION).src.tar.gz:: clean fdp-info gnome.desktop kde.desktop khelp.desktop omf mkdir $(DOCBASE)-$(VERSION) - find . -maxdepth 1 -type f ! \( -name '*~' -o -name '#*' \ - -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \ + find . -maxdepth 1 -type f ! \( -name '*~' \ + -o -name '#*' \ + -o -name '$(DOCBASE)*.tar.gz' \ + -o -name '.*' \) \ | cpio -pamdv $(DOCBASE)-$(VERSION) find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \ - -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \ + -o -name 'CVS' \ + -o -name '*~' \ + -o -name '$(DOCBASE)*' \) \ | cpio -pamdv $(DOCBASE)-$(VERSION) tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/ rm -rf $(DOCBASE)-$(VERSION)/ + sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\ - + Tammy Fox From fedora-docs-commits at redhat.com Fri Dec 30 16:26:40 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 11:26:40 -0500 Subject: docs-common/packaging spec.xsl,1.10,1.11 Message-ID: <200512301626.jBUGQeXh029290@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222/docs-common/packaging Modified Files: spec.xsl Log Message: A little remaining cleanup Index: spec.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- spec.xsl 30 Dec 2005 07:11:22 -0000 1.10 +++ spec.xsl 30 Dec 2005 16:26:33 -0000 1.11 @@ -59,7 +59,7 @@ %build -make html FDPDIR=%{fdpdir} +make html FDPDIR=%{fdpdir} HTMLCSSEXTRA="" mkdir kde- meinproc --output kde-/index.docbook \ From fedora-docs-commits at redhat.com Fri Dec 30 16:26:35 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 11:26:35 -0500 Subject: docs-common Makefile,1.4,1.5 Message-ID: <200512301627.jBUGR5KE029335@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222/docs-common Modified Files: Makefile Log Message: A little remaining cleanup Index: Makefile =================================================================== RCS file: /cvs/docs/docs-common/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 28 Dec 2005 20:02:13 -0000 1.4 +++ Makefile 30 Dec 2005 16:26:27 -0000 1.5 @@ -31,6 +31,7 @@ clean: rm -rf $(DOCBASE)*.rpm + rm -rf $(PWD)/rpmbuild update: clean cvs update @@ -40,10 +41,13 @@ # Make RPM-compliant tarball of source XML and other stuff mkdir $(DOCBASE)-$(RELEASE) find . -maxdepth 1 -type d \( \ + -name 'bin' -o \ -name 'common' -o \ -name 'css' -o \ + -name 'images' -o \ -name 'packaging' -o \ - -name 'stylesheet-images' \) | xargs -i \ + -name 'stylesheet-images' -o \ + -name 'xsl' \) | xargs -i \ find {} -maxdepth 1 -type f ! \( \ -name '.*' -o -name '*~' -o \ -name '*.svg' -o -name '*.eps' \) | \ From fedora-docs-commits at redhat.com Fri Dec 30 16:56:46 2005 From: fedora-docs-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 30 Dec 2005 11:56:46 -0500 Subject: example-tutorial Makefile,1.24,1.25 Message-ID: <200512301656.jBUGuk2D029881@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29842/example-tutorial Modified Files: Makefile Log Message: Rebuilding docs offline from SRPM now works too Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile 30 Dec 2005 07:10:10 -0000 1.24 +++ Makefile 30 Dec 2005 16:56:39 -0000 1.25 @@ -54,6 +54,11 @@ # Some RPM flags... ###################################################### RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)" --define "fdpdir $(FDPDIR)" + +SPECFILE=$(PWD)/fedora-doc-$(DOCBASE).spec +ifeq (${RPMDEBUG},1) +RPMDFLAG = -vv +endif ###################################################### @@ -61,7 +66,7 @@ ${RM} -rf fedora-doc-$(DOCBASE)*.rpm ${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz ${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/ - ${RM} -f *omf *desktop *spec + ${RM} -f *omf *desktop $(SPECFILE) ${RM} -f fdp-info-*.xml sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\