Web addresses like http://www.python.org are converted to a link.

[RSS]

2020-02-23
[DIFF] GuiProgramming 22:10 [INFO] PySimpleGUI Updated to latest release number and date
2020-02-18
[DIFF] Euro Python2020/Sprints 12:51 [INFO] MarcAndreLemburg [1-3]
[DIFF] EuroPython2020 12:47 [INFO] MarcAndreLemburg
[DIFF] EuroPython 12:45 [INFO] MarcAndreLemburg
2020-02-05
[DIFF] LocalUserGroups 09:59 [INFO] ChristerEnfors Updated link to www.pythonvarmland.s e to use https
2020-02-04
[DIFF] Py Qt/Some Existing Applications 18:34 [INFO] MurdochRavlin [1-2]
[DIFF] Ukrainian Python Books 12:54 [INFO] KopeiVolodymyr
[DIFF] EditorsGroup 12:34 [INFO] rosuav
2020-02-02
[DIFF] MelbournePUG 23:08 [INFO] Ed Schofield [1-2] #01 Touch-ups: remove AutoMoinLinks, change talk order, ...
#02 Add talks for February 2020
2020-02-01
[DIFF] Beginners Guide/Non Programmers 12:56 [INFO] ChrisM [1-3] #01 Fixed wrong formatting (link displayed on new line instead of inline)
#02 Alphabetized list, full Grammarly check (multiple comma errors), removed bad formatting, added free Python book resources
2020-01-30
[DIFF] PythonTraining 12:19 [INFO] NatDunn
[DIFF] Python Training/Events 12:18 [INFO] NatDunn Removed all past dates. Added future Webucator dates.
2020-01-29
[DIFF] Introductory Books 22:03 [INFO] RagnarVanDerWiel [1-14]
MatsWichmann [15]		 #01 added section for Python 2 books
#02 How Would Pareto Learn Python is no longer available
#03 dead link -> Python Programming in Context
#04 move Learning Python to section "no longer available"
#05 add note that "Learning Python" is no longer available
#06 add Introduction to Computing with Python
#07 remove advanced books and courses to their more appropriate pages
#08 Move courses and videos from IntroductoryBooks page
#09 remove courses and videos to Courses page
#10 Move Parallel Programming Cookbook out of IntroductoryBooks to AdvancedBooks where it belongs
#11 Move courses and videos from IntroductoryBooks page
#12 remove courses and videos to Courses page
#13 move videos and courses to Courses page
[DIFF] PythonBooks 21:07 [INFO] RagnarVanDerWiel add link to Courses page
[DIFF] AdvancedBooks 21:01 [INFO] RagnarVanDerWiel [1-6] #02 Move more advanced books from IntroductoryBooks
#03 Move more machine learning and data science books from IntroductoryBooks...
#04 move Data Science Projects with Python out of IntroductoryBooks
#05 Move Network Science with Python and NetworkX Quick Start Guide from IntroductoryBooks
#06 Move Parallel Programming Cookbook out of IntroductoryBooks to AdvancedBooks where it belongs
[DIFF] Courses 20:58 [INFO] RagnarVanDerWiel [1-10] #01 Move courses and videos from IntroductoryBooks page
#02 Move more courses from IntroductoryBooks
#03 Move courses and videos from IntroductoryBooks page
#04 Move more courses from IntroductoryBooks
#05 Move courses and videos from IntroductoryBooks page to here where they belong
#06 Move courses and videos from IntroductoryBooks page
#07 Move courses and videos from IntroductoryBooks page
#08 fix horizontal lines
#09 move from IntroductoryBooks
#10 move from IntroductoryBooks
2020-01-28
[DIFF] Python Events Calendar 09:16 [INFO] MarcAndreLemburg
2020-01-26
[DIFF] Py Con APAC/Community 01:09 [INFO] IqbalAbdullah Fix a type
2020-01-23
[DIFF] Trusted Editors Group 19:18 [INFO] EWDurbin
[DIFF] Git 01:24 [INFO] OlegBroytman Add GitAhead
2020-01-21
[DIFF] Integrated Development Environments 20:24 [INFO] StephanDeibel New Wing version
2020-01-20
[DIFF] Python Software Foundation/Fellow Nominations 16:17 [INFO] jodlowska2
2020-01-19
[DIFF] Organizations Using Python 07:52 [INFO] Abdur-Rahmaan Janhangeer Added two companies
2020-01-18
[DIFF] PyConAPAC 12:46 [INFO] IqbalAbdullah
2020-01-16
[DIFF] Python Consulting 17:25 [INFO] PaulAzorin
2020-01-13
[DIFF] Python Debugging Tools 20:54 [INFO] Nudin [1-4] #01 Add new section profilers (still incomplete)
#02 Added ipdb, should we also add ipython to the list?
#03 Update dead URLs, exclude projects that are officially dead'
#04 After EOL of Python2 link to Python 3 instead
2020-01-09
[DIFF] WebFrameworks 22:38 [INFO] ChrisZwerschke Update version of Webware for Python
2020-01-01
[DIFF] PyJaipur 06:30 [INFO] ShivankGautam E
2019-12-19
[DIFF] PythonInMusic 16:09 [INFO] NealMcBurnett Update list of sections at top of page.
2019-12-18
[DIFF] Python Testing Tools Taxonomy 14:05 [INFO] MatsWichmann
2019-12-15
[DIFF] ForLoop 14:51 [INFO] MatsWichmann [1]
FrancesHocutt [2]		 #02 Fix prints, remove xrange, remove references to Python 2
[DIFF] Computed Attributes Using Property Objects 08:11 [INFO] FrancesHocutt Remove Py2 specific old-style class details
[DIFF] PyLint-3k 07:56 [INFO] FrancesHocutt Remove early Python 3 information, leaving a link to previous revision for accessibility
[DELETED] JSON 07:53 [INFO] FrancesHocutt Describes 2.x behavior only, can be recreated with Python 3.x if desired
[DIFF] Executable Modules 07:50 [INFO] FrancesHocutt Update for python 3
[DIFF] Documentation 07:44 [INFO] FrancesHocutt Remove Python 2 links
[DIFF] Tix 07:41 [INFO] FrancesHocutt Remove Py2 link, update with deprecation warning
[DIFF] UsingPickle 07:34 [INFO] FrancesHocutt Remove Python 2-specific information, update docs links and protocol info
[DIFF] Templating 07:18 [INFO] FrancesHocutt Remove py2 reference
[DIFF] Security 07:15 [INFO] FrancesHocutt Remove Py2 specific, dead links
[DIFF] RPMOnPython3 06:37 [INFO] FrancesHocutt [1-2] #01 Fix format
#02 Make page context clear
[DIFF] PythonInaTie 06:31 [INFO] FrancesHocutt Make it clear this refers to early Python
[DIFF] Python 2.2.4 05:30 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Python-2.2 05:29 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Python-2.3 05:28 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Python Distributions 05:25 [INFO] FrancesHocutt Remove Python 2 links
[DIFF] Python20 Misc Patches 05:20 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Python20 Critical Patches 05:16 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DELETED] MiscPatches 05:15 [INFO] FrancesHocutt Nothing links to this page except outdated Python 2.0 resources, and it is basically a redirect.
[DIFF] Python-2.0 05:11 [INFO] FrancesHocutt Remove Python 2 information, leaving a link to previous revision for accessibility
[DELETED] Python 2.5 05:05 [INFO] FrancesHocutt Page never had more than a very brief outline
2019-12-06
[DIFF] TkInter 05:55 [INFO] ElNinja Remove likely spam - self promotion and possible impersonation
2019-12-03
[DIFF] ReferenceBooks 17:00 [INFO] MatsWichmann [1-4]
2019-12-02
[DIFF] PythonMed 00:32 [INFO] FrancesHocutt add "Python" to version
[DIFF] tftp 00:25 [INFO] FrancesHocutt Removed dead mail archive link, clarified Py3 status
2019-12-01
[DIFF] Python Consulting/Python 2 support and migration 22:50 [INFO] FrancesHocutt Remove duplicate category
2019-11-28
[DIFF] SaeidDarvish 12:55 [INFO] SaeidDarvish
2019-11-21
[DIFF] CheeseShop 08:54 [INFO] aurelien Dead link video remove because of copyright
[DIFF] PyIMSL Studio 08:44 [INFO] aurelien remove dead link (a correct example would be welcome)
2019-11-10
[DIFF] Beginners Guide/Download 13:28 [INFO] MatsWichmann
[DELETED] Python3.0 Tutorials 00:40 [INFO] FrancesHocutt [1-5] #01 Orphaned page; BeginnersGuide/Progr ammers and BeginnersGuide/NonPr ogrammers all have Py3 resources only now
#02 Moved content to BeginnersGuide/Progr ammers and BeginnersGuide/NonPr ogrammers
#03 All completed by now
#04 Update link
#05 Update link
[DIFF] Beginners Guide/Programmers 00:38 [INFO] FrancesHocutt [1-3] #01 Add resources from Python3.0Tutorials
#02 Remove Py2-centric tutorials/tools
#03 Remove Py2-centric resources and broken links
2019-11-09
[DIFF] Moving To Python From Other Languages 23:34 [INFO] FrancesHocutt Remove Py2 link, update py2 docs link to py3 version
[DIFF] SimplePrograms 23:29 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DELETED] cporting 22:54 [INFO] FrancesHocutt This is an orphaned page and the content has been moved to PortingExtensionModu lesToPy3k, redirect is not necessary at this point.
[DIFF] MacPython/FAQ 22:49 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Python3FAQ 22:42 [INFO] FrancesHocutt Remove reference to subversion, there is no py3k in github branches now
[DIFF] Docs Coordination/FAQ 22:41 [INFO] FrancesHocutt Update repository links to current github
2019-11-08
[DIFF] Starting Your Users Group 18:28 [INFO] Abdur-Rahmaan Janhangeer
[DIFF] Integrating Python With Other Languages 18:21 [INFO] WimLavrijsen
[DIFF] cppyy 18:17 [INFO] WimLavrijsen
[DIFF] Abdur-Rahmaan Janhangeer 17:15 [INFO] Abdur-Rahmaan Janhangeer
[DIFF] LanguageParsing 13:42 [INFO] Abdur-Rahmaan Janhangeer updated pyparsing link
2019-11-04
[DIFF] EWDurbin 21:43 [INFO] EWDurbin
[DIFF] Python Wiki Maintainers 15:03 [INFO] MatsWichmann
[DIFF] Asking for Help 14:47 [INFO] ChrisM Added Link to Python Wiki
2019-10-28
[DIFF] Tkadm30 16:51 [INFO] tkadm30 page update
2019-10-27
[DIFF] PythonEditors 16:58 [INFO] MatsWichmann
[DIFF] Intermediates Guide 00:31 [INFO] JennyRyan stronger language re: python 2 vs 3
[DIFF] Site Improvements 00:14 [INFO] JennyRyan updated completed tasks
[DIFF] Beginner Errors With Python Programming 00:07 [INFO] JennyRyan removed mention of python 3000
[DIFF] Py3k Extension Modules 00:06 [INFO] FrancesHocutt Add caution re: py2 EOL
[DIFF] Porting Extension Modules To Py3k 00:05 [INFO] FrancesHocutt just link Py3kExtensionModules for now
[DIFF] Py3kDeprecated 00:00 [INFO] FrancesHocutt Remove early Python 3 information, leaving a link to previous revision for accessibility
2019-10-26
[DIFF] Py3kRegressions 23:58 [INFO] FrancesHocutt Remove early Python 3 information, leaving a link to previous revision for accessibility
[DIFF] Py3kToDo 23:56 [INFO] FrancesHocutt Remove early Python 3 information, leaving a link to previous revision for accessibility
[DIFF] Python3000 23:51 [INFO] FrancesHocutt Remove early Python 3 information, leaving a link to previous revision for accessibility
[DIFF] PortingToPy3k 23:38 [INFO] FrancesHocutt [1-2]
FrancesHocutt [3]		 #01 fix link/format
#02 Add FAQ here
#03 Add caution re: py2 EOL
[DELETED] Python3000/FAQ 22:39 [INFO] FrancesHocutt Specify 3.x not 3.0 where more accurate, fix typos
[DIFF] Porting To Py3k/Bilingual Quick Ref 22:29 [INFO] FrancesHocutt making warning obvious/consistent
[DIFF] Porting Python To Py3k 22:24 [INFO] FrancesHocutt Add caution re: py2 EOL
2019-10-22
[DIFF] Persian Python Books 20:14 [INFO] SaeidDarvish [1-2]
2019-10-20
[DIFF] Mac Python/Python Distributions For Mac 18:23 [INFO] MatsWichmann
[DIFF] BeginnersGuide 14:41 [INFO] MarcAndreLemburg Remove unnecessary ACL
2019-10-19
[DIFF] New Class Vs Classic Class 23:41 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] PythonGlossary 23:04 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Future Proof Python 22:14 [INFO] FrancesHocutt Remove Python 2 information, leaving a link to previous revision for accessibility
[DIFF] BytesStr 22:00 [INFO] FrancesHocutt Remove Python 2-specific information, leaving a link to previous revision for accessibility
[DIFF] Porting To Py3k/Modules 21:51 [INFO] JennyRyan [1-3]
[DIFF] Beginners Guide/Programmers/Simple Examples 21:43 [INFO] FrancesHocutt update print syntax to py3
[DIFF] Intermediate Conundrums 21:39 [INFO] FrancesHocutt update print syntax
[DIFF] Python2or Python3 20:42 [INFO] FrancesHocutt [1-2] #01 Remove Python 2 information, leaving a link to previous revision for accessibility
#02 Stronger statement/more information on Py2 sunset
[DIFF] IRC 20:09 [INFO] FrancesHocutt Most of Twisted supports Python 3
[DIFF] FrancesHocutt 20:04 [INFO] FrancesHocutt [1-2] #02 Homepage creation for context
2019-09-30
[DIFF] Specialized Commercial Hosts 15:36 [INFO] StanimirDjevelekov Re-ordered entries in alphabetical order; removed some dead links; added ICDSoft.
2019-09-18
[DIFF] Beginners Guide/Help 21:35 [INFO] MatsWichmann [1-2]
[DIFF] Beginners Guide/Examples 21:27 [INFO] MatsWichmann
[DIFF] Beginners Guide/Overview 08:49 [INFO] ChrisM Grammarly check (fix writing issues) + style checker.
[DIFF] Automated Refactoring Tools 08:22 [INFO] ChrisM
2019-09-12
[DIFF] OptParse 18:41 [INFO] MatsWichmann [1-2]
2019-09-11
[DIFF] Parallel Processing 20:38 [INFO] jjgalvez
2019-09-08
[DIFF] Adarshreddyash 10:09 [INFO] Adarshreddyash [1-2] #02 my profile page
2019-08-23
[DIFF] CheeseShopDev 10:57 [INFO] SumanaHarihareswara removing legacy PyPI content, updating links
[DIFF] 2.x-vs-3.x-survey 10:45 [INFO] SumanaHarihareswara Survey link no longer works; removing.
2019-08-19
[DIFF] ApacPyConWiki 01:57 [INFO] younggunkim [1-2]
[DIFF] Python Conferences 01:54 [INFO] younggunkim [1-3]
2019-08-15
[DIFF] Concurrency 21:38 [INFO] RobertNishihara
2019-08-12
[DIFF] Local Spelling Words 07:38 [INFO] SamWang
2019-08-06
[DIFF] Py Qt5/Threading,_Signals_and_Slots 23:08 [INFO] DavidBoddie Pasted in the ported version of the code.
[DIFF] PyQt/SampleCode 22:59 [INFO] DavidBoddie Reversed the order of versions, added a placeholder PyQt5 example.
2019-08-03
[DIFF] Windows Compilers 08:27 [INFO] Jgoutin [1-3] #01 Remove dead links.
#02 Add extra Build tools 2019 info
#03 Update with new VC++ versions and Python versions
[DIFF] Powerful Python One-Liners 06:56 [INFO] ChrisM Added 10 more one-liners to the page.
2019-07-29
[DIFF] PyQt/Books 00:13 [INFO] MartinFitzpatrick Added "Create Simple GUI Applications with Python & Qt" book.
2019-07-22
[DIFF] PSF Python Job Board/Reviewers 16:30 [INFO] BetsyWaliszewski [1-2]
2019-07-20
[DIFF] GnuPrivacyGuard 01:38 [INFO] MichaelDeLaRue update package info - can't verify CentOS / RedHat info and looking at package contents the library given seems to be the wrong one so deleting for now.
2019-07-18
[DIFF] Project File And Directory Layout 14:47 [INFO] MatsWichmann
[DIFF] GameProgramming 00:17 [INFO] MatsWichmann
2019-07-13
[DIFF] JürgenHermann 18:44 [INFO] JürgenHermann [1-3]
[DIFF] Euro Python2019/Sprints 08:42 [INFO] nat-dok-15-029 [1,3-6]
nat-dok-15-021 [2]
nat-stu-15-028 [7]
nat-dok-15-012 [8]		 #07 Add some projects
#08 Adding EPS website sprint
2019-07-05
[DIFF] Apps With Python Scripting 23:27 [INFO] JaraKaca Update link for Orange tool
2019-07-03
[DIFF] Documentation Tools 12:34 [INFO] JaraKaca Revise pdoc3 description
2019-07-01
[DIFF] Py Qt/Widgets in a layout 15:55 [INFO] MichaelHerrmann
[DIFF] PyQt/Tutorials 13:34 [INFO] MichaelHerrmann Update example link
2019-06-27
[DIFF] Py Pi Documentation Hosting 21:33 [INFO] SumanaHarihareswara Read the Docs update
[DIFF] PyPIJSON 21:29 [INFO] SumanaHarihareswara updated URL
[DIFF] PyPISimple 21:27 [INFO] SumanaHarihareswara URL update
2019-06-22
[DIFF] Cheese Shop Tutorial 19:01 [INFO] SumanaHarihareswara remove obsolete information so people will be directed to official guide
[DIFF] Sumana Harihareswara 18:55 [INFO] SumanaHarihareswara [1-2] #01 copying from PSF page
#02 first edit
2019-06-20
[DIFF] Beginners Guide/Mathematics 20:13 [INFO] IgorRocha Diveintopython.net is no longer available. Replacing it for another mirror of the book.
[DIFF] PyUnit 19:32 [INFO] IgorRocha Diveintopython.net is no longer available. Replacing it for another mirror of the book.
[DIFF] Tutorials on XML processing with Python 18:47 [INFO] IgorRocha Most of the resources linked on this page weren't available anymore, so I updated them to the best of my knowledge. It would be nice if someone could provide better resources, though.
2019-06-19
[DIFF] PyQt 07:38 [INFO] MichaelHerrmann Add link to a book about PyQt5
2019-05-17
[DIFF] PyTest 13:41 [INFO] OliverBestwalter [1-2] #01 manual redirect to correct page (is there an automatic redirect?)
#02 fix naming, spelling and replace dead links with current ones
[DIFF] pytest 13:35 [INFO] OliverBestwalter Renamed from 'PyTest'. spelling (let's hope that page names in MoinMoin are not case sensitve)
2019-04-06
[DIFF] Greek Python Books 13:41 [INFO] DimitriosKarolidis
2019-04-05
[DIFF] Tkadm30/Django Hot Sauce 22:11 [INFO] tkadm30 [1-3] #01 update
#03 update page
2019-03-28
[DIFF] pywarangal 10:06 [INFO] Adarshreddyash
2019-03-22
[DIFF] Tips For In House User Groups 08:40 [INFO] SteveBarnes Corrected typo: Changed ''not a public on'' to ''not a public one''
2019-03-13
[DIFF] pymug 19:44 [INFO] Abdur-Rahmaan Janhangeer [1-2] #02 Renamed from 'Abdur-Rahmaan Janhangeer'. my name as page name was not good
2019-03-07
[DIFF] EuroPython2019 19:14 [INFO] MarcAndreLemburg [1-2]
2019-02-18
[DIFF] GUI Programming in Python 22:48 [INFO] PySimpleGUI WxPython, Remi, rep..it
2019-02-17
[DIFF] AmirTeymuri 12:48 [INFO] AmirTeymuri [1-4]
2019-01-31
[DIFF] Pratul1997 18:58 [INFO] Pratul1997
2019-01-30
[DIFF] SummerOfCode 00:54 [INFO] TerriOda Update with link to new website
2019-01-25
[DIFF] Salem Snakes - Python Club 23:24 [INFO] AndrewEarls [1-2] #01 update next meeting
#02 Previous meeting section
2019-01-16
[DIFF] deployment 09:31 [INFO] Sven Schirmer removed link to deleted page: python-packager
[DELETED] Python-Packager 09:28 [INFO] Sven Schirmer Completly outdated. Main link revers to some unrelated business.
2019-01-15
[DIFF] SpanishLanguage 19:47 [INFO] LuisEduardoCorreaGallego [1-2]
2019-01-14
[DIFF] CanberraPUG 23:52 [INFO] GavinJackson [1-4]
2019-01-13
[DIFF] Wiki Editing Guidelines 20:40 [INFO] ChrisM Create page "Editing Guidelines" (please add more guidelines)
2019-01-04
[DIFF] Tkadm30/Django Live Store 05:05 [INFO] tkadm30 Renamed from 'EtienneRobillard/Dj angoLiveStore'.
[DIFF] Tkadm30/Django Hot Sauce/Examples 05:04 [INFO] tkadm30 Renamed from 'EtienneRobillard/Dj angoHotSauce/Example s'. new life of course :)
[DELETED] Etienne Robillard/Django Hot Sauce 04:46 [INFO] tkadm30 [1-2] #02 minor modifications
2018-12-18
[DIFF] Homepage Template 07:00 [INFO] PythonMaputo [1-2]
2018-12-17
[DIFF] PythonMaputo 02:38 [INFO] PythonMaputo [1-2]
2018-11-06
[DIFF] Pyarmor 04:21 [INFO] JondyZhao Change homepage link
2018-11-05
[DIFF] Android 22:28 [INFO] MalcolmSmith Chaquopy no longer supports Python 2
2018-11-04
[DIFF] DavidBeazley 15:27 [INFO] DavidBeazley
2018-11-01
[DIFF] Asking for Help/How do you protect Python source code? 08:24 [INFO] JondyZhao Add runtime obfuscation
[DIFF] Distribution Utilities 02:17 [INFO] JondyZhao [1-2] #01 Add pyarmor
#02 Fix table title error
2018-10-16
[DIFF] BangPypers 11:30 [INFO] KumarAnirudha
[DIFF] Bang Pypers/Python Companies In India 11:25 [INFO] KumarAnirudha
2018-10-10
[DIFF] Luis Eduardo Correa Gallego 18:06 [INFO] LuisEduardoCorreaGallego
[DIFF] MatsWichmann 17:28 [INFO] MatsWichmann
2018-10-08
[DELETED] Etienne Robillard 20:14 [INFO] tkadm30 removed my email
[DIFF] Maximilian Fuxjaeger 10:40 [INFO] MaximilianFuxjaeger added page
2018-09-30
[DIFF] Blocked Users Group 12:20 [INFO] MarcAndreLemburg
2018-09-21
[DIFF] PythonHosting 18:43 [INFO] GilesThomas [1]
MatsWichmann [2]		 #01 Removed excess bracket
[DIFF] FreeHosts 16:41 [INFO] GilesThomas [1-2] #02 Updated Python version list for PythonAnywhere
[DIFF] ShivankGautam 14:29 [INFO] ShivankGautam [1-3] #02 HomePage
2018-09-18
[DIFF] Hungarian Python Books 16:49 [INFO] kantal [1-3] #03 A new book is added.

[DIFF]

marks older pages that have at least one backup version stored (click for an author diff)

[UPDATED]

marks pages edited since you set your bookmark (click for a bookmark diff)

[NEW]

marks pages created since you set your bookmark, and were not edited after creation

[DELETED]

marks page deletions

[RENAMED]

marks page renames

[CONFLICT]

An editing conflict happened, please resolve it by merging both versions of the problematic paragraphs together.

Unable to edit the page? See the FrontPage for instructions.