aboutsummaryrefslogtreecommitdiff
path: root/files/pt-br
diff options
context:
space:
mode:
Diffstat (limited to 'files/pt-br')
-rw-r--r--files/pt-br/_redirects.txt6
-rw-r--r--files/pt-br/_wikihistory.json18
-rw-r--r--files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/pt-br/learn/javascript/objects/object-oriented_js/index.html)4
-rw-r--r--files/pt-br/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/pt-br/learn/javascript/objects/inheritance/index.html)4
4 files changed, 17 insertions, 15 deletions
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index da89c57846..82705e2d46 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -69,9 +69,9 @@
/pt-BR/docs/Aprender/JavaScript/Objetos /pt-BR/docs/Learn/JavaScript/Objects
/pt-BR/docs/Aprender/JavaScript/Objetos/Adding_bouncing_balls_features /pt-BR/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features
/pt-BR/docs/Aprender/JavaScript/Objetos/Básico /pt-BR/docs/Learn/JavaScript/Objects/Basics
-/pt-BR/docs/Aprender/JavaScript/Objetos/Herança /pt-BR/docs/Learn/JavaScript/Objects/Inheritance
+/pt-BR/docs/Aprender/JavaScript/Objetos/Herança /pt-BR/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
/pt-BR/docs/Aprender/JavaScript/Objetos/JSON /pt-BR/docs/Learn/JavaScript/Objects/JSON
-/pt-BR/docs/Aprender/JavaScript/Objetos/Object-oriented_JS /pt-BR/docs/Learn/JavaScript/Objects/Object-oriented_JS
+/pt-BR/docs/Aprender/JavaScript/Objetos/Object-oriented_JS /pt-BR/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
/pt-BR/docs/Aprender/JavaScript/Objetos/Object_building_practice /pt-BR/docs/Learn/JavaScript/Objects/Object_building_practice
/pt-BR/docs/Aprender/JavaScript/Objetos/Object_prototypes /pt-BR/docs/Learn/JavaScript/Objects/Object_prototypes
/pt-BR/docs/Aprender/Learning_and_getting_help /pt-BR/docs/Learn/Learning_and_getting_help
@@ -399,6 +399,8 @@
/pt-BR/docs/Learn/JavaScript/First_steps/O_que_e_JavaScript /pt-BR/docs/Learn/JavaScript/First_steps/What_is_JavaScript
/pt-BR/docs/Learn/JavaScript/First_steps/Teste_suas_habilidades:_variaveis /pt-BR/docs/Learn/JavaScript/First_steps/Test_your_skills:_variables
/pt-BR/docs/Learn/JavaScript/First_steps/Variáveis /pt-BR/docs/Learn/JavaScript/First_steps/Variables
+/pt-BR/docs/Learn/JavaScript/Objects/Inheritance /pt-BR/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/pt-BR/docs/Learn/JavaScript/Objects/Object-oriented_JS /pt-BR/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
/pt-BR/docs/Learn/Server-side/Django/Hospedagem /pt-BR/docs/Learn/Server-side/Django/Deployment
/pt-BR/docs/Learn/Server-side/Django/Introdução /pt-BR/docs/Learn/Server-side/Django/Introduction
/pt-BR/docs/Learn/Server-side/Django/Sessões /pt-BR/docs/Learn/Server-side/Django/Sessions
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 638fa546c6..a742393df3 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -2328,7 +2328,7 @@
"webfelipemaia"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-16T22:32:15.784Z",
"contributors": [
"WellingtonFR",
@@ -2344,14 +2344,6 @@
"greysonf"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-07-16T22:32:07.136Z",
- "contributors": [
- "rpizzolato",
- "WellingtonFR",
- "greysonf"
- ]
- },
"Learn/JavaScript/Objects/Object_building_practice": {
"modified": "2020-07-16T22:32:32.103Z",
"contributors": [
@@ -16318,6 +16310,14 @@
"augustowebd"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-07-16T22:32:07.136Z",
+ "contributors": [
+ "rpizzolato",
+ "WellingtonFR",
+ "greysonf"
+ ]
+ },
"conflicting/MDN/Contribute/Getting_started": {
"modified": "2019-03-23T23:38:18.895Z",
"contributors": [
diff --git a/files/pt-br/learn/javascript/objects/object-oriented_js/index.html b/files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index ead7aaa74e..125287707b 100644
--- a/files/pt-br/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,8 +1,8 @@
---
title: JavaScript orientado a objetos para iniciantes
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
translation_of: Learn/JavaScript/Objects/Object-oriented_JS
-original_slug: Aprender/JavaScript/Objetos/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
---
<div>{{LearnSidebar}}</div>
diff --git a/files/pt-br/learn/javascript/objects/inheritance/index.html b/files/pt-br/learn/javascript/objects/classes_in_javascript/index.html
index 032e574d6e..7b144c91e0 100644
--- a/files/pt-br/learn/javascript/objects/inheritance/index.html
+++ b/files/pt-br/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,8 +1,8 @@
---
title: Herança em JavaScript
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
translation_of: Learn/JavaScript/Objects/Inheritance
-original_slug: Aprender/JavaScript/Objetos/Herança
+original_slug: Learn/JavaScript/Objects/Inheritance
---
<div>{{LearnSidebar}}</div>