resolved links and conflicts

EmpieichO · EmpieichO · commit 838e1255ab29 · 2023-12-01T21:01:34.000+02:00
diff --git a/docs/zkEVM/architecture/index.md b/docs/zkEVM/architecture/index.md
@@ -171,7 +171,7 @@ Before getting into a transaction flow in L2, users need some funds to perform a
   - Aggregator will take pending transactions to be verified and build a Proof in order to achieve finality on L1
   - Once the Proof is validated, user's transactions will attain L1 finality (important for withdrawals). This is called the **consolidated state**.
 
-The above process is a summarized version of how transactions are processed in zkEVM. We recommend you to take a look at the complete [transaction life cycle](../protocol/l2-transaction-cycle-intro.md) document.
+The above process is a summarized version of how transactions are processed in zkEVM. We recommend you to take a look at the complete [transaction life cycle](../protocol/submit-transaction.md) document.
 
 ## Design characteristics
 
diff --git a/docs/zkEVM/protocol/batch-aggregation.md b/docs/zkEVM/protocol/batch-aggregation.md
@@ -1,7 +1,7 @@
 
 !!!info
 
-This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](l2-transaction-cycle-intro.md) inside Polygon zkEVM.
+This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](submit-transaction.md) inside Polygon zkEVM.
 
 The **Trusted Aggregator should eventually aggregate the sequences of batches previously committed by the Trusted Sequencer in order to achieve the L2 State final stage**, which is the Consolidated State.
 
diff --git a/docs/zkEVM/protocol/submit-transaction.md b/docs/zkEVM/protocol/submit-transaction.md
diff --git a/docs/zkEVM/protocol/submit-trasaction.md b/docs/zkEVM/protocol/submit-trasaction.md
diff --git a/docs/zkEVM/protocol/transaction-batching.md b/docs/zkEVM/protocol/transaction-batching.md
@@ -1,6 +1,6 @@
 
 !!!info
-    This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](l2-transaction-cycle-intro.md) inside Polygon zkEVM.
+    This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](submit-transaction.md) inside Polygon zkEVM.
 
 The **Trusted Sequencer** must batch the transactions using the following `BatchData` struct specified in the `PolygonZkEVM.sol` contract:
 
diff --git a/docs/zkEVM/protocol/transaction-execution.md b/docs/zkEVM/protocol/transaction-execution.md
@@ -1,6 +1,6 @@
 
 !!!info
-    This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](l2-transaction-cycle-intro.md) inside Polygon zkEVM.
+    This document is a continuation in the series of articles explaining the [<ins>Transaction Life Cycle</ins>](submit-transaction.md) inside Polygon zkEVM.
 
 The **Trusted Sequencer reads transactions from the pool** and decides whether to **discard** them or **order and execute** them. Transactions that have been executed are added to a transaction batch, and the Sequencer's local L2 State is updated.
 
diff --git a/docs/zkEVM/specifications/pil/simple-example.md b/docs/zkEVM/specifications/pil/simple-example.md
@@ -106,31 +106,32 @@ See the below table for the corresponding execution trace:
 
 $$
 \begin{aligned}
-\begin{array}{|l|c|}\hline
-\texttt{row}\\ \hline
-\ \text{ 1}\\ \hline
-\ \text{ 2}\\ \hline
-\ \text{ 3}\\ \hline
-\ \text{ 4}\\ \hline
-\ \text{ 5}\\ \hline
-\ \text{ 6}\\ \hline
-\ \text{ 7}\\ \hline
-\ \ \vdots\\ \hline
-\end{array}
+    \begin{array}{|l|c|}\hline
+    \texttt{row}\\ \hline
+    \ \text{ 1}\\ \hline
+    \ \text{ 2}\\ \hline
+    \ \text{ 3}\\ \hline
+    \ \text{ 4}\\ \hline
+    \ \text{ 5}\\ \hline
+    \ \text{ 6}\\ \hline
+    \ \text{ 7}\\ \hline
+    \ \ \vdots\\ \hline
+    \end{array}
 \end{aligned}
 \hspace{0.1cm}
 
-\begin{aligned}\begin{array}{|l|c|c|c|c|c|c|c|}\hline 
-\mathtt{freeIn} & \mathtt{RESET} & \texttt{out} \\ \hline 
-\ \quad\ \texttt{4} & \texttt{1} & \texttt{0} \\ \hline
-\ \quad\ \texttt{2} & \texttt{0} & \texttt{4}  \\ \hline
-\ \quad\ \texttt{3} & \texttt{1} & \texttt{8} \\ \hline
-\ \quad\ \texttt{1} & \texttt{0} & \texttt{3} \\ \hline
-\ \quad\ \texttt{9} & \texttt{1} & \texttt{3} \\ \hline
-\ \quad\ \texttt{0} & \texttt{0} & \texttt{9} \\ \hline
-\ \quad\ \texttt{0} & \texttt{1} & \texttt{0} \\ \hline
-\ \quad\ \vdots & \vdots & \vdots \\ \hline
-\end{array}
+\begin{aligned}
+    \begin{array}{|l|c|c|c|c|c|c|c|}\hline
+    \mathtt{freeIn} & \mathtt{RESET} & \texttt{out} \\ \hline
+    \ \quad\ \texttt{4} & \texttt{1} & \texttt{0} \\ \hline
+    \ \quad\ \texttt{2} & \texttt{0} & \texttt{4}  \\ \hline
+    \ \quad\ \texttt{3} & \texttt{1} & \texttt{8} \\ \hline
+    \ \quad\ \texttt{1} & \texttt{0} & \texttt{3} \\ \hline
+    \ \quad\ \texttt{9} & \texttt{1} & \texttt{3} \\ \hline
+    \ \quad\ \texttt{0} & \texttt{0} & \texttt{9} \\ \hline
+    \ \quad\ \texttt{0} & \texttt{1} & \texttt{0} \\ \hline
+    \ \quad\ \vdots & \vdots & \vdots \\ \hline
+    \end{array}
 \end{aligned}
 $$
 
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -101,7 +101,7 @@ nav:
           - Introduction: zkEVM/protocol/introduction.md
           - State management: zkEVM/protocol/state-management.md
           - Trasaction life cycle:
-            - Submit transactions: zkEVM/protocol/submit-trasaction.md
+            - Submit transactions: zkEVM/protocol/submit-transaction.md
             - Transaction execution: zkEVM/protocol/transaction-execution.md
             - Transaction batching: zkEVM/protocol/transaction-batching.md
             - Batch sequencing: zkEVM/protocol/batch-sequencing.md
