[Ecm-commits] r2442 - trunk

cvs commits ecm-commits at lists.gforge.inria.fr
Wed Feb 27 16:42:24 CET 2013


Author: kruppa
Date: 2013-02-27 16:42:24 +0100 (Wed, 27 Feb 2013)
New Revision: 2442

Log:
Merge r2438 from branches/6.4.4:
  Remove -t option from man page
  Makefile should look for ecm.xml in $(source)/


Modified:
   trunk/Makefile.am
   trunk/ecm.1
   trunk/ecm.xml
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2013-02-27 15:39:41 UTC (rev 2441)
+++ trunk/Makefile.am	2013-02-27 15:42:24 UTC (rev 2442)
@@ -154,6 +154,6 @@
 ## the manpage. If they were not found, this rule is omitted and make will
 ## never try to rebuild the man page, which would result in an error anyway.
 if MAKE_MANPAGE
-ecm.1: ecm.xml
-	xsltproc -o ecm.1 $(XSLDIR)/manpages/docbook.xsl ecm.xml
+ecm.1: $(srcdir)/ecm.xml
+	xsltproc -o ecm.1 $(XSLDIR)/manpages/docbook.xsl $(srcdir)/ecm.xml
 endif

Modified: trunk/ecm.1
===================================================================
--- trunk/ecm.1	2013-02-27 15:39:41 UTC (rev 2441)
+++ trunk/ecm.1	2013-02-27 15:42:24 UTC (rev 2442)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: ECM
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/24/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/27/2013
 .\"    Manual: April 22, 2003
 .\"    Source: April 22, 2003
 .\"  Language: English
 .\"
-.TH "ECM" "1" "01/24/2013" "April 22, 2003" "April 22, 2003"
+.TH "ECM" "1" "02/27/2013" "April 22, 2003" "April 22, 2003"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -90,13 +99,6 @@
 .RS 4
 Perform P+1 instead of the default method (ECM)\&.
 .RE
-.PP
-\fB\-t \fR\fB\fIn\fR\fR
-.RS 4
-Perform trial division up to
-\fIn\fR, before P\-1, P+1 or ECM\&. In loop mode (see option
-\fB\-c\fR), trial division is only performed in the first run\&.
-.RE
 .SH "GROUP AND INITIAL POINT PARAMETERS"
 .PP
 \fB\-x0 \fR\fB\fIx\fR\fR
@@ -165,8 +167,8 @@
 \fB\-power \fR\fB\fIn\fR\fR
 .RS 4
 [ECM, P\-1] Use x^\fIn\fR
