diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-05-27 00:10:18 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-05-27 00:10:18 +0200 |
| commit | 620b661325fe8ce36bafcb6afb47083d35988cea (patch) | |
| tree | ca5f0f9d7f85d74eb7e782160500c99275c8f8d5 | |
| parent | 654ecbb88dbbba4e4e5539b95ecf9fc88f590c5f (diff) | |
| parent | 45193362a810024ab4810470fcd00e16123d5aaf (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
| -rw-r--r-- | doc/gpl.texinfo | 5 | ||||
| -rw-r--r-- | doc/hurd.texi | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/gpl.texinfo b/doc/gpl.texinfo index a2f8db91..d29870cf 100644 --- a/doc/gpl.texinfo +++ b/doc/gpl.texinfo @@ -1,6 +1,5 @@ -@setfilename gpl.info - -@unnumbered GNU GENERAL PUBLIC LICENSE +@node Copying +@section GNU GENERAL PUBLIC LICENSE @center Version 2, June 1991 @display diff --git a/doc/hurd.texi b/doc/hurd.texi index ea73a4c6..070daed4 100644 --- a/doc/hurd.texi +++ b/doc/hurd.texi @@ -127,7 +127,7 @@ into another language, under the above conditions for modified versions. @end quotation @end copying -@setchapternewpage none +@setchapternewpage off @settitle Hurd Reference Manual @titlepage @@ -513,9 +513,6 @@ mentions that the FSF started developing the Hurd in 1990. As of kernel. -@node Copying -@section GNU General Public License - @include gpl.texinfo @@ -1461,7 +1458,7 @@ dropped by the kernel. If the page is currently in core, the kernel might ignore this call. @end deftypefun -attributes@deftypefun void pager_change_attributes (@w{struct pager *@var{pager}}, @w{boolean_t @var{may_cache}}, @w{memory_object_copy_strategy_t @var{copy_strategy}}, @w{int @var{wait}}) +@deftypefun void pager_change_attributes (@w{struct pager *@var{pager}}, @w{boolean_t @var{may_cache}}, @w{memory_object_copy_strategy_t @var{copy_strategy}}, @w{int @var{wait}}) Change the attributes of the memory object underlying pager @var{pager}. The @var{may_cache} and @var{copy_strategy} arguments are as for @code{memory_object_change_}. Wait for the kernel to report |