Mercurial > docs > s390-linux
changeset 15:d77f4b742bc4
merge
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sun, 29 Nov 2009 17:33:12 -0500 |
| parents | 4e9e8eede5dd (current diff) 82b4c40a4f5c (diff) |
| children | 7718d9e7be23 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Nov 29 17:32:28 2009 -0500 +++ b/Makefile Sun Nov 29 17:33:12 2009 -0500 @@ -17,7 +17,7 @@ hg log -l$(SHORTLOG_LEN) body-hercules-s390.html | sed -e 's/>/\>/g' -e 's/</\</g' >> $@ cat body-hercules-s390.html >> $@ hg log body-hercules-s390.html | sed -e 's/>/\>/g' -e 's/</\</g' >> $@ - sed -e 's/@@YEAR@@/2007-2008/g' < tail.html >> $@ + sed -e 's/@@YEAR@@/2007-2009/g' < tail.html >> $@ zvm-centos4.html: body-zvm-centos4.html $(COMMON) sed -e 's/@@HEAD@@/Installing CentOS 4.x under z\/VM/g' < head.html > $@
--- a/body-hercules-s390.html Sun Nov 29 17:32:28 2009 -0500 +++ b/body-hercules-s390.html Sun Nov 29 17:33:12 2009 -0500 @@ -135,8 +135,8 @@ <p> The top part of the config file specifies the processor features, and the bottom part specifies devices attached. Each device has a device number -(left more column), a device type (middle column), and optionally arguments -(right column). I'd suggest you read a bit of information from the Hercules +(leftmost column), a device type (middle column), and optionally arguments +(right columns). I'd suggest you read a bit of information from the Hercules website or many other websites dedicated to the IBM System/390 and zSeries architectures. It is just far too much to explain here. </p>