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

[Stuart Ellis (elliss)]

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 @@
 
 <!ENTITY DOCNAME "fedora-install-guide">
 <!ENTITY DOCLANG "en">
-<!ENTITY DOCVERSION "1.0.2">
-<!ENTITY DOCDATE "2005-11-25">
+<!ENTITY DOCVERSION "1.0.3">
+<!ENTITY DOCDATE "2005-12-04">
 <!ENTITY BOOKID "&DOCNAME;-&DOCLANG;-&DOCVERSION; (&DOCDATE;)">
 
 <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
@@ -15,7 +15,7 @@
 <!-- Bugzilla bug number for the draft notice -->
 <!ENTITY BUG-NUM "129911">
 <!ENTITY FCLOCALVER "5">
-<!ENTITY DOCLOCALVER "1.0"> <!-- what's this for again? -->
+<!ENTITY DOCLOCALVER "1.0.3"> <!-- what's this for again? -->
 
 
 <!ENTITY INTRODUCTION SYSTEM "fedora-install-guide-intro-en.xml">
@@ -27,7 +27,6 @@
 <!ENTITY DISKPARTITIONING SYSTEM "fedora-install-guide-diskpartitioning-en.xml">
 <!ENTITY BOOTLOADER SYSTEM "fedora-install-guide-bootloader-en.xml">
 <!ENTITY NETWORKCONFIG SYSTEM "fedora-install-guide-networkconfig-en.xml">
-<!ENTITY FIREWALLCONFIG SYSTEM "fedora-install-guide-firewallconfig-en.xml">
 <!ENTITY TIMEZONE SYSTEM "fedora-install-guide-timezone-en.xml">
 <!ENTITY ROOTPASSWORD SYSTEM "fedora-install-guide-rootpassword-en.xml">
 <!ENTITY PACKAGESELECTION SYSTEM "fedora-install-guide-packageselection-en.xml">
@@ -136,6 +135,17 @@
 	  </para>
 	</revdescription>
       </revision>
+      <revision>
+        <revnumber>1.0.3</revnumber>
+        <date>2005-12-04</date>
+        <authorinitials>StuartEllis</authorinitials>
+        <revdescription>
+          <para>
+            Reorganized to match anaconda screens.
+          </para>
+        </revdescription>
+      </revision>
+
     </revhistory>
   </bookinfo>
 
@@ -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 @@
       <para>
         これらの設定を後で変更するには、メインメニューから 
 	<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu><guimenuitem>Security
 	    Level and Firewall</guimenuitem></menuchoice> を選択します。
       </para>   
@@ -97,7 +97,7 @@
 	  <para>
             &SEL; のこのモードを選択すると、&FED; はアクセス制御システムを全く設定しません。あとで &SEL; を有効にするには、メインメニューから
 	    <menuchoice>
-	      <guimenu>Desktop</guimenu>
+	      <guimenu>System</guimenu>
 	      <guisubmenu>System Settings</guisubmenu>
 	      <guimenuitem>Security Level and Firewall</guimenuitem>
 	    </menuchoice> を選択します。
@@ -111,7 +111,7 @@
       <para>
         &SEL; は、たとえシステム管理者であっても決して回避できないという点が特徴です。インストール後に &SEL; の動作を変更するには、メインメニューから
 	<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Security Level and Firewall</guimenuitem>
 	</menuchoice> を選択します。


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 @@
     <para>ä¸è¦ç¦ç”¨é˜²ç«å¢™ã€‚å¦‚æžœæ‚¨å¿…é¡»è¿™æ ·ï¼Œå°±é€‰æ‹© <guilabel>No firewall</guilabel>。</para>
     <tip>
       <title>修改防火墙设置</title>
-      <para>要在以后修改这些设置，只要在主目录中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu>Security Level and Firewall</menuchoice></para>
+      <para>要在以后修改这些设置，只要在主目录中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu>Security Level and Firewall</menuchoice></para>
     </tip>
   </section>
   <section id="sn-selinux">
@@ -58,13 +58,13 @@
           <guilabel>Disabled</guilabel>
         </term>
         <listitem>
-          <para>如果您选择了这个模式，&FED; 将不再配置这个访问控制系统。要在将来使用 &SEL;，在主菜单中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>。</para>
+          <para>如果您选择了这个模式，&FED; 将不再配置这个访问控制系统。要在将来使用 &SEL;，在主菜单中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>。</para>
         </listitem>
       </varlistentry>
     </variablelist>
     <tip>
       <title>修改 &SEL; 策略</title>
-      <para>&SEL; 非常独特，它不能被跳过，即使系统管理员也不能。要在安装后修改 &SEL; 的行为，从主菜单中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>。</para>
+      <para>&SEL; 非常独特，它不能被跳过，即使系统管理员也不能。要在安装后修改 &SEL; 的行为，从主菜单中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Security Level and Firewall</guimenuitem></menuchoice>。</para>
     </tip>
   </section>
 </chapter>


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.
     </para>
   </note>
