Skip to content

Commit 3a3b867

Browse files
author
Dana Binkley
committed
Merge branch 'mr/333-rename-basic-types-to-scalar-types' into 'master'
Resolve "Rename Basic Types to Scalar Types" Closes #333 See merge request feng/training/material!392
2 parents 7bebd93 + 3eace00 commit 3a3b867

36 files changed

+205
-66
lines changed

‎courses/ada_essentials/030_basic_types-extras.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types-extras.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*********************************
2-
Basic Types: Additional Content
3-
*********************************
1+
**********************************
2+
Scalar Types: Additional Content
3+
**********************************
44

55
.. container:: PRELUDE BEGIN
66

@@ -44,9 +44,9 @@ Basic Types: Additional Content
4444
4545
.. container:: PRELUDE END
4646

47-
.. include:: 030_basic_types/03-modular_types.rst
48-
.. include:: 030_basic_types/05-representation_values.rst
49-
.. include:: 030_basic_types/06-character_types.rst
50-
.. include:: 030_basic_types/07-real_types.rst
51-
.. include:: 030_basic_types/11-subtypes_full_picture.rst
52-
.. include:: 030_basic_types/12-big_numbers.rst
47+
.. include:: 030_scalar_types/03-modular_types.rst
48+
.. include:: 030_scalar_types/05-representation_values.rst
49+
.. include:: 030_scalar_types/06-character_types.rst
50+
.. include:: 030_scalar_types/07-real_types.rst
51+
.. include:: 030_scalar_types/11-subtypes_full_picture.rst
52+
.. include:: 030_scalar_types/12-big_numbers.rst

‎courses/ada_essentials/030_basic_types-in_depth.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types-in_depth.rst‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
***********************
2-
Basic Types: In-Depth
3-
***********************
1+
************************
2+
Scalar Types: In-Depth
3+
************************
44

55
.. container:: PRELUDE BEGIN
66

@@ -46,17 +46,17 @@ Basic Types: In-Depth
4646
4747
.. container:: PRELUDE END
4848

49-
.. include:: 030_basic_types/01-introduction.rst
50-
.. include:: 030_basic_types/02-discrete_numeric_types.rst
51-
.. include:: 030_basic_types/03-modular_types.rst
52-
.. include:: 030_basic_types/04-enumeration_types.rst
53-
.. include:: 030_basic_types/05-representation_values.rst
54-
.. include:: 030_basic_types/06-character_types.rst
55-
.. include:: 030_basic_types/07-real_types.rst
56-
.. include:: 030_basic_types/08-base_type.rst
57-
.. include:: 030_basic_types/09-miscellaneous.rst
58-
.. include:: 030_basic_types/10-subtypes.rst
59-
.. include:: 030_basic_types/11-subtypes_full_picture.rst
60-
.. include:: 030_basic_types/12-big_numbers.rst
61-
.. include:: 030_basic_types/88-basic_types.lab.rst
62-
.. include:: 030_basic_types/99-summary.rst
49+
.. include:: 030_scalar_types/01-introduction.rst
50+
.. include:: 030_scalar_types/02-discrete_numeric_types.rst
51+
.. include:: 030_scalar_types/03-modular_types.rst
52+
.. include:: 030_scalar_types/04-enumeration_types.rst
53+
.. include:: 030_scalar_types/05-representation_values.rst
54+
.. include:: 030_scalar_types/06-character_types.rst
55+
.. include:: 030_scalar_types/07-real_types.rst
56+
.. include:: 030_scalar_types/08-base_type.rst
57+
.. include:: 030_scalar_types/09-miscellaneous.rst
58+
.. include:: 030_scalar_types/10-subtypes.rst
59+
.. include:: 030_scalar_types/11-subtypes_full_picture.rst
60+
.. include:: 030_scalar_types/12-big_numbers.rst
61+
.. include:: labs/030_scalar_types.lab.rst
62+
.. include:: 030_scalar_types/99-summary.rst

‎courses/ada_essentials/030_basic_types.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types.rst‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*************
2-
Basic Types
3-
*************
1+
**************
2+
Scalar Types
3+
**************
44

55
.. container:: PRELUDE BEGIN
66

@@ -42,11 +42,11 @@ Basic Types
4242
4343
.. container:: PRELUDE END
4444

45-
.. include:: 030_basic_types/01-introduction.rst
46-
.. include:: 030_basic_types/02-discrete_numeric_types_with_mod.rst
47-
.. include:: 030_basic_types/04-enumeration_types.rst
48-
.. include:: 030_basic_types/07-real_types.rst
49-
.. include:: 030_basic_types/09-miscellaneous.rst
50-
.. include:: 030_basic_types/10-subtypes.rst
51-
.. include:: 030_basic_types/88-basic_types.lab.rst
52-
.. include:: 030_basic_types/99-summary.rst
45+
.. include:: 030_scalar_types/01-introduction.rst
46+
.. include:: 030_scalar_types/02-discrete_numeric_types_with_mod.rst
47+
.. include:: 030_scalar_types/04-enumeration_types.rst
48+
.. include:: 030_scalar_types/07-real_types.rst
49+
.. include:: 030_scalar_types/09-miscellaneous.rst
50+
.. include:: 030_scalar_types/10-subtypes.rst
51+
.. include:: labs/030_scalar_types.lab.rst
52+
.. include:: 030_scalar_types/99-summary.rst

‎courses/ada_essentials/030_basic_types/01-introduction.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/01-introduction.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/02-discrete_numeric_types.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/02-discrete_numeric_types.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/02-discrete_numeric_types_with_mod.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/02-discrete_numeric_types_with_mod.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/03-modular_types.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/03-modular_types.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/04-enumeration_types.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/04-enumeration_types.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/05-representation_values.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/05-representation_values.rst‎

File renamed without changes.

‎courses/ada_essentials/030_basic_types/06-character_types.rst‎ renamed to ‎courses/ada_essentials/030_scalar_types/06-character_types.rst‎

File renamed without changes.

0 commit comments

Comments
 (0)