Correct.

"As for me, I baptize you with water for repentance, but He who is coming after me is mightier than I, and I am not fit to remove His sandals; He will baptize you with the Holy Spirit and fire." Matthew 3:11 (NAS)

"But this He spoke of the Spirit, whom those who believed in Him were to receive; for the Spirit was not yet given, because Jesus was not yet glorified." John 7:39 (NAS)

"And I will ask the Father, and He will give you another Helper, that He may be with you forever; that is the Spirit of truth, whom the world cannot receive, because it does not behold Him or know Him, but you know Him because He abides with you, and will be in you." John 14:16-17 (NAS)

"But the Helper, the Holy Spirit, whom the Father will send in My name, He will teach you all things, and bring to your remembrance all that I said to you." John 14:26 (NAS)

"When the Helper comes, whom I will send to you from the Father, that is the Spirit of truth, who proceeds from the Father, He will bear witness of Me, and you will bear witness also, because you have been with Me from the beginning." John 15:26-27 (NAS)

"But when He, the Spirit of truth, comes, He will guide you into all the truth; for He will not speak on His own initiative, but whatever He hears, He will speak; and He will disclose to you what is to come. He shall glorify Me; for He shall take of Mine, and shall disclose it to you." John 16:13-14 (NAS)

After Jesus is raised from the dead, and right before His ascension into heaven

"And gathering them together, He commanded them not to leave Jerusalem, but to wait for what the Father had promised, "Which," He said, "you heard of from Me...for John baptized with water, but you shall be baptized with the Holy Spirit not many days from now." Acts 1:4-5 (NAS)

Jesus says: "...but you shall receive power when the Holy Spirit has come upon you; and you shall be My witnesses both in Jerusalem, and in all Judea and Samaria, and even to the remotest part of the earth." Acts 1:8 (NAS)

Prior to Acts 2, scripture consistently talks about the Spirit or Helper coming in the future.

Click on the next question to continue...