-for Brent\-Suyama\'s extension (\fB\-power 1\fR
-disables Brent\-Suyama\'s extension)\&. The default polynomial is chosen depending on the method and B2\&. For P\-1 and P+1, disables the fast stage 2\&. For P\-1,
+for Brent\-Suyama\*(Aqs extension (\fB\-power 1\fR
+disables Brent\-Suyama\*(Aqs extension)\&. The default polynomial is chosen depending on the method and B2\&. For P\-1 and P+1, disables the fast stage 2\&. For P\-1,
 \fIn\fR
 must be even\&.
 .RE
@@ -174,7 +176,7 @@
 \fB\-dickson \fR\fB\fIn\fR\fR
 .RS 4
 [ECM, P\-1] Use degree\-\fIn\fR
-Dickson\'s polynomial for Brent\-Suyama\'s extension\&. For P\-1 and P+1, disables the fast stage 2\&. Like for
+Dickson\*(Aqs polynomial for Brent\-Suyama\*(Aqs extension\&. For P\-1 and P+1, disables the fast stage 2\&. Like for
 \fB\-power\fR,
 \fIn\fR
 must be even for P\-1\&.
@@ -219,17 +221,17 @@
 .PP
 \fB\-mpzmod\fR
 .RS 4
-Use GMP\'s mpz_mod function (sub\-quadratic for large inputs, but induces some overhead for small ones)\&.
+Use GMP\*(Aqs mpz_mod function (sub\-quadratic for large inputs, but induces some overhead for small ones)\&.
 .RE
 .PP
 \fB\-modmuln\fR
 .RS 4
-Use Montgomery\'s multiplication (quadratic version)\&. Usually best method for small input\&.
+Use Montgomery\*(Aqs multiplication (quadratic version)\&. Usually best method for small input\&.
 .RE
 .PP
 \fB\-redc\fR
 .RS 4
-Use Montgomery\'s multiplication (sub\-quadratic version)\&. Theoretically optimal for large input\&.
+Use Montgomery\*(Aqs multiplication (sub\-quadratic version)\&. Theoretically optimal for large input\&.
 .RE
 .PP
 \fB\-nobase2\fR
@@ -248,7 +250,7 @@
 .RE
 .SH "FILE I/O"
 .PP
-The following options enable one to perform step 1 and step 2 separately, either on different machines, at different times, or using different software (in particular, George Woltman\'s Prime95/mprime program can produce step 1 output suitable for resuming with GMP\-ECM)\&. It can also be useful to split step 2 into several runs, using the
+The following options enable one to perform step 1 and step 2 separately, either on different machines, at different times, or using different software (in particular, George Woltman\*(Aqs Prime95/mprime program can produce step 1 output suitable for resuming with GMP\-ECM)\&. It can also be useful to split step 2 into several runs, using the
 \fIB2min\-B2max\fR
 option\&.
 .PP
@@ -397,7 +399,7 @@
 .RS 4
 Execute command
 \fIcmd\fR
-to test primality if factors and cofactors instead of GMP\-ECM\'s own functions\&. The number to test is passed via stdin\&. An exit code of 0 is interpreted as
+to test primality if factors and cofactors instead of GMP\-ECM\*(Aqs own functions\&. The number to test is passed via stdin\&. An exit code of 0 is interpreted as
 \(lqprobably prime\(rq, a non\-zero exit code as
 \(lqcomposite\(rq\&.
 .RE
@@ -412,8 +414,8 @@
 .RS 4
 .\}
 .nf
-ecm \-faccmd \'mail \-s \(lq$HOSTNAME found a factor\(rq
-                me at myaddress\&.com\' 11e6 < cunningham\&.in
+ecm \-faccmd \*(Aqmail \-s \(lq$HOSTNAME found a factor\(rq
+                me at myaddress\&.com\*(Aq 11e6 < cunningham\&.in
 .fi
 .if n \{\
 .RE
@@ -586,7 +588,7 @@
 .PP
 Laurent Fousse <laurent at komite dot net> contributed the middle product code, the autoconf/automake tools, and is the maintainer of the Debian package;
 .PP
-Alexander Kruppa <(lastname)al at loria\&.fr> contributed estimates for probability of success for ECM, the new P+1 and P\-1 stage 2 (with P\&.\-L\&. Montgomery), new AMD64 asm mulredc code, and some other things;
+Alexander Kruppa <(lastname)al at loria\&.fr> contributed estimates for probability of success for ECM, the new P+1 and P\-1 stage 2 (with P\&. L\&. Montgomery), new AMD64 asm mulredc code, and some other things;
 .PP
 Dave Newman <david\&.(lastname)@jesus\&.ox\&.ac\&.uk> contributed the Kronecker\-Schoenhage and NTT multiplication code;
 .PP

Modified: trunk/ecm.xml
===================================================================
--- trunk/ecm.xml	2013-02-27 15:39:41 UTC (rev 2441)
+++ trunk/ecm.xml	2013-02-27 15:42:24 UTC (rev 2442)
@@ -99,16 +99,6 @@
   </listitem>
   </varlistentry>
 
-  <varlistentry>
-  <term><option>-t <replaceable>n</replaceable></option></term>
-  <listitem>
-<para>Perform trial division up to <replaceable>n</replaceable>,
-before P-1, P+1 or ECM.  In loop mode (see option <option>-c</option>),
-trial division is only performed in the first run.
-</para>
-  </listitem>
-  </varlistentry>
-
 </variablelist>
 </refsect1>
 




More information about the Ecm-commits mailing list