-  <section id="sn-firstboot-licence">
+  <section id="sn-firstboot-license">
     <title>License Agreement</title>
 
     <para>
@@ -71,6 +71,131 @@
       Agreement</guilabel> and then select <guibutton>Next</guibutton>.
     </para>
   </section>
+
+  <section id="sn-firstboot-firewall">
+    <title>Firewall</title>
+
+    <para>
+      The <indexterm>
+	<primary>firewall</primary>
+      </indexterm> <firstterm>firewall</firstterm> 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.
+    </para>
+
+    <para>
+      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.
+    </para>
+
+    <para>
+      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.
+    </para>
+
+    <para>
+      Avoid disabling the firewall.  If you believe it is necessary to
+      do so, select <guilabel>No firewall</guilabel>.
+    </para>
+
+    <tip>
+      <title>Changing the Firewall Settings</title>
+      <para>
+	To change these settings later, from the main menu, choose
+	<menuchoice>
+	  <guimenu>System</guimenu>
+	  <guisubmenu>Administration</guisubmenu><guimenuitem>Security
+	    Level and Firewall</guimenuitem></menuchoice>.
+      </para>   
+    </tip>
+  </section>
+
+  <section id="sn-firstboot-selinux">
+    <title>&SEL;</title>
+
+    <para>
+      The <indexterm>
+	<primary>&SEL;</primary>
+      </indexterm> <firstterm>&SEL;</firstterm> (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.
+    </para>
+
+    <para>
+      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:
+    </para>
+
+    <variablelist>
+      <varlistentry>
+	<term><guilabel>Active</guilabel></term>
+	<listitem>
+	  <para>
+	    Select this mode to use the targeted &SEL; policy on your
+	    &FED; system.  This is the default mode for &FED;
+	    installations.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Permissive</guilabel></term>
+	<listitem>
+	  <para>
+	    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 <guilabel>Active</guilabel> at any
+	    time after booting.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Disabled</guilabel></term>
+	<listitem>
+	  <para>
+	    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
+	    <menuchoice>
+	      <guimenu>System</guimenu>
+	      <guisubmenu>Administration</guisubmenu>
+	      <guimenuitem>Security Level and Firewall</guimenuitem>
+	    </menuchoice>.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <tip>
+      <title>Changing the &SEL; policy</title>
+      <para>
+	&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 <menuchoice>
+	  <guimenu>System</guimenu>
+	  <guisubmenu>Administration</guisubmenu>
+	  <guimenuitem>Security Level and Firewall</guimenuitem>
+	</menuchoice>.
+      </para>
+    </tip>
+
+  </section>
+
   <section id="sn-firstboot-datetime">
     <title>Date and Time</title>
 
@@ -113,8 +238,7 @@
       <title>Setting the Clock</title>
       <para>
         To change these settings later, from the main menu, choose
-        <menuchoice> <guimenu>Desktop</guimenu> <guisubmenu>System
-        Settings</guisubmenu> <guimenuitem>Date & Time</guimenuitem>
+        <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Date & Time</guimenuitem>
         </menuchoice>.
       </para>
     </tip>
@@ -236,8 +360,7 @@
       <para>
         To reconfigure your system after the installation has completed,
         from the main menu, choose <menuchoice>
-        <guimenu>Desktop</guimenu> <guisubmenu>System
-        Settings</guisubmenu> <guimenuitem>Display</guimenuitem>
+        <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Display</guimenuitem>
         </menuchoice>.
       </para>
     </tip>
@@ -278,8 +401,7 @@
       <para>
         To add additional user accounts to your system after the
         installation is complete, from the main menu, choose
-        <menuchoice> <guimenu>Desktop</guimenu> <guisubmenu>System
-        Settings</guisubmenu> <guimenuitem>Users &
+        <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Users &
         Groups</guimenuitem> </menuchoice>.
       </para>
     </tip>
@@ -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 <menuchoice>
-        <guimenu>Desktop</guimenu> <guisubmenu>System
-        Settings</guisubmenu> <guimenuitem>Soundcard
+        <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Soundcard
         Detection</guimenuitem> </menuchoice>.
       </para>
     </tip>


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 @@
       <para>
         これらの設定を後で変更するには、メインメニューから、
 	<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Date & Time</guimenuitem>
 	</menuchoice> を選択します。
@@ -205,7 +205,7 @@
       <title>ディスプレイの再設定</title>
       <para>
         ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®çµ‚äº†å¾Œã€ãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ã‚’å†è¨­å®šã™ã‚‹å ´åˆã¯ã€ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Display</guimenuitem>
 	</menuchoice> を選択します。
@@ -247,7 +247,7 @@
       <title>さらにユーザアカウントを作成する</title>
       <para>
       ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ãŸå¾Œã€ã‚·ã‚¹ãƒ†ãƒ ä¸Šã«è¿½åŠ ã®ãƒ¦ãƒ¼ã‚¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ä½œæˆã™ã‚‹ã«ã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ã€<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Users & Groups</guimenuitem>
 	</menuchoice> を選択します。
@@ -304,7 +304,7 @@
       <title>サウンドカードを変更する</title>
       <para>
         &FC; ã¯ã€ã‚·ã‚¹ãƒ†ãƒ ã«æ–°ã—ã„ã‚µã‚¦ãƒ³ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚’è¿½åŠ ã—ãŸå ´åˆã«è‡ªå‹•çš„ã«æ–°ã—ã„ã‚«ãƒ¼ãƒ‰ã‚’èªè­˜ã—ã‚ˆã†ã¨ã—ã¾ã™ã€‚ã‚µã‚¦ãƒ³ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚’æ¤œå‡ºã™ã‚‹ãƒ—ãƒ­ã‚»ã‚¹ã‚’æ‰‹å‹•ã§èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹å ´åˆã¯ã€ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Soundcard Detection</guimenuitem>
 	</menuchoice> を選択します。
@@ -325,7 +325,7 @@
       <title>ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’è¿½åŠ ã™ã‚‹</title>
       <para>
         &FC; ã®ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã€ãƒ­ã‚°ã‚¤ãƒ³å¾Œã«<application>パッケージマネージャー</application> ユーティリィティを使います。メインメニューから、<menuchoice>
-	  <guimenu>Desktop</guimenu>
+	  <guimenu>System</guimenu>
 	  <guisubmenu>System Settings</guisubmenu>
 	  <guimenuitem>Add/Remove Applications</guimenuitem>
 	</menuchoice> を選択します。


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 @@
     <para>选择 <guilabel>Network Time Protocol</guilabel> 来配置您的系统使用 NTP 服务。</para>
     <tip>
       <title>设置时钟</title>
-      <para>要在以后修改这些设置，从主菜单中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Date & Time</guimenuitem></menuchoice>。</para>
+      <para>要在以后修改这些设置，从主菜单中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Date & Time</guimenuitem></menuchoice>。</para>
     </tip>
     <para>要配置您的系统使用网络时间服务器，选择 <guilabel>Enable Network Time Protocol</guilabel> 选项。这个选项禁止了对 <guilabel>Date and Time</guilabel> 的设置，启用了屏幕上其他设置。</para>
     <figure id="fig-fboot-time-ntp">
@@ -121,7 +121,7 @@
     <para>要修改某项显示设置，选择 <guilabel>Resolution</guilabel> 或者 <guilabel>Color Depth</guilabel>，然后从下拉菜单中选择一个新值。<application>Setup Agent</application> 仅仅显示您的硬件可能使用的那些值。</para>
     <tip>
       <title>重置显示设置</title>
-      <para>要在安装结束后，重新配置您的系统，在主菜单中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Display</guimenuitem></menuchoice>。</para>
+      <para>要在安装结束后，重新配置您的系统，在主菜单中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Display</guimenuitem></menuchoice>。</para>
     </tip>
   </section>
   <section id="sn-firstboot-systemuser">
@@ -144,7 +144,7 @@
     <para>è¾“å…¥ä¸€ä¸ªç”¨æˆ·åä»¥åŠæ‚¨çš„å…¨åï¼Œç„¶åŽè¾“å…¥æ‚¨é€‰å¥½çš„å¯†ç ã€‚åœ¨ <guilabel>Confirm Password</guilabel> æ–‡æœ¬æ¡†ä¸­å†æ¬¡è¾“å…¥å¯†ç ï¼Œæ¥ä¿è¯å¯†ç æ˜¯æ­£ç¡®çš„ã€‚å‚è§ <xref linkend="ch-rootpassword"/> ä¸­ï¼Œæœ‰å…³å¦‚ä½•é€‰æ‹©å®‰å…¨çš„å¯†ç çš„å»ºè®®ã€‚</para>
     <tip>
       <title>配置另外的用户帐号</title>
-      <para>è¦åœ¨å®‰è£…ç»“æŸåŽï¼Œåœ¨ç³»ç»Ÿä¸­æ·»åŠ å¦å¤–çš„ç”¨æˆ·å¸å·ï¼Œåœ¨ä¸»èœå•ä¸­é€‰æ‹© <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Users & Groups</guimenuitem></menuchoice>。</para>
+      <para>è¦åœ¨å®‰è£…ç»“æŸåŽï¼Œåœ¨ç³»ç»Ÿä¸­æ·»åŠ å¦å¤–çš„ç”¨æˆ·å¸å·ï¼Œåœ¨ä¸»èœå•ä¸­é€‰æ‹© <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Users & Groups</guimenuitem></menuchoice>。</para>
     </tip>
     <para>要配置 &FC; 使用网路服务来进行认证或取得用户信息，选择 <guibutton>Use Network Login...</guibutton>。</para>
     <para>当您配置好登录服务之后，选择 <guibutton>Next</guibutton> 继续。</para>
@@ -171,7 +171,7 @@
     <para>安装过程结束后，您还可以手动配置 &FC; 系统来使用不支持的声卡。手动配置声卡硬件超出了本文档的范围。</para>
     <tip>
       <title>改变声卡</title>
-      <para>å¦‚æžœæ‚¨å‘ç³»ç»Ÿä¸­åŠ å…¥æ–°çš„å£°å¡ï¼Œ&FC; 会自动尝试探测它。如果您需要手动启动探测过程，从主菜单选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Soundcard Detection</guimenuitem></menuchoice>。</para>
+      <para>å¦‚æžœæ‚¨å‘ç³»ç»Ÿä¸­åŠ å…¥æ–°çš„å£°å¡ï¼Œ&FC; 会自动尝试探测它。如果您需要手动启动探测过程，从主菜单选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Soundcard Detection</guimenuitem></menuchoice>。</para>
     </tip>
   </section>
   <section id="sn-firstboot-additional-cds">
@@ -179,7 +179,7 @@
     <para>è¿™ä¸ªå±å¹•å…è®¸æ‚¨åŠ è½½é¢„å…ˆå‡†å¤‡çš„å…‰ç›˜ï¼Œæ¥å®‰è£…ç¬¬ä¸‰æ–¹è½¯ä»¶ã€‚ä½†æ˜¯ï¼Œä¸èƒ½ç”¨å®ƒæ¥å®‰è£… &FC; 光盘中的其他软件包。</para>
     <tip>
       <title>æ·»åŠ è½¯ä»¶</title>
-      <para>要安装 &FC; 光盘中的其他软件包，在登录后选择 <application>Package Manager</application> 实用工具。在主菜单中，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Add/Remove Applications</guimenuitem></menuchoice>。</para>
+      <para>要安装 &FC; 光盘中的其他软件包，在登录后选择 <application>Package Manager</application> 实用工具。在主菜单中，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Add/Remove Applications</guimenuitem></menuchoice>。</para>
     </tip>
     <figure id="fig-fboot-cds">
       <title>é™„åŠ  CD 屏幕</title>


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
       <application>Package Management</application> tool to make
       different software selections for your system. To run this tool,
-      from the main menu, select <menuchoice> <guimenu>Desktop</guimenu>
+      from the main menu, select <menuchoice> <guimenu>System</guimenu>
       <guisubmenu>System Settings</guisubmenu> <guimenuitem>Add/Remove
       Applications</guimenuitem> </menuchoice>.
     </para>


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 @@
     <para>
       選択したインストールタイプとパッケージは不変のものではありません。システムを起動した後は、異なったソフトウェアを選択するために <application>パッケージ管理</application> ツールを使います。このツールを実行するには、メインメニューから
       <menuchoice>
-	<guimenu>Desktop</guimenu>
+	<guimenu>System</guimenu>
 	<guisubmenu>System Settings</guisubmenu>
 	<guimenuitem>Add/Remove Applications</guimenuitem>
       </menuchoice> を選択します。


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 @@
   <para>&FED; 使用安装类型来选择软件包集合。参见 <xref linkend="ch-installtypes"/> 来获取更多信息。您可以接受默认的软件包集合，也可以定制它以适应您的需要。如果您选择了 <guilabel>Custom</guilabel> 安装类型，&FED; 将自动显示 <guilabel>Package Group Selection</guilabel>。</para>
   <tip>
     <title>改变观念</title>
-    <para>安装类型和您选择的软件包不是固定不变的。当您装好重启之后，可以使用 <application>Package Management</application> 工具来为系统选择不同的软件集合。要运行这个工具，选择 <menuchoice><guimenu>Desktop</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Add/Remove Applications</guimenuitem></menuchoice>。</para>
+    <para>安装类型和您选择的软件包不是固定不变的。当您装好重启之后，可以使用 <application>Package Management</application> 工具来为系统选择不同的软件集合。要运行这个工具，选择 <menuchoice><guimenu>System</guimenu><guisubmenu>System Settings</guisubmenu><guimenuitem>Add/Remove Applications</guimenuitem></menuchoice>。</para>
   </tip>
   <section id="sn-defaultpackages">
     <title>软件安装默认值</title>


--- fedora-install-guide-firewallconfig-en.xml DELETED ---