Merge remote-tracking branch 'origin/main'

# Conflicts:
#	docs/PM2_ClassDiagram.drawio

README.md

@@ -1,46 +1,49 @@
 #Texteditor
 Texteditor is a program to edit a text by in- and output into the console.
 #Usermanual
-#ADD a Textline
+#ADD a paragraph
 ```ADD```
-First please enter the command add to add a new textline. Then enter the text you want to add .  
+First please enter the command add to add a new paragraph at the end of text. Then enter the text you want to add .  
 
 ```ADD [n]```
-If you want to add a textline to a certain paragraph then please use the command add and then enter that paragraphnummber. 
+If you want to add a paragraph between existing paragraphs then please use the command add and then enter the paragraphnumber it should get. 
 After that enter the text you want to add to that paragraph.
 
 #DUMMY Text
 ```DUMMY```
-First please enter the command dummy to enter a pre written text into the textline.
+First please enter the command dummy to enter a pre written paragraph into the text.
 
 ```DUMMY [n]```
-If you want to enter a pre written dummy text into a specific paragraph then please enter the command dummy and then the paragraph that you want to use.
+If you want to enter a pre written dummy paragraph between existing paragraphs then please enter the command dummy and then enter the paragraphnumber it should get.
 
 #REPLACE a Text
 ```REPLACE```
 First please enter the command replace then enter the characters that you want to replace. After that please enter
-the new characters that should replace the old characters.
+the new characters that should replace the old characters. If don't enter a paragraphnumber, the change will be made in the last paragraph.
 
 ```REPLACE [n]```
-If you want to replace a text from a certain paragraph, please enter the command replace and then enter the characters you want to
+If you want to replace a text from a specific paragraph, please enter the command and the paragraphnumber and then enter the characters you want to
 replace. After you entered the characters you want to replace please enter now the new characters that should replace the
 old characters.
 
 #DELETE a Text
 ```DEL```
-First please enter the command del to delete a text. Then please enter the text size you want to delete.
+First please enter the command del to delete the last paragraph.
 
 ```DEL [n]```
-If you want to delete a text from a certain paragraph then please enter the command del and then the paragraph that you want to delete.
+If you want to delete a specific paragraph then please enter the command del and then the paragraph you want to delete.
 
 #INDEX
-``ÌNDEX``
-First please enter the command index to show the index.
+```INDEX```
+Please enter the command index to show the index.
 
 #Print the Text
 ```PRINT```
-First please enter the command print to print out the current text you have.
+Please enter the command print to print out the current text you have. To change the output format, use the commands ```FORMAT FIX``` and ```FORMAT RAW```
 
 #FORMAT the Text
-```FORMAT```
+```FORMAT RAW```
+Please enter the command format raw to change the print format to raw. After you changed the format to raw, each paragraph will be printed on one line with it's paragraph number.
 
+```FORMAT FIX [n]```
+Please enter the command format fix and the line length which should be used. After you changed the format to fix, the defined line length will be used to print the text.

src/Text.java

@@ -207,5 +207,4 @@ public class Text {
             }
         }
     }
-
 }

src/TextOutput.java

@@ -65,6 +65,7 @@ public class TextOutput {
                     System.out.println();
                 }
             }
+            System.out.println();
         }
     }