diff --git a/discouraged b/discouraged index 96cd9dbe88..56d78883e8 100644 --- a/discouraged +++ b/discouraged @@ -4992,6 +4992,13 @@ "df-rngo" is used by "relrngo". "df-rq" is used by "dmrecnq". "df-rq" is used by "recmulnq". +"df-sca" is used by "bj-isrvec". +"df-sca" is used by "mgpscaOLD". +"df-sca" is used by "mnringscadOLD". +"df-sca" is used by "opsrscaOLD". +"df-sca" is used by "scaid". +"df-sca" is used by "scandx". +"df-sca" is used by "tngscaOLD". "df-setrecs" is used by "nfsetrecs". "df-setrecs" is used by "setrec1". "df-setrecs" is used by "setrec2". @@ -15636,6 +15643,7 @@ New usage of "df-ringcALTV" is discouraged (1 uses). New usage of "df-rngcALTV" is discouraged (1 uses). New usage of "df-rngo" is discouraged (2 uses). New usage of "df-rq" is discouraged (2 uses). +New usage of "df-sca" is discouraged (7 uses). New usage of "df-setrecs" is discouraged (5 uses). New usage of "df-sgrOLD" is discouraged (2 uses). New usage of "df-sh" is discouraged (1 uses). diff --git a/set.mm b/set.mm index 23f02862c2..a95b1d9be2 100644 --- a/set.mm +++ b/set.mm @@ -200349,7 +200349,8 @@ C_ dom ( S sSet <. I , E >. ) ) $= df-starv $a |- *r = Slot 4 $. $( Define scalar field component of a vector space ` v ` . (Contributed by - NM, 4-Sep-2011.) (Revised by Mario Carneiro, 14-Aug-2015.) $) + NM, 4-Sep-2011.) (Revised by Mario Carneiro, 14-Aug-2015.) Use its + index-independent form ~scaid instead. (New usage is discouraged.) $) df-sca $a |- Scalar = Slot 5 $. $( Define scalar product. (Contributed by NM, 4-Sep-2011.) (Revised by @@ -274501,9 +274502,9 @@ series in the subring which are also polynomials (in the parent ring). $( Scalars of a univariate power series ring. (Contributed by Stefan O'Rear, 26-Mar-2015.) (Revised by Mario Carneiro, 4-Jul-2015.) $) psr1sca2 $p |- ( _I ` R ) = ( Scalar ` P ) $= - ( cvv wcel cid cfv csca wceq fvi psr1sca eqtrd wn c0 c5 df-sca str0 fvprc + ( cvv wcel cid cfv csca wceq fvi psr1sca eqtrd wn c0 cnx scaid str0 fvprc cps1 syl5eq fveq2d 3eqtr4a pm2.61i ) BDEZBFGZAHGZIUDUEBUFBDJABDCKLUDMZNNH - GUEUFHOPQBFRUGANHUGABSGNCBSRTUAUBUC $. + GUEUFHOHGPQBFRUGANHUGABSGNCBSRTUAUBUC $. $} ${ @@ -274527,8 +274528,8 @@ series in the subring which are also polynomials (in the parent ring). 26-Mar-2015.) $) ply1sca2 $p |- ( _I ` R ) = ( Scalar ` P ) $= ( cvv wcel cid cfv csca wceq ply1sca eqtrd wn c0 fvprc cpl1 fveq2d fveq2i - fvi c5 df-sca str0 3eqtr4g eqtr4d pm2.61i ) BDEZBFGZAHGZIUEUFBUGBDRABDCJK - UELZUFMUGBFNUHBOGZHGMHGUGMUHUIMHBONPAUIHCQHSTUAUBUCUD $. + fvi cnx scaid str0 3eqtr4g eqtr4d pm2.61i ) BDEZBFGZAHGZIUEUFBUGBDRABDCJK + UELZUFMUGBFNUHBOGZHGMHGUGMUHUIMHBONPAUIHCQHSHGTUAUBUCUD $. $} ${