[Enigma-cvs] enigma/doc/manual Makefile.am, 1.3, 1.4 enigma.texi, 1.6, 1.7

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/doc/manual
In directory subversions:/tmp/cvs-serv9138/doc/manual

Modified Files:
        Makefile.am enigma.texi 
Log Message:
Merged changes from 0_80_rc branch

Index: Makefile.am
===================================================================
RCS file: /cvsroot/enigma/enigma/doc/manual/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 14 Sep 2003 19:32:35 -0000      1.3
--- Makefile.am 18 Oct 2003 13:49:02 -0000      1.4
***************
*** 1,41 ****
  # info_TEXINFOS = enigma.texi
  
! HTML =  enigma_1.html \
!       enigma_2.html \
!       enigma_3.html \
!       enigma_4.html \
!       enigma_5.html \
!       enigma_abt.html \
        enigma.html \
-       enigma_ovr.html \
        index.html
  
! PNG = \
!       images/intro-inventory.png \
!       images/intro-meditation.png \
!       images/intro-oxyd.png \
!       images/intro-plank.png \
!       images/intro-twoplayer.png \
!       images/it-explosives.png \
!       images/it-flags.png \
!       images/it-umbrella.png \
!       images/levelmenu.png \
!       images/logo.png \
!       images/st-lethal.png \
!       images/st-magic.png \
!       images/st-mail.png \
!       images/st-mirrors.png \
!       images/st-oxyds.png \
!       images/st-swap.png
! 
! SUBDIRS = images
! EXTRA_DIST = enigma.texi $(HTML) # $(PNG)
  
! html: $(HTML) 
  
! $(HTML) : enigma.texi $(PNG)
        @if [ "${TEXI2HTML}" ]; then \
          echo "Running texi2html"; \
!         ${TEXI2HTML} -toc_file=index.html -split=chapter -nosec_nav -nomenu 
enigma.texi; \
        else \
          echo "Warning: texi2html not found"; \
--- 1,19 ----
  # info_TEXINFOS = enigma.texi
  
! SUBDIRS = images
! 
! HTML =  $(wildcard enigma_*.html) \
        enigma.html \
        index.html
  
! address@hidden@/doc/enigma
! html_DATA = $(HTML)
  
! EXTRA_DIST = enigma.texi $(html_DATA)
  
! $(HTML) : enigma.texi
        @if [ "${TEXI2HTML}" ]; then \
          echo "Running texi2html"; \
!         ${TEXI2HTML} -toc_file=index.html -split=chapter -nosec_nav 
enigma.texi; \
        else \
          echo "Warning: texi2html not found"; \

Index: enigma.texi
===================================================================
RCS file: /cvsroot/enigma/enigma/doc/manual/enigma.texi,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** enigma.texi 14 Sep 2003 19:44:45 -0000      1.6
--- enigma.texi 18 Oct 2003 13:49:02 -0000      1.7
***************
*** 1,13 ****
! \input texinfo
  @afourpaper
  
  @c @include{version.texi}
! @set VERSION 0.80
  
  @copying
- This manual describes how to install and play Enigma.  It 
- corresponds to Enigma version @value{VERSION}. 
- @c @value{VERSION}.
[...969 lines suppressed...]
***************
*** 951,954 ****
--- 943,951 ----
  Level design and special Oxyd expertise
  
+ @item David W. Skinner
+ Many Sokoban levels from
+ @uref{http://users.bentonrea.com/~sasquatch/sokoban}
+ 
+ 
  @end table
  
***************
*** 956,960 ****
  @section Contributors
  For various smaller contributions, thanks go to:
- 
  
  @itemize @bullet
--- 953,956 ----