[Python-checkins] python/dist/src/Doc/doc doc.tex,1.67,1.67.2.1

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv27228/Doc/doc

Modified Files:
      Tag: ast-branch
	doc.tex 
Log Message:
Merge head to this branch.

Merge all sorts of changes from just before 2.3b1 into the ast
branch.  This should make the eventual merge back to the trunk easier.

The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.

The only significant conflicts appeared to be in pythonrun.c.


Index: doc.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/doc/doc.tex,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -C2 -d -r1.67 -r1.67.2.1
*** doc.tex	29 Jun 2002 01:23:45 -0000	1.67
--- doc.tex	28 Apr 2003 17:38:07 -0000	1.67.2.1
***************
*** 928,933 ****
        The name of an executable program.  This may differ from the
        file name for the executable for some platforms.  In particular, 
!       the \file{.exe} (or other) extension should be omitted for DOS
!       and Windows programs.
      \end{macrodesc}
  
--- 928,933 ----
        The name of an executable program.  This may differ from the
        file name for the executable for some platforms.  In particular, 
!       the \file{.exe} (or other) extension should be omitted for 
!       Windows programs.
      \end{macrodesc}
  
***************
*** 1307,1310 ****
--- 1307,1313 ----
    \lineii{RuntimeWarning}
           {Base category for warnings about dubious runtime features.}
+   \lineii{FutureWarning}
+ 	 {Base category for warnings about constructs that will change
+ 	 semantically in the future.}
  \end{tableii}
  \end{verbatim}
***************
*** 1639,1646 ****
  
  
! \section{Graphical Interface Components \label{gui-markup}}
  
    The components of graphical interfaces will be assigned markup, but
!   the specifics have not been determined.
  
  
--- 1642,1676 ----
  
  
! \subsection{Graphical Interface Components \label{gui-markup}}
  
    The components of graphical interfaces will be assigned markup, but
!   most of the specifics have not been determined.
! 
!   \begin{macrodesc}{menuselection}{\p{menupath}}
!     Menu selections should be marked using a combination of
!     \macro{menuselection} and \macro{sub}.  This macro is used to mark
!     a complete sequence of menu selections, including selecting
!     submenus and choosing a specific operation, or any subsequence of
!     such a sequence.  The names of individual selections should be
!     separated by occurances of \macro{sub}.
! 
!     For example, to mark the selection ``\menuselection{Start \sub
!     Programs}'', use this markup:
! 
! \begin{verbatim}
! \menuselection{Start \sub Programs}
! \end{verbatim}
! 
!     When including a selection that includes some trailing indicator,
!     such as the ellipsis some operating systems use to indicate that
!     the command opens a dialog, the indicator should be omitted from
!     the selection name.
!   \end{macrodesc}
! 
!   \begin{macrodesc}{sub}{}
!     Separator for menu selections that include multiple levels.  This
!     macro is only defined within the context of the
!     \macro{menuselection} macro.
!   \end{macrodesc}
  
  
***************
*** 1750,1757 ****
  
          \program{mkhowto} can be used for both \code{howto} and
!         \code{manual} class documents.  (For the later, be sure to get 
! 	the latest version from the Python CVS repository rather than
!         the version distributed in the \file{latex-1.5.2.tgz} source
! 	archive.)
  
  	XXX  Need more here.
--- 1780,1786 ----
  
          \program{mkhowto} can be used for both \code{howto} and
!         \code{manual} class documents.  It is usually a good idea to
!         always use the latest version of this tool rather than a
!         version from an older source release of Python.
  
  	XXX  Need more here.