syncing german and english installation manuals
hi,
i am almost done with syncing the things which are present in the
german manual but not in the english version.
the thing what is missing is a chapter on dual booting with
windows/dos and some basic lilo configuration. but anything else
is done more or less.
cvs question: when i do a cvs diff -u > doc.diff how can i tell
diff and/or cvs that it should also include completely new files?
for instance the appendix.sgml file which is attached because of
this problem....
so long and night
Othmar
? documentation/en/appendix.sgml
Index: documentation/install.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/install.sgml,v
retrieving revision 1.79
diff -u -r1.79 install.sgml
--- documentation/install.sgml 2000/04/22 04:04:40 1.79
+++ documentation/install.sgml 2000/04/28 02:40:55
@@ -14,6 +14,7 @@
<!entity ch-dbootstrap SYSTEM "en/dbootstrap.sgml">
<!entity ch-post-install SYSTEM "en/post-install.sgml">
<!entity ch-tech-info SYSTEM "en/tech-info.sgml">
+ <!entity ch-appendix SYSTEM "en/appendix.sgml">
<!entity ch-administrivia SYSTEM "en/administrivia.sgml">
<!entity FIXME "<![ %FIXME [ <p><em>Documentation not complete, text missing.</em> ]]>">
@@ -129,6 +130,8 @@
&ch-post-install;
&ch-tech-info;
+
+&ch-appendix;
&ch-administrivia;
Index: documentation/urls.ent
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/urls.ent,v
retrieving revision 1.45
diff -u -r1.45 urls.ent
--- documentation/urls.ent 2000/04/23 15:55:08 1.45
+++ documentation/urls.ent 2000/04/28 02:40:57
@@ -25,7 +25,7 @@
<!entity ftp-debian-org "ftp.debian.org">
-<!entity nonus-debian-org "ftp://nonus.debian.org/pub/debian-non-US";>
+<!entity nonus-debian-org "ftp://nonus.debian.org/debian-non-US";>
<!entity url-social-contract "http://&www-debian-org;/social_contract";>
Index: documentation/en/hardware.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/hardware.sgml,v
retrieving revision 1.15
diff -u -r1.15 hardware.sgml
--- documentation/en/hardware.sgml 2000/04/20 05:02:18 1.15
+++ documentation/en/hardware.sgml 2000/04/28 02:41:03
@@ -39,8 +39,9 @@
<em>powerpc</em>, respectively.
<p>
This document covers installation for the <em>&architecture;</em>
-architecture. Separate versions of this document exist for other
-architectures.
+architecture. If you look for information on other architectures take
+a look at the <url id="http://&www-debian-org;/ports/"; name="Debian-Ports">
+pages.
<![ %powerpc [
<p>
@@ -61,21 +62,23 @@
Complete information concerning supported peripherals can be found at
<url id="&url-hardware-howto;" name="Linux Hardware Compatibility
HOWTO">. This section merely outlines the basics.
+
+ <sect2 id="cpus">CPU
<p>
Nearly all x86-based processors are supported; this includes AMD and
-Cyrix processors as well. However, Linux will <em>not</em> run on
-286 or earlier processors.
+Cyrix processors as well. Also the new processors like Athlon and the
+K6-2 or K6-3, respectively, are supported. However, Linux will
+<em>not</em> run on 286 or earlier processors.
+
+ <sect2 id="bus">I/O Bus
<p>
The system bus is the part of the motherboard which allows the CPU to
communicate with peripherals such as storage devices. Your computer
must use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used
in IBM's PS/2 line), or VESA Local Bus (VLB, sometimes called the VL
bus).
- <p>
-Laptops are also supported. Laptops are often specialized or contain
-proprietary hardware. To see if your particular laptop works well
-with GNU/Linux, see the <url id="&url-x86-laptop;" name="Linux
-Laptop pages">.
+
+ <sect2 id="gfx">Graphics Card
<p>
You should be using a VGA-compatible display interface for the console
terminal. Nearly every modern display card is compatible with
@@ -91,6 +94,13 @@
id="&url-xfree-support;">. Debian &release; ships with X11 revision
&x11ver;.
+ <sect2 id="laptops">Laptops
+ <p>
+Laptops are also supported. Laptops are often specialized or contain
+proprietary hardware. To see if your particular laptop works well
+with GNU/Linux, see the <url id="&url-x86-laptop;" name="Linux
+Laptop pages">.
+
]]>
<![ %m68k [
@@ -526,7 +536,9 @@
Spellcaster BRI ISDN boards are also not supported by the
boot-floppies.
<p>
-Sound devices are not supported by default.
+Sound devices are not supported by default. But as already mentioned above:
+if you want to use an own kernel please go to <ref id="kernel-baking"> for
+further information.
]]>
@@ -581,7 +593,6 @@
also be supported by the boot disks. You may need to load your
network driver as a module.
]]>
-
<sect>Purchasing Hardware Specifically for GNU/Linux
<p>
Index: documentation/en/partitioning.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/partitioning.sgml,v
retrieving revision 1.18
diff -u -r1.18 partitioning.sgml
--- documentation/en/partitioning.sgml 2000/04/23 15:56:00 1.18
+++ documentation/en/partitioning.sgml 2000/04/28 02:41:08
@@ -77,6 +77,51 @@
big, you will be wasting space that could be used elsewhere. Disk
space is cheap nowadays, but why throw your money away?
+ <sect1>The Directory Tree
+ <p>
+The following list describes some important directories. It should
+help you to find out what your partitioning scheme should be. If this
+is too confusing for you, just ignore it and reread it when you read
+the rest of the installation manual.
+
+<list>
+<item>
+<tt>/</tt>: root represents the starting point of the directory
+hierachy. It contains the essentiel programs that the
+computer can boot. This includes the kernel, system
+libraries, configuration files in <tt>/etc</tt> and
+various other needed files. Typically 30-50 MB are needed
+but this may vary.
+<item>
+<tt>/dev</tt>: this directory contains the various device files
+which are interfaces to the various hardware components.
+For more information see <ref id="disk-naming">.
+<item>
+<tt>/usr</tt>: all user programs (<tt>/usr/bin</tt>), libraries (<tt>
+/usr/lib</tt>), documentation (<tt>/usr/share/doc</tt>),
+etc. are in this directory. This part of the filesystem
+needs most of the space. You should at least provide
+300-500 MB of disk space. If you want to install more you
+should increase the amount of space you give this
+directory.
+<item>
+<tt>/home</tt>: every user will put his data into a subdirectory of this
+directory. The size of this depends on how many users will be using the
+system and what files are to be stored in the directories of the users.
+Depending on your planned usage you should reserver about 100 MB for each
+User but which should be adapted to your needs.
+<item>
+<tt>/var</tt>: all variable data like news articles, e-mails, websites,
+etc. will be placed under this directory. The size of this directory
+depends greatly on the usage of your computer.
+<item>
+<tt>/tmp</tt>: if a program creates temporary data it will most likely
+go in there. 20-50 MB should be usually enough.
+<item>
+<tt>/proc</tt>: this is a virtual file system which doesn't reside on the
+harddisk. Thus no harddisk space is needed. It provides interesting and
+also vital information about the running system.
+</list>
<sect>Planning Use of the System
<p>
Index: documentation/en/preparing.sgml
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/documentation/en/preparing.sgml,v
retrieving revision 1.12
diff -u -r1.12 preparing.sgml
--- documentation/en/preparing.sgml 2000/04/20 05:36:44 1.12
+++ documentation/en/preparing.sgml 2000/04/28 02:41:10
@@ -249,6 +249,12 @@
This setting enables you to boot from either a floppy disk or a
CD-ROM, which are the two most common boot devices used to install
Debian.
+ <p>
+If you have a newer SCSI controller and you have a CD-ROM device
+attached to it, you are usually able to boot from the CD-ROM.
+All you have to do is enabling booting from a CD-ROM in the SCSI-BIOS
+of your controller. Additionally you have to be able to boot from a
+floppy disk. This is set up in the PC-BIOS.
<p>
If your system can't boot directly from CD-ROM, or you simply can't
seem to get it to work, don't despair; you can simply run
@@ -406,6 +412,11 @@
somewhere between 0xA0000 and 0xFFFFF (from 640K to just below 1
megabyte) or at an address at least 1 megabyte greater than the total
amount of RAM in your system.
+
+ <sect1>More than 64 MB RAM
+ <p>
+The Linux Kernel can not always detect what amount of RAM you have. If
+this is the case please look at <ref id="boot-parms">.
]]>
<!-- retain these comments for translator revision tracking -->
<!-- $Id: welcome.sgml,v 1.8 2000/04/23 15:56:00 aph Exp $ -->
<chapt id="appendix">Appendix
<p>
<sect>Further Information and Obtaining Debian GNU/Linux
<sect1 id="furtherinfo">Further Information
<p>
A general source of information on Linux is the <url
id="&url-ldp;" name="Linux Documentation Project">. There you will find
the HOWTOs and pointers to other very valuable information on parts
of a GNU/Linux system.
<sect1 id="obtain">Obtaining Debian GNU/Linux
<p>
If you want to buy a CD set to install GNU/Debian from CD-ROM you
should look at the <url id="http://&www-debian-org;/distrib/vendors";
name="CD vendors page">. There you get a list of addresses which
sell GNU/Debian no CD-ROMs. The list is sorted by country so you shouldn't
have a problem to find a vendor near you.
<sect1 id="mirrors">Debian GNU Mirrors
<p>
If you live outside of the USA you want to download Debian packages you
can also use one of many mirrors which reside outside the USA. A list
of countries and mirrors can be found at the <url
id="http://&www-debian-org;/distrib/ftplist"; name="Debian FTP server website">.
<sect1 id="nonus-issue">GPG, SSH and other Security Software
<p>
The following text is taken from the README.non-US.
<p>
United States laws place restrictions on the export of defense articles,
which, unfortunately, includes some types of cryptographic software. PGP
and ssh, among others, fall into this category. It is legal however, to
import such software into the US.
<p>
To prevent anyone from taking unnecessary legal risks, some Debian
packages are available from a server outside the US which serves the various
cryptographic programs: <url id="&nonus-debian-org;" name="Debian GNU non-US
Server">.
<sect id="linuxdevices">Linux Devices
<p>
In Linux you have various special files in <tt>/dev</tt>. These files are
called devices files. In the Unix world accessing hardware is different.
There you have a special file which actually runs a driver which in turn
accesses the hardware. The device file is an interface to the actual
system component. Files under <tt>/dev</tt> also behave differently than
ordinary files. Below are the most important device files listed.
<p>
<example>
fd0 1. Floppy Drive
fd1 2. Floppy Drive
</example>
<example>
hda IDE Harddisk / CD-ROM on the first IDE port (Master)
hdb IDE Harddisk / CD-ROM on the first IDE port (Slave)
hdc IDE Harddisk / CD-ROM on the second IDE port (Master)
hdd IDE Harddisk / CD-ROM on the first IDE port (Slave)
hda1 1. partition of the first IDE harddisk
hdd15 15. partition of the fourth IDE harddisk
</example>
<example>
sda SCSI Harddisk / CD-ROM with lowest SCSI ID (e.g. 0)
sdb SCSI Harddisk / CD-ROM with next higher SCSI ID (e.g. 1)
sdc SCSI Harddisk / CD-ROM with next higher SCSI ID (e.g. 2)
sda1 1. partition of the first SCSI harddisk
sdd10 10. partition of the fourth SCSI harddisk
</example>
<example>
cdrom Symbolic link to the CD-ROM drive
mouse Symbolic link to the mouse device file
</example>
<example>
null everything pointed to this device will disappear
zero one can endlessly read zeros out of this device
</example>
<p>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-namecase-general:t
sgml-general-insert-case:lower
sgml-minimize-attributes:max
sgml-always-quote-attributes:t
sgml-indent-step:2
sgml-indent-data:nil
sgml-parent-document:("../install.sgml" "book" "chapt")
sgml-declaration:nil
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
-->
Reply